summaryrefslogtreecommitdiff
path: root/x11/kdebase
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1999-11-12 04:50:00 +0000
committerhubertf <hubertf@pkgsrc.org>1999-11-12 04:50:00 +0000
commit92d63581717030ba175c416ab744052d922b638a (patch)
treeb5faa0969838e226d82643b2d70ee19e6f4e4f18 /x11/kdebase
parentd6c4d4674dc36db76c5a81dad912523b6096b11d (diff)
downloadpkgsrc-92d63581717030ba175c416ab744052d922b638a.tar.gz
Fix patch fuzz insanity.
Diffstat (limited to 'x11/kdebase')
-rw-r--r--x11/kdebase/files/patch-sum50
-rw-r--r--x11/kdebase/patches/patch-aa6
-rw-r--r--x11/kdebase/patches/patch-ab32
-rw-r--r--x11/kdebase/patches/patch-ac42
-rw-r--r--x11/kdebase/patches/patch-ad65
-rw-r--r--x11/kdebase/patches/patch-ae40
-rw-r--r--x11/kdebase/patches/patch-af58
-rw-r--r--x11/kdebase/patches/patch-ag33
-rw-r--r--x11/kdebase/patches/patch-ah42
-rw-r--r--x11/kdebase/patches/patch-ai41
-rw-r--r--x11/kdebase/patches/patch-aj45
-rw-r--r--x11/kdebase/patches/patch-ak6
-rw-r--r--x11/kdebase/patches/patch-al61
-rw-r--r--x11/kdebase/patches/patch-am33
-rw-r--r--x11/kdebase/patches/patch-an81
-rw-r--r--x11/kdebase/patches/patch-ap41
-rw-r--r--x11/kdebase/patches/patch-aq29
-rw-r--r--x11/kdebase/patches/patch-ar42
-rw-r--r--x11/kdebase/patches/patch-as44
-rw-r--r--x11/kdebase/patches/patch-at49
-rw-r--r--x11/kdebase/patches/patch-au72
-rw-r--r--x11/kdebase/patches/patch-av35
-rw-r--r--x11/kdebase/patches/patch-aw46
-rw-r--r--x11/kdebase/patches/patch-ax62
-rw-r--r--x11/kdebase/patches/patch-ay46
25 files changed, 546 insertions, 555 deletions
diff --git a/x11/kdebase/files/patch-sum b/x11/kdebase/files/patch-sum
index 5bb6b769926..26a0a4d7446 100644
--- a/x11/kdebase/files/patch-sum
+++ b/x11/kdebase/files/patch-sum
@@ -1,26 +1,26 @@
-$NetBSD: patch-sum,v 1.12 1999/10/23 02:06:06 hubertf Exp $
+$NetBSD: patch-sum,v 1.13 1999/11/12 04:50:00 hubertf Exp $
-MD5 (patch-aa) = 523a9ad05771909d8140a80026b63eee
-MD5 (patch-ab) = 8fd3d2def74bfcffd97ee0b4707dacd0
-MD5 (patch-ac) = e3ca53f5dc84d43e4cd04356b0c02fee
-MD5 (patch-ad) = f3f62513775a844a62725593ff20f2fb
-MD5 (patch-ae) = f4bc83b92897ecb94376d33278955a9a
-MD5 (patch-af) = 643bd9370f91c1c9968030a3ec6fe656
-MD5 (patch-ag) = c9e121403e4f2de2a25e7f1ea8a8ecf4
-MD5 (patch-ah) = 109a2d63b2f3ff0d05e2b50251bc1ec5
-MD5 (patch-ai) = 78a7190a72184b24e39cdde019c7e805
-MD5 (patch-aj) = e686e55b0986037baff35b543cec6bbb
-MD5 (patch-ak) = 967b3e4883a7f17d4dfa9b4d83d3ad44
-MD5 (patch-al) = 90700f9f18c954509b5adad4cfa2a203
-MD5 (patch-am) = 1b7b201d060759a5ae1878fad7252dce
-MD5 (patch-an) = 4cb12dc4a80c1e8f66f619139511e924
-MD5 (patch-ap) = 747c8fc023114a90e8826feb5a73ad16
-MD5 (patch-aq) = fcaaee7a19064589042d52cd8b1b3844
-MD5 (patch-ar) = 66012da1191f029d9d1296044a6e3a14
-MD5 (patch-as) = dec49266e7f09ffa0da50444241904c6
-MD5 (patch-at) = bf41eb671b048b7ba79d421356a29faf
-MD5 (patch-au) = ec32169076a30bf4aaacc27bdb5303e6
-MD5 (patch-av) = 9cc20f04432c9e0012ff90aa8efb4607
-MD5 (patch-aw) = cf7dd9dc8982ffeaa7e8cb376ceff44c
-MD5 (patch-ax) = 9f4c1040e590d626785b915d799e43ef
-MD5 (patch-ay) = c223fb725d235c87d37debd0b001989f
+MD5 (patch-aa) = 4e66afa03f19ec16d3c3d5056fa5137c
+MD5 (patch-ab) = 94e13134d265a1f7dcbccafcea45c29b
+MD5 (patch-ac) = 284c8a7973d5ea902946a5c9f1131426
+MD5 (patch-ad) = 4047b54aba3fbd73db81e717b60b8414
+MD5 (patch-ae) = 9a907135978efd3362ed6626a99f8b48
+MD5 (patch-af) = 58fddbb905fd90a4b678cbd644f8ec60
+MD5 (patch-ag) = fd59aec6768c4417dfa7f3cfad56af8a
+MD5 (patch-ah) = 7839408dd4600a09a8d6fba70364f639
+MD5 (patch-ai) = 5e42d24bbebf2feed35706f7451c6984
+MD5 (patch-aj) = 3e4525add6460cd77ab07c39cd3b8f36
+MD5 (patch-ak) = 006818db649353703d5d6685a2d7639d
+MD5 (patch-al) = 6977eaf4ffdc58b71d5ebb5943c86459
+MD5 (patch-am) = 5c5b62d1eae50a3982728d24c126a926
+MD5 (patch-an) = 4b04e0bf15c1492b4b590a803643ec03
+MD5 (patch-ap) = 2f714901d2e2d2b2472ce8bbaa3bde67
+MD5 (patch-aq) = 825a6d67066aa57a3e43e6a64460622c
+MD5 (patch-ar) = 18a1c34da9b75712359ae890edcb1021
+MD5 (patch-as) = c274dcf087cca75d71a7fdec0db67e79
+MD5 (patch-at) = 850c8399f58e5e70684850e8884ba4ca
+MD5 (patch-au) = 58e75e801e9787425eac8f82d5748991
+MD5 (patch-av) = aea6fd314e7d654567e6ca1a0a15903d
+MD5 (patch-aw) = a29f93d2ce056aee7afe3771fb1ffb3c
+MD5 (patch-ax) = f4be5b79f43abbc6b97eac7c032352f4
+MD5 (patch-ay) = 7d2602013ddbb3c7f7d2c53542a29c45
diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa
index b53f71c931b..b26db1052b5 100644
--- a/x11/kdebase/patches/patch-aa
+++ b/x11/kdebase/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.12 1999/10/22 18:31:52 jlam Exp $
+$NetBSD: patch-aa,v 1.13 1999/11/12 04:50:00 hubertf Exp $
---- configure.orig Tue Sep 7 11:21:06 1999
-+++ configure Fri Oct 22 14:25:03 1999
+--- ./configure Tue Sep 7 17:21:06 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/configure Fri Nov 12 05:10:30 1999
@@ -517,9 +517,9 @@
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
diff --git a/x11/kdebase/patches/patch-ab b/x11/kdebase/patches/patch-ab
index 0ed55b4260c..bee4c2d8710 100644
--- a/x11/kdebase/patches/patch-ab
+++ b/x11/kdebase/patches/patch-ab
@@ -1,21 +1,13 @@
-$NetBSD: patch-ab,v 1.8 1999/09/15 18:26:05 tron Exp $
+$NetBSD: patch-ab,v 1.9 1999/11/12 04:50:00 hubertf Exp $
---- kdm/session.c.orig Fri Aug 20 20:35:10 1999
-+++ kdm/session.c Wed Sep 15 13:32:45 1999
-@@ -50,6 +50,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #ifdef AIXV3
- # include <usersec.h>
- #endif
-@@ -1089,7 +1090,7 @@
- return env;
- }
-
--#if defined(Lynx) || defined(SCO) && !defined(SCO_USA) || !defined(HAVE_CRYPT_H)
-+#if !defined(__NetBSD__) && (defined(Lynx) || defined(SCO) && !defined(SCO_USA) || !defined(HAVE_CRYPT_H))
- char *crypt(s1, s2)
- char *s1, *s2;
- {
+--- ./kaudio/Makefile.in Tue Sep 7 17:20:48 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kaudio/Makefile.in Fri Nov 12 05:10:31 1999
+@@ -201,7 +201,7 @@
+ CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ maudio_OBJECTS = io_oss.o maudio.o sample.o
+-maudio_LDADD = $(LDADD)
++maudio_LDADD = $(LDADD) -lossaudio
+ maudio_DEPENDENCIES =
+ maudio_LDFLAGS =
+ kaudioserver_OBJECTS = kaudioserver.o
diff --git a/x11/kdebase/patches/patch-ac b/x11/kdebase/patches/patch-ac
index 5f4443125ce..509a4a2c8ba 100644
--- a/x11/kdebase/patches/patch-ac
+++ b/x11/kdebase/patches/patch-ac
@@ -1,31 +1,13 @@
-$NetBSD: patch-ac,v 1.5 1999/02/15 21:34:49 tron Exp $
+$NetBSD: patch-ac,v 1.6 1999/11/12 04:50:00 hubertf Exp $
---- kdm/resource.c.orig Thu Jan 28 15:10:02 1999
-+++ kdm/resource.c Sat Feb 13 19:44:33 1999
-@@ -92,7 +92,7 @@
- #define DEF_SESSION XDMDIR"/Xsession" /* QUOTE(XBINDIR) "xterm -ls" */
- #endif
- #ifndef DEF_USER_PATH
--# ifdef __FreeBSD__
-+# if defined(__FreeBSD__) || defined(__NetBSD__)
- # define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
- # elif __linux__
- # define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
-@@ -101,7 +101,7 @@
- # endif
- #endif
- #ifndef DEF_SYSTEM_PATH
--# ifdef __FreeBSD__
-+# if defined(__FreeBSD__) || defined(__NetBSD__)
- # define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
- # elif __linux__
- # define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
-@@ -153,7 +153,7 @@
- #define DEF_GREETER_LIB ""
- #endif
- #ifndef DEF_PID_FILE
--# ifdef __FreeBSD__
-+# if defined(__FreeBSD__) || defined(__NetBSD__)
- # define DEF_PID_FILE _PATH_VARRUN"kdm.pid"
- # else
- /* this may be readonly
+--- ./kcontrol/info/info.cpp Fri Jul 23 23:56:57 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/info.cpp Fri Nov 12 05:10:33 1999
+@@ -116,6 +116,8 @@
+ #include "info_fbsd.cpp"
+ #elif hpux
+ #include "info_hpux.cpp"
++#elif __NetBSD__
++#include "info_netbsd.cpp"
+ #elif __svr4__
+ #include "info_svr4.cpp"
+ #else
diff --git a/x11/kdebase/patches/patch-ad b/x11/kdebase/patches/patch-ad
index a005f9b8bdf..337c194ba56 100644
--- a/x11/kdebase/patches/patch-ad
+++ b/x11/kdebase/patches/patch-ad
@@ -1,22 +1,45 @@
-$NetBSD: patch-ad,v 1.7 1999/06/04 00:05:51 tron Exp $
+$NetBSD: patch-ad,v 1.8 1999/11/12 04:50:00 hubertf Exp $
---- kdm/Makefile.in.orig Wed Apr 28 17:20:50 1999
-+++ kdm/Makefile.in Fri Jun 4 01:01:03 1999
-@@ -102,7 +102,7 @@
- LIBXDMCP = @LIBXDMCP@
- LIBZ = @LIBZ@
- LIB_KAB = @LIB_KAB@
--LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDECORE = @prefix@/lib/libkdecore.a -lXext $(LIB_QT)
- LIB_KDEUI = @LIB_KDEUI@
- LIB_KDEUTIL = @LIB_KDEUTIL@
- LIB_KFILE = @LIB_KFILE@
-@@ -234,7 +234,7 @@
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -DPREFIX=\"${prefix}\"
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
+--- ./kcontrol/info/memory.cpp Fri Jul 23 23:56:59 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/memory.cpp Fri Nov 12 05:10:32 1999
+@@ -30,6 +30,23 @@
+ freeMem->setAutoResize(TRUE);
+ freeMem->setFont(courierFont);
+
++#ifdef __NetBSD__
++ activeMem = new QLabel(klocale->translate("Active memory"), this);
++ activeMem->move(STARTX,STARTY+2*DY);
++ activeMem->setAutoResize(TRUE);
++ activeMem = new QLabel("0k", this);
++ activeMem->move(STARTX2,STARTY+2*DY);
++ activeMem->setAutoResize(TRUE);
++ activeMem->setFont(courierFont);
++
++ inactiveMem = new QLabel(klocale->translate("Inactive memory"), this);
++ inactiveMem->move(STARTX,STARTY+3*DY);
++ inactiveMem->setAutoResize(TRUE);
++ inactiveMem = new QLabel("0k", this);
++ inactiveMem->move(STARTX2,STARTY+3*DY);
++ inactiveMem->setAutoResize(TRUE);
++ inactiveMem->setFont(courierFont);
++#else
+ sharedMem = new QLabel(i18n("Shared memory"), this);
+ sharedMem->move(STARTX,STARTY+2*DY);
+ sharedMem->setAutoResize(TRUE);
+@@ -45,6 +62,7 @@
+ bufferMem->move(STARTX2,STARTY+3*DY);
+ bufferMem->setAutoResize(TRUE);
+ bufferMem->setFont(courierFont);
++#endif
+
+ swapMem = new QLabel(i18n("Swap memory"), this);
+ swapMem->move(STARTX,STARTY+5*DY);
+@@ -88,6 +106,8 @@
+ #include "memory_sgi.cpp"
+ #elif __FreeBSD__
+ #include "memory_fbsd.cpp"
++#elif __NetBSD__
++#include "memory_netbsd.cpp"
+ #elif hpux
+ #include "memory_hpux.cpp"
+ #else
diff --git a/x11/kdebase/patches/patch-ae b/x11/kdebase/patches/patch-ae
index 7eb0af58f42..c2ff5db3e34 100644
--- a/x11/kdebase/patches/patch-ae
+++ b/x11/kdebase/patches/patch-ae
@@ -1,30 +1,16 @@
-$NetBSD: patch-ae,v 1.5 1998/08/07 11:18:07 agc Exp $
+$NetBSD: patch-ae,v 1.6 1999/11/12 04:50:00 hubertf Exp $
---- kvt/command.c.orig Tue Mar 24 01:42:51 1998
-+++ kvt/command.c Wed Mar 25 11:06:38 1998
-@@ -160,8 +160,6 @@
- extern int console;
+--- ./kcontrol/info/memory.h Mon Nov 17 20:05:18 1997
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kcontrol/info/memory.h Fri Nov 12 05:10:32 1999
+@@ -26,7 +26,11 @@
- KeySym SecureKeysym = XK_s;
--KeySym BigFontKeysym = XK_greater;
--KeySym SmallFontKeysym = XK_less;
- KeySym PageUpKeysym = XK_Prior;
- KeySym PageDownKeysym = XK_Next;
- #ifdef GREEK_KBD
-@@ -630,16 +628,6 @@
- count = 0;
- }
+ private:
-- else if((keysym == BigFontKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
-- {
--/* NewFont(BIGGER); */
-- count = 0;
-- }
-- else if((keysym==SmallFontKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
-- {
--/* NewFont(SMALLER); */
-- count = 0;
-- }
- else
-
- if((keysym == PageUpKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
++#ifdef __NetBSD__
++ QLabel *freeMem, *totalMem, *activeMem, *inactiveMem, *swapMem, *freeSwapMem;
++#else
+ QLabel *freeMem, *totalMem, *sharedMem, *bufferMem, *swapMem, *freeSwapMem;
++#endif
+ QTimer *timer;
+
+ public slots:
diff --git a/x11/kdebase/patches/patch-af b/x11/kdebase/patches/patch-af
index 487d0146ac2..06e87ba7185 100644
--- a/x11/kdebase/patches/patch-af
+++ b/x11/kdebase/patches/patch-af
@@ -1,41 +1,23 @@
-$NetBSD: patch-af,v 1.5 1998/08/07 11:18:07 agc Exp $
+$NetBSD: patch-af,v 1.6 1999/11/12 04:50:00 hubertf Exp $
---- kvt/resources.c.orig Thu Dec 11 16:31:47 1997
-+++ kvt/resources.c Wed Mar 25 11:07:12 1998
-@@ -27,8 +27,6 @@
- extern int login_shell,fat_sbar, MetaHandling;
- extern WindowInfo MyWinInfo;
- extern KeySym SecureKeysym;
--extern KeySym BigFontKeysym;
--extern KeySym SmallFontKeysym;
- extern KeySym PageUpKeysym;
- extern KeySym PageDownKeysym;
- #ifdef MAPALERT
-@@ -47,7 +45,6 @@
+--- ./kdehelp/khelp.h Mon Mar 30 21:28:15 1998
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdehelp/khelp.h Fri Nov 12 05:10:33 1999
+@@ -22,9 +22,15 @@
+ #include <sys/msg.h>
- char *mask_string = NULL, *login_shell_string = NULL, *scrollbar = NULL;
- char* SecureKeysym_string=NULL;
--char *BigFontKeysym_string = NULL, *SmallFontKeysym_string = NULL;
- char *PageUpKeysym_string = NULL, *PageDownKeysym_string = NULL;
- #ifdef GREEK_KBD
- char *elot_string = NULL;
-@@ -74,8 +71,6 @@
- {&saveLines_string, "saveLines"},
- {&meta_string, "meta"},
- {&SecureKeysym_string, "secure_key"},
-- {&BigFontKeysym_string, "bigger_font_key"},
-- {&SmallFontKeysym_string, "smaller_font_key"},
- {&PageUpKeysym_string, "page_up_key"},
- {&PageDownKeysym_string, "page_down_key"},
- #ifdef MAPALERT
-@@ -136,10 +131,6 @@
+ #ifndef __osf__
+-#ifdef BSD
+-#define msgbuf mymsg
+-#endif
++# ifdef BSD
++# define msgbuf mymsg
++# if __NetBSD_Version__ >= 104110000 /* 1.4K or higher */
++struct mymsg {
++ long mtype; /* message type (+ve integer) */
++ char mtext[1]; /* message body */
++};
++# endif
++# endif
+ #endif
- if(SecureKeysym_string)
- SecureKeysym = XStringToKeysym(SecureKeysym_string);
-- if(BigFontKeysym_string)
-- BigFontKeysym = XStringToKeysym(BigFontKeysym_string);
-- if(SmallFontKeysym_string)
-- SmallFontKeysym = XStringToKeysym(SmallFontKeysym_string);
- if(PageUpKeysym_string)
- PageUpKeysym = XStringToKeysym(PageUpKeysym_string);
- if(PageDownKeysym_string)
+ class KHelpMsg : protected msgbuf
diff --git a/x11/kdebase/patches/patch-ag b/x11/kdebase/patches/patch-ag
index 86af5e8e822..c158b1a5b2a 100644
--- a/x11/kdebase/patches/patch-ag
+++ b/x11/kdebase/patches/patch-ag
@@ -1,13 +1,22 @@
-$NetBSD: patch-ag,v 1.3 1998/08/07 11:18:07 agc Exp $
+$NetBSD: patch-ag,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- kvt/xsetup.c.orig Thu Dec 11 16:31:49 1997
-+++ kvt/xsetup.c Wed Mar 25 11:06:59 1998
-@@ -117,8 +117,6 @@
-
-
- extern KeySym SecureKeysym;
--extern KeySym BigFontKeysym;
--extern KeySym SmallFontKeysym;
- extern KeySym PageUpKeysym;
- extern KeySym PageDownKeysym;
- #ifdef GREEK_KBD
+--- ./kdm/Makefile.in Tue Sep 7 17:20:54 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/Makefile.in Fri Nov 12 05:10:30 1999
+@@ -101,7 +101,7 @@
+ LIBXDMCP = @LIBXDMCP@
+ LIBZ = @LIBZ@
+ LIB_KAB = @LIB_KAB@
+-LIB_KDECORE = @LIB_KDECORE@
++LIB_KDECORE = @prefix@/lib/libkdecore.a -lXext $(LIB_QT)
+ LIB_KDEUI = @LIB_KDEUI@
+ LIB_KDEUTIL = @LIB_KDEUTIL@
+ LIB_KFILE = @LIB_KFILE@
+@@ -233,7 +233,7 @@
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DPREFIX=\"${prefix}\"
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff --git a/x11/kdebase/patches/patch-ah b/x11/kdebase/patches/patch-ah
index 0e632378236..6e458c8006f 100644
--- a/x11/kdebase/patches/patch-ah
+++ b/x11/kdebase/patches/patch-ah
@@ -1,13 +1,31 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:18:07 agc Exp $
+$NetBSD: patch-ah,v 1.3 1999/11/12 04:50:00 hubertf Exp $
---- kaudio/Makefile.in.orig Fri Jul 10 20:35:26 1998
-+++ kaudio/Makefile.in Tue Jul 14 21:03:52 1998
-@@ -175,7 +175,7 @@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- maudio_OBJECTS = io_oss.o maudio.o sample.o
--maudio_LDADD = $(LDADD)
-+maudio_LDADD = $(LDADD) -lossaudio
- maudio_DEPENDENCIES =
- maudio_LDFLAGS =
- kaudioserver_OBJECTS = kaudioserver.o
+--- ./kdm/daemon.c Wed Sep 30 23:19:53 1998
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/daemon.c Fri Nov 12 05:10:31 1999
+@@ -38,6 +38,10 @@
+
+ #include <X11/Xos.h>
+
++#ifdef __SVR4
++#define SVR4 __SVR4
++#endif
++
+ /*
+ #if defined(SVR4) || defined(USG)
+ #include <termios.h>
+@@ -135,14 +139,12 @@
+ /*
+ * Close standard file descriptors and get rid of controlling tty
+ */
+-
+-/*
+ #if defined(SYSV) || defined(SVR4)
+ setpgrp ();
+ #else
+ setpgrp (0, getpid());
+ #endif
+-*/
++
+ setpgid( 0, getpid()); /* This should be POSIX /stefh */
+ close (0);
+ close (1);
diff --git a/x11/kdebase/patches/patch-ai b/x11/kdebase/patches/patch-ai
index 0387e23a5e7..ca2477322fa 100644
--- a/x11/kdebase/patches/patch-ai
+++ b/x11/kdebase/patches/patch-ai
@@ -1,34 +1,13 @@
-$NetBSD: patch-ai,v 1.3 1999/09/29 20:38:28 hubertf Exp $
+$NetBSD: patch-ai,v 1.4 1999/11/12 04:50:00 hubertf Exp $
-This helped me getting kdm going on Solaris 7/x86. I did not test this
-with Zoularis, but maybe it'll help if someone needs it.
-
---- kdm/daemon.c.orig Wed Sep 30 23:19:53 1998
-+++ kdm/daemon.c Fri Sep 24 16:58:00 1999
-@@ -38,6 +38,10 @@
-
- #include <X11/Xos.h>
-
-+#ifdef __SVR4
-+#define SVR4 __SVR4
-+#endif
-+
- /*
- #if defined(SVR4) || defined(USG)
- #include <termios.h>
-@@ -135,14 +139,12 @@
- /*
- * Close standard file descriptors and get rid of controlling tty
- */
--
--/*
- #if defined(SYSV) || defined(SVR4)
- setpgrp ();
- #else
- setpgrp (0, getpid());
+--- ./kdm/kdm-config.h Tue Mar 9 17:49:34 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdm-config.h Fri Nov 12 05:10:31 1999
+@@ -95,3 +95,8 @@
+ #ifdef __cplusplus
+ }
#endif
--*/
+
- setpgid( 0, getpid()); /* This should be POSIX /stefh */
- close (0);
- close (1);
++
++#ifdef SVR4
++#define NeedVarargsPrototypes 1
++#endif
diff --git a/x11/kdebase/patches/patch-aj b/x11/kdebase/patches/patch-aj
index e771da7273d..53c359cdf8b 100644
--- a/x11/kdebase/patches/patch-aj
+++ b/x11/kdebase/patches/patch-aj
@@ -1,15 +1,32 @@
-$NetBSD: patch-aj,v 1.4 1999/09/30 07:10:22 tron Exp $
+$NetBSD: patch-aj,v 1.5 1999/11/12 04:50:00 hubertf Exp $
-Yet another Solaris-only fix
-
---- kdm/kdm-config.h.orig Wed Sep 29 22:34:24 1999
-+++ kdm/kdm-config.h Wed Sep 29 22:36:27 1999
-@@ -95,3 +95,8 @@
- #ifdef __cplusplus
- }
- #endif
-+
-+
-+#ifdef SVR4
-+#define NeedVarargsPrototypes 1
-+#endif
+--- ./kdm/kdmconfig.cpp Fri Apr 23 15:12:54 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmconfig.cpp Fri Nov 12 05:10:32 1999
+@@ -134,10 +134,26 @@
+ _shutdownButton = KNone;
+ _shutdown = new QString( kc->readEntry( "Shutdown"));
+ if( _shutdown->isNull())
++#ifdef __NetBSD__
++ *_shutdown = "/sbin/shutdown -h now";
++#else /* !__NetBSD__ */
++#ifdef __SVR4
++ *_shutdown = "/usr/sbin/halt";
++#else /* !__SVR4 */
+ *_shutdown = "/sbin/halt";
++#endif /* __SVR4 */
++#endif /* __NetBSD__ */
+ _restart = new QString( kc->readEntry( "Restart"));
+ if( _restart->isNull())
+- *_restart = "/sbin/reboot";
++#ifdef __NetBSD__
++ *_restart = "/sbin/shutdown -r now";
++#else /* !__NetBSD__ */
++#ifdef __SVR4
++ *_shutdown = "/usr/sbin/reboot";
++#else /* !__SVR4 */
++ *_shutdown = "/sbin/reboot";
++#endif /* __SVR4 */
++#endif /* __NetBSD__ */
+ } else
+ _shutdownButton = KNone;
+ if( kc->hasKey( "GUIStyle")) {
diff --git a/x11/kdebase/patches/patch-ak b/x11/kdebase/patches/patch-ak
index 78445e48b1c..68655804103 100644
--- a/x11/kdebase/patches/patch-ak
+++ b/x11/kdebase/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 1999/10/23 02:06:07 hubertf Exp $
+$NetBSD: patch-ak,v 1.3 1999/11/12 04:50:00 hubertf Exp $
---- kdm/kdmshutdown.h.orig Fri Sep 4 17:33:00 1998
-+++ kdm/kdmshutdown.h Mon Oct 11 17:17:14 1999
+--- ./kdm/kdmshutdown.h Fri Sep 4 17:33:00 1998
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmshutdown.h Fri Nov 12 05:10:32 1999
@@ -49,9 +49,21 @@
class KDMShutdown : public FDialog {
Q_OBJECT
diff --git a/x11/kdebase/patches/patch-al b/x11/kdebase/patches/patch-al
index a6d5c373101..0b0cf8feafd 100644
--- a/x11/kdebase/patches/patch-al
+++ b/x11/kdebase/patches/patch-al
@@ -1,32 +1,31 @@
-$NetBSD: patch-al,v 1.2 1999/10/23 02:06:07 hubertf Exp $
+$NetBSD: patch-al,v 1.3 1999/11/12 04:50:00 hubertf Exp $
---- kdm/kdmconfig.cpp.orig Fri Apr 23 15:12:54 1999
-+++ kdm/kdmconfig.cpp Mon Oct 11 17:22:02 1999
-@@ -134,10 +134,26 @@
- _shutdownButton = KNone;
- _shutdown = new QString( kc->readEntry( "Shutdown"));
- if( _shutdown->isNull())
-+#ifdef __NetBSD__
-+ *_shutdown = "/sbin/shutdown -h now";
-+#else /* !__NetBSD__ */
-+#ifdef __SVR4
-+ *_shutdown = "/usr/sbin/halt";
-+#else /* !__SVR4 */
- *_shutdown = "/sbin/halt";
-+#endif /* __SVR4 */
-+#endif /* __NetBSD__ */
- _restart = new QString( kc->readEntry( "Restart"));
- if( _restart->isNull())
-- *_restart = "/sbin/reboot";
-+#ifdef __NetBSD__
-+ *_restart = "/sbin/shutdown -r now";
-+#else /* !__NetBSD__ */
-+#ifdef __SVR4
-+ *_shutdown = "/usr/sbin/reboot";
-+#else /* !__SVR4 */
-+ *_shutdown = "/sbin/reboot";
-+#endif /* __SVR4 */
-+#endif /* __NetBSD__ */
- } else
- _shutdownButton = KNone;
- if( kc->hasKey( "GUIStyle")) {
+--- ./kdm/resource.c Thu Jan 28 15:10:02 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/resource.c Fri Nov 12 05:10:30 1999
+@@ -92,7 +92,7 @@
+ #define DEF_SESSION XDMDIR"/Xsession" /* QUOTE(XBINDIR) "xterm -ls" */
+ #endif
+ #ifndef DEF_USER_PATH
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__NetBSD__)
+ # define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
+ # elif __linux__
+ # define DEF_USER_PATH "/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
+@@ -101,7 +101,7 @@
+ # endif
+ #endif
+ #ifndef DEF_SYSTEM_PATH
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__NetBSD__)
+ # define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
+ # elif __linux__
+ # define DEF_SYSTEM_PATH "/sbin:/usr/sbin:/bin:/usr/bin:" QUOTE(XBINDIR) ":/usr/local/bin"
+@@ -153,7 +153,7 @@
+ #define DEF_GREETER_LIB ""
+ #endif
+ #ifndef DEF_PID_FILE
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__NetBSD__)
+ # define DEF_PID_FILE _PATH_VARRUN"kdm.pid"
+ # else
+ /* this may be readonly
diff --git a/x11/kdebase/patches/patch-am b/x11/kdebase/patches/patch-am
index 4f408e51645..dd930d4375e 100644
--- a/x11/kdebase/patches/patch-am
+++ b/x11/kdebase/patches/patch-am
@@ -1,16 +1,21 @@
-$NetBSD: patch-am,v 1.3 1999/07/15 08:46:23 tron Exp $
+$NetBSD: patch-am,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- kcontrol/info/memory.h.orig Fri Jan 29 19:43:25 1999
-+++ kcontrol/info/memory.h Fri Jan 29 19:45:18 1999
-@@ -26,7 +26,11 @@
+--- ./kdm/session.c Fri Aug 20 20:35:10 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/session.c Fri Nov 12 05:10:30 1999
+@@ -50,6 +50,7 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #include <sys/types.h>
++#include <sys/param.h>
+ #ifdef AIXV3
+ # include <usersec.h>
+ #endif
+@@ -1089,7 +1090,7 @@
+ return env;
+ }
- private:
-
-+#ifdef __NetBSD__
-+ QLabel *freeMem, *totalMem, *activeMem, *inactiveMem, *swapMem, *freeSwapMem;
-+#else
- QLabel *freeMem, *totalMem, *sharedMem, *bufferMem, *swapMem, *freeSwapMem;
-+#endif
- QTimer *timer;
-
- public slots:
+-#if defined(Lynx) || defined(SCO) && !defined(SCO_USA) || !defined(HAVE_CRYPT_H)
++#if !defined(__NetBSD__) && (defined(Lynx) || defined(SCO) && !defined(SCO_USA) || !defined(HAVE_CRYPT_H))
+ char *crypt(s1, s2)
+ char *s1, *s2;
+ {
diff --git a/x11/kdebase/patches/patch-an b/x11/kdebase/patches/patch-an
index 5f4d48032bd..901dc6a18e9 100644
--- a/x11/kdebase/patches/patch-an
+++ b/x11/kdebase/patches/patch-an
@@ -1,45 +1,46 @@
-$NetBSD: patch-an,v 1.3 1999/07/15 08:46:23 tron Exp $
+$NetBSD: patch-an,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- kcontrol/info/memory.cpp.orig Mon Oct 5 12:17:29 1998
-+++ kcontrol/info/memory.cpp Sat Jan 30 00:26:18 1999
-@@ -30,6 +30,23 @@
- freeMem->setAutoResize(TRUE);
- freeMem->setFont(courierFont);
-
-+#ifdef __NetBSD__
-+ activeMem = new QLabel(klocale->translate("Active memory"), this);
-+ activeMem->move(STARTX,STARTY+2*DY);
-+ activeMem->setAutoResize(TRUE);
-+ activeMem = new QLabel("0k", this);
-+ activeMem->move(STARTX2,STARTY+2*DY);
-+ activeMem->setAutoResize(TRUE);
-+ activeMem->setFont(courierFont);
+--- ./kfm/kbind.cpp Wed Sep 1 16:52:08 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kbind.cpp Fri Nov 12 05:10:34 1999
+@@ -644,11 +644,12 @@
+ _pixlist.append( emptyPixmap );
+ }
+ }
+-
++#ifndef __NetBSD__
+ // Add default mount binding
+ QString s( i18n( "Mount" ) );
+ _list.append( s.data() );
+ _pixlist.append( emptyPixmap );
++#endif
+ }
+ else
+ {
+@@ -1948,7 +1949,7 @@
+ KIOJob * job = new KIOJob();
+ // job->unmount( point.data() );
+ // Patch ( unmount the device )
+- job->unmount( dev.data() );
++ job->unmount( dev.data(), point.data() );
+ delete config;
+ return TRUE;
+ }
+@@ -2001,12 +2002,17 @@
+ else
+ {
+ QString readonly = config->readEntry( "ReadOnly" );
++ QString fstype = config->readEntry( "FSType" );
+ bool ro = FALSE;
+ if ( !readonly.isNull() )
+ if ( readonly == '1' )
+ ro = true;
+-
+
-+ inactiveMem = new QLabel(klocale->translate("Inactive memory"), this);
-+ inactiveMem->move(STARTX,STARTY+3*DY);
-+ inactiveMem->setAutoResize(TRUE);
-+ inactiveMem = new QLabel("0k", this);
-+ inactiveMem->move(STARTX2,STARTY+3*DY);
-+ inactiveMem->setAutoResize(TRUE);
-+ inactiveMem->setFont(courierFont);
++#ifdef __NetBSD__
++ (void) new KFMAutoMount( ro, fstype, dev, point );
+#else
- sharedMem = new QLabel(i18n("Shared memory"), this);
- sharedMem->move(STARTX,STARTY+2*DY);
- sharedMem->setAutoResize(TRUE);
-@@ -45,6 +62,7 @@
- bufferMem->move(STARTX2,STARTY+3*DY);
- bufferMem->setAutoResize(TRUE);
- bufferMem->setFont(courierFont);
+ (void) new KFMAutoMount( ro, 0L, dev, 0L );
+#endif
- swapMem = new QLabel(i18n("Swap memory"), this);
- swapMem->move(STARTX,STARTY+5*DY);
-@@ -88,6 +106,8 @@
- #include "memory_sgi.cpp"
- #elif __FreeBSD__
- #include "memory_fbsd.cpp"
-+#elif __NetBSD__
-+#include "memory_netbsd.cpp"
- #elif hpux
- #include "memory_hpux.cpp"
- #else
+ delete config;
+ return TRUE;
diff --git a/x11/kdebase/patches/patch-ap b/x11/kdebase/patches/patch-ap
index 315e4ed6f37..b329e4832e8 100644
--- a/x11/kdebase/patches/patch-ap
+++ b/x11/kdebase/patches/patch-ap
@@ -1,18 +1,27 @@
-$NetBSD: patch-ap,v 1.3 1999/07/15 08:46:23 tron Exp $
+$NetBSD: patch-ap,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- po/cs/kcminfo.po.orig Sat Jan 30 01:04:03 1999
-+++ po/cs/kcminfo.po Sat Jan 30 00:53:33 1999
-@@ -205,6 +205,13 @@
- msgid "Buffer memory"
- msgstr "Vyrovnávací pamě»"
+--- ./kfm/kiojob.cpp Thu May 6 00:10:12 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kiojob.cpp Fri Nov 12 05:10:33 1999
+@@ -163,10 +163,11 @@
+ server->getSlave( this );
+ }
-+#: memory.cpp: NetBSD-specific memory types
-+msgid "Active memory"
-+msgstr "Aktivní pamě»"
-+
-+msgid "Inactive memory"
-+msgstr "Neaktivní pamě»"
-+
- #: memory.cpp:49
- msgid "Swap memory"
- msgstr "Swapovací pamě»"
+-void KIOJob::unmount( const char *_point )
++void KIOJob::unmount( const char* _dev, const char *_point )
+ {
+ action = KIOJob::JOB_UNMOUNT;
+-
++
++ mntDev = _dev;
+ mntPoint = _point;
+ mntPoint.detach();
+
+@@ -1850,7 +1851,7 @@
+ if ( action == KIOJob::JOB_MOUNT )
+ slave->mount( mntReadOnly, mntFSType.data(), mntDev.data(), mntPoint.data() );
+ else
+- slave->unmount( mntPoint.data() );
++ slave->unmount( mntDev.data() );
+ }
+ break;
+ case KIOJob::JOB_LIST:
diff --git a/x11/kdebase/patches/patch-aq b/x11/kdebase/patches/patch-aq
index 07a63239c08..bcf56c2e805 100644
--- a/x11/kdebase/patches/patch-aq
+++ b/x11/kdebase/patches/patch-aq
@@ -1,18 +1,13 @@
-$NetBSD: patch-aq,v 1.3 1999/07/15 08:46:25 tron Exp $
+$NetBSD: patch-aq,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- po/kcminfo.pot.orig Sat Jan 30 00:45:46 1999
-+++ po/kcminfo.pot Sat Jan 30 00:53:47 1999
-@@ -200,6 +200,13 @@
- msgid "Buffer memory"
- msgstr ""
-
-+#: memory.cpp: NetBSD-specific memory types
-+msgid "Active memory"
-+msgstr ""
-+
-+msgid "Inactive memory"
-+msgstr ""
-+
- #: memory.cpp:49
- msgid "Swap memory"
- msgstr ""
+--- ./kfm/kiojob.h Mon Dec 21 23:21:00 1998
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kiojob.h Fri Nov 12 05:10:34 1999
+@@ -58,7 +58,7 @@
+ * give values for every parameter.
+ */
+ void mount( bool _ro, const char *_fstype, const char* _dev, const char *_point );
+- void unmount( const char *_point );
++ void unmount( const char *_dev, const char *_point );
+ /**
+ * Gets a directory listing.
+ * Connect to 'newDirEntry' to get the directory entries. You must expect that the
diff --git a/x11/kdebase/patches/patch-ar b/x11/kdebase/patches/patch-ar
index 846a56bf09e..8ba43e9f65b 100644
--- a/x11/kdebase/patches/patch-ar
+++ b/x11/kdebase/patches/patch-ar
@@ -1,13 +1,31 @@
-$NetBSD: patch-ar,v 1.3 1999/07/15 08:46:26 tron Exp $
+$NetBSD: patch-ar,v 1.4 1999/11/12 04:50:00 hubertf Exp $
---- kcontrol/info/info.cpp.orig Mon Apr 12 11:02:27 1999
-+++ kcontrol/info/info.cpp Wed Jul 14 21:25:26 1999
-@@ -116,6 +116,8 @@ bool GetInfo_XServer_Generic( KTabListBo
- #include "info_fbsd.cpp"
- #elif hpux
- #include "info_hpux.cpp"
-+#elif __NetBSD__
-+#include "info_netbsd.cpp"
- #elif __svr4__
- #include "info_svr4.cpp"
- #else
+--- ./kfm/kioserver.cpp Mon Aug 23 18:01:03 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kioserver.cpp Fri Nov 12 05:10:34 1999
+@@ -19,7 +19,7 @@
+ #include <sys/mnttab.h>
+ #endif
+
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+ #include <sys/param.h>
+ #include <sys/ucred.h>
+ #include <sys/mount.h>
+@@ -420,7 +420,7 @@
+
+ QString KIOServer::findDeviceMountPoint( const char *_device, const char *_file )
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined (__NetBSD__)
+ if( !strcmp( "/etc/mtab", _file))
+ {
+ struct statfs *buf;
+@@ -447,7 +447,7 @@
+ }
+ }
+
+-#endif /* __FreeBSD__ */
++#endif /* __FreeBSD__ || __NetBSD__ */
+
+ #ifdef HAVE_VOLMGT
+ const char *volpath;
diff --git a/x11/kdebase/patches/patch-as b/x11/kdebase/patches/patch-as
index 71035c96da6..9bb329121d3 100644
--- a/x11/kdebase/patches/patch-as
+++ b/x11/kdebase/patches/patch-as
@@ -1,23 +1,25 @@
-$NetBSD: patch-as,v 1.5 1999/09/12 20:41:00 christos Exp $
+$NetBSD: patch-as,v 1.6 1999/11/12 04:50:00 hubertf Exp $
---- kdehelp/khelp.h.orig Mon Mar 30 14:28:15 1998
-+++ kdehelp/khelp.h Sun Sep 12 16:26:55 1999
-@@ -22,9 +22,15 @@
- #include <sys/msg.h>
+--- ./kfm/kioslave/main.cpp Thu Apr 8 00:56:48 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kioslave/main.cpp Fri Nov 12 05:10:33 1999
+@@ -319,7 +319,7 @@
+ return;
+ }
- #ifndef __osf__
--#ifdef BSD
--#define msgbuf mymsg
--#endif
-+# ifdef BSD
-+# define msgbuf mymsg
-+# if __NetBSD_Version__ >= 104110000 /* 1.4K or higher */
-+struct mymsg {
-+ long mtype; /* message type (+ve integer) */
-+ char mtext[1]; /* message body */
-+};
-+# endif
-+# endif
- #endif
-
- class KHelpMsg : protected msgbuf
+-void KIOSlave::unmount( const char *_point )
++void KIOSlave::unmount( const char *_dev )
+ {
+ char buffer[ 1024 ];
+ int t = (int)time( 0L );
+@@ -352,8 +352,10 @@
+ err = QString( "Volume Management is not running." );
+ }
+ #else
+- sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _point, t );
++ sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _dev, t );
+ retvalue = system( buffer );
++ sprintf( buffer, "eject %s", _dev);
++ system( buffer );
+
+ // test logfile here to remove it if it exists
+ // (if there is a warning, it can exist even if revalue==0)
diff --git a/x11/kdebase/patches/patch-at b/x11/kdebase/patches/patch-at
index e8e02c6ea6f..efebdb8b022 100644
--- a/x11/kdebase/patches/patch-at
+++ b/x11/kdebase/patches/patch-at
@@ -1,25 +1,30 @@
-$NetBSD: patch-at,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-at,v 1.2 1999/11/12 04:50:00 hubertf Exp $
---- kfm/kioslave/main.cpp.orig Thu Apr 8 00:56:48 1999
-+++ kfm/kioslave/main.cpp Tue Oct 5 23:26:24 1999
-@@ -319,7 +319,7 @@
- return;
- }
+--- ./kvt/command.c Mon Aug 30 22:09:45 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/command.c Fri Nov 12 05:10:31 1999
+@@ -191,8 +191,6 @@
+ extern int console;
--void KIOSlave::unmount( const char *_point )
-+void KIOSlave::unmount( const char *_dev )
- {
- char buffer[ 1024 ];
- int t = (int)time( 0L );
-@@ -352,8 +352,10 @@
- err = QString( "Volume Management is not running." );
+ KeySym SecureKeysym = XK_s;
+-KeySym BigFontKeysym = XK_greater;
+-KeySym SmallFontKeysym = XK_less;
+ KeySym PageUpKeysym = XK_Prior;
+ KeySym PageDownKeysym = XK_Next;
+ #ifdef GREEK_KBD
+@@ -756,16 +754,6 @@
+ count = 0;
}
- #else
-- sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _point, t );
-+ sprintf( buffer, "umount %s 2>"_PATH_TMP"mnt%i", _dev, t );
- retvalue = system( buffer );
-+ sprintf( buffer, "eject %s", _dev);
-+ system( buffer );
-
- // test logfile here to remove it if it exists
- // (if there is a warning, it can exist even if revalue==0)
+
+- else if((keysym == BigFontKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
+- {
+-/* NewFont(BIGGER); */
+- count = 0;
+- }
+- else if((keysym==SmallFontKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
+- {
+-/* NewFont(SMALLER); */
+- count = 0;
+- }
+ else
+
+ if((keysym == PageUpKeysym)&&((ev->xkey.state &Mod1Mask) == Mod1Mask))
diff --git a/x11/kdebase/patches/patch-au b/x11/kdebase/patches/patch-au
index 6dbd4aaad92..f42f4134036 100644
--- a/x11/kdebase/patches/patch-au
+++ b/x11/kdebase/patches/patch-au
@@ -1,35 +1,41 @@
-$NetBSD: patch-au,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-au,v 1.2 1999/11/12 04:50:00 hubertf Exp $
-diff -u kfm/kfmprops.cpp.orig kfm/kfmprops.cpp
---- kfm/kfmprops.cpp.orig Tue Oct 5 20:16:26 1999
-+++ kfm/kfmprops.cpp Tue Oct 5 20:18:37 1999
-@@ -2156,14 +2156,18 @@
- mountpoint = new QLineEdit( this, "LineEdit_2" );
- mountpoint->setGeometry( 10, 110, 180, 30 );
- mountpoint->setText( "" );
-+#ifndef __NetBSD__
- if ( !IamRoot )
- mountpoint->setEnabled( false );
-+#endif
-
- readonly = new QCheckBox( this, "CheckBox_1" );
- readonly->setGeometry( 220, 40, 130, 30 );
- readonly->setText( klocale->translate("Readonly") );
-+#ifndef __NetBSD__
- if ( !IamRoot )
- readonly->setEnabled( false );
-+#endif
-
- tmpQLabel = new QLabel( this, "Label_4" );
- tmpQLabel->move( 10, 150 );
-@@ -2173,8 +2177,10 @@
- fstype = new QLineEdit( this, "LineEdit_3" );
- fstype->setGeometry( 10, 180, 280, 30 );
- fstype->setText( "" );
-+#ifndef __NetBSD__
- if ( !IamRoot )
- fstype->setEnabled( false );
-+#endif
+--- ./kvt/resources.c Tue Mar 30 10:23:19 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/resources.c Fri Nov 12 05:10:31 1999
+@@ -28,8 +28,6 @@
+ extern int login_shell,fat_sbar, MetaHandling;
+ extern WindowInfo MyWinInfo;
+ extern KeySym SecureKeysym;
+-extern KeySym BigFontKeysym;
+-extern KeySym SmallFontKeysym;
+ extern KeySym PageUpKeysym;
+ extern KeySym PageDownKeysym;
+ #ifdef MAPALERT
+@@ -48,7 +46,6 @@
- tmpQLabel = new QLabel( this, "Label_5" );
- tmpQLabel->move( 10, 220 );
+ char *mask_string = NULL, *login_shell_string = NULL, *scrollbar = NULL;
+ char* SecureKeysym_string=NULL;
+-char *BigFontKeysym_string = NULL, *SmallFontKeysym_string = NULL;
+ char *PageUpKeysym_string = NULL, *PageDownKeysym_string = NULL;
+ #ifdef GREEK_KBD
+ char *elot_string = NULL;
+@@ -75,8 +72,6 @@
+ {&saveLines_string, "saveLines"},
+ {&meta_string, "meta"},
+ {&SecureKeysym_string, "secure_key"},
+- {&BigFontKeysym_string, "bigger_font_key"},
+- {&SmallFontKeysym_string, "smaller_font_key"},
+ {&PageUpKeysym_string, "page_up_key"},
+ {&PageDownKeysym_string, "page_down_key"},
+ #ifdef MAPALERT
+@@ -137,10 +132,6 @@
+
+ if(SecureKeysym_string)
+ SecureKeysym = XStringToKeysym(SecureKeysym_string);
+- if(BigFontKeysym_string)
+- BigFontKeysym = XStringToKeysym(BigFontKeysym_string);
+- if(SmallFontKeysym_string)
+- SmallFontKeysym = XStringToKeysym(SmallFontKeysym_string);
+ if(PageUpKeysym_string)
+ PageUpKeysym = XStringToKeysym(PageUpKeysym_string);
+ if(PageDownKeysym_string)
diff --git a/x11/kdebase/patches/patch-av b/x11/kdebase/patches/patch-av
index eb46221370a..b5b8e7435f7 100644
--- a/x11/kdebase/patches/patch-av
+++ b/x11/kdebase/patches/patch-av
@@ -1,28 +1,13 @@
-$NetBSD: patch-av,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-av,v 1.2 1999/11/12 04:50:00 hubertf Exp $
-diff -u kfm/kiojob.cpp.orig kfm/kiojob.cpp
---- kfm/kiojob.cpp.orig Tue Oct 5 20:27:53 1999
-+++ kfm/kiojob.cpp Tue Oct 5 22:32:24 1999
-@@ -163,10 +163,11 @@
- server->getSlave( this );
- }
+--- ./kvt/xsetup.c Tue Mar 30 10:23:20 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kvt/xsetup.c Fri Nov 12 05:10:31 1999
+@@ -135,8 +135,6 @@
--void KIOJob::unmount( const char *_point )
-+void KIOJob::unmount( const char* _dev, const char *_point )
- {
- action = KIOJob::JOB_UNMOUNT;
--
-+
-+ mntDev = _dev;
- mntPoint = _point;
- mntPoint.detach();
-@@ -1850,7 +1851,7 @@
- if ( action == KIOJob::JOB_MOUNT )
- slave->mount( mntReadOnly, mntFSType.data(), mntDev.data(), mntPoint.data() );
- else
-- slave->unmount( mntPoint.data() );
-+ slave->unmount( mntDev.data() );
- }
- break;
- case KIOJob::JOB_LIST:
+ extern KeySym SecureKeysym;
+-extern KeySym BigFontKeysym;
+-extern KeySym SmallFontKeysym;
+ extern KeySym PageUpKeysym;
+ extern KeySym PageDownKeysym;
+ #ifdef GREEK_KBD
diff --git a/x11/kdebase/patches/patch-aw b/x11/kdebase/patches/patch-aw
index 5ec12ff3a3b..e371180b7fd 100644
--- a/x11/kdebase/patches/patch-aw
+++ b/x11/kdebase/patches/patch-aw
@@ -1,32 +1,18 @@
-$NetBSD: patch-aw,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-aw,v 1.2 1999/11/12 04:50:01 hubertf Exp $
-diff -u kfm/kioserver.cpp.orig kfm/kioserver.cpp
---- kfm/kioserver.cpp.orig Tue Oct 5 20:30:24 1999
-+++ kfm/kioserver.cpp Tue Oct 5 20:36:31 1999
-@@ -19,7 +19,7 @@
- #include <sys/mnttab.h>
- #endif
+--- ./po/cs/kcminfo.po Tue Mar 30 01:21:49 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/po/cs/kcminfo.po Fri Nov 12 05:10:32 1999
+@@ -205,6 +205,13 @@
+ msgid "Buffer memory"
+ msgstr "Vyrovnávací pamě»"
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined (__NetBSD__)
- #include <sys/param.h>
- #include <sys/ucred.h>
- #include <sys/mount.h>
-@@ -420,7 +420,7 @@
-
- QString KIOServer::findDeviceMountPoint( const char *_device, const char *_file )
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined (__NetBSD__)
- if( !strcmp( "/etc/mtab", _file))
- {
- struct statfs *buf;
-@@ -447,7 +447,7 @@
- }
- }
-
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
-
- #ifdef HAVE_VOLMGT
- const char *volpath;
++#: memory.cpp: NetBSD-specific memory types
++msgid "Active memory"
++msgstr "Aktivní pamě»"
++
++msgid "Inactive memory"
++msgstr "Neaktivní pamě»"
++
+ #: memory.cpp:49
+ msgid "Swap memory"
+ msgstr "Swapovací pamě»"
diff --git a/x11/kdebase/patches/patch-ax b/x11/kdebase/patches/patch-ax
index c9bb65b38f1..8045aead26a 100644
--- a/x11/kdebase/patches/patch-ax
+++ b/x11/kdebase/patches/patch-ax
@@ -1,47 +1,19 @@
-$NetBSD: patch-ax,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-ax,v 1.2 1999/11/12 04:50:01 hubertf Exp $
-diff -u kfm/kbind.cpp.orig kfm/kbind.cpp
---- kfm/kbind.cpp.orig Tue Oct 5 22:10:13 1999
-+++ kfm/kbind.cpp Tue Oct 5 23:16:57 1999
-@@ -644,11 +644,12 @@
- _pixlist.append( emptyPixmap );
- }
- }
--
-+#ifndef __NetBSD__
- // Add default mount binding
- QString s( i18n( "Mount" ) );
- _list.append( s.data() );
- _pixlist.append( emptyPixmap );
-+#endif
- }
- else
- {
-@@ -1948,7 +1949,7 @@
- KIOJob * job = new KIOJob();
- // job->unmount( point.data() );
- // Patch ( unmount the device )
-- job->unmount( dev.data() );
-+ job->unmount( dev.data(), point.data() );
- delete config;
- return TRUE;
- }
-@@ -2001,12 +2002,17 @@
- else
- {
- QString readonly = config->readEntry( "ReadOnly" );
-+ QString fstype = config->readEntry( "FSType" );
- bool ro = FALSE;
- if ( !readonly.isNull() )
- if ( readonly == '1' )
- ro = true;
--
-+
-+#ifdef __NetBSD__
-+ (void) new KFMAutoMount( ro, fstype, dev, point );
-+#else
- (void) new KFMAutoMount( ro, 0L, dev, 0L );
-+#endif
+--- ./po/kcminfo.pot Tue Mar 30 01:21:33 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/po/kcminfo.pot Fri Nov 12 05:10:32 1999
+@@ -200,6 +200,13 @@
+ msgid "Buffer memory"
+ msgstr ""
- delete config;
- return TRUE;
++#: memory.cpp: NetBSD-specific memory types
++msgid "Active memory"
++msgstr ""
++
++msgid "Inactive memory"
++msgstr ""
++
+ #: memory.cpp:49
+ msgid "Swap memory"
+ msgstr ""
+
diff --git a/x11/kdebase/patches/patch-ay b/x11/kdebase/patches/patch-ay
index f3c41f39115..d15a07822fc 100644
--- a/x11/kdebase/patches/patch-ay
+++ b/x11/kdebase/patches/patch-ay
@@ -1,14 +1,34 @@
-$NetBSD: patch-ay,v 1.1 1999/10/08 15:55:08 bouyer Exp $
+$NetBSD: patch-ay,v 1.2 1999/11/12 04:50:01 hubertf Exp $
-diff -u kfm/kiojob.h.orig kfm/kiojob.h
---- kfm/kiojob.h.orig Tue Oct 5 22:33:18 1999
-+++ kfm/kiojob.h Tue Oct 5 22:33:43 1999
-@@ -58,7 +58,7 @@
- * give values for every parameter.
- */
- void mount( bool _ro, const char *_fstype, const char* _dev, const char *_point );
-- void unmount( const char *_point );
-+ void unmount( const char *_dev, const char *_point );
- /**
- * Gets a directory listing.
- * Connect to 'newDirEntry' to get the directory entries. You must expect that the
+--- ./kfm/kfmprops.cpp Wed Aug 18 18:15:38 1999
++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kfm/kfmprops.cpp Fri Nov 12 05:10:33 1999
+@@ -2156,14 +2156,18 @@
+ mountpoint = new QLineEdit( this, "LineEdit_2" );
+ mountpoint->setGeometry( 10, 110, 180, 30 );
+ mountpoint->setText( "" );
++#ifndef __NetBSD__
+ if ( !IamRoot )
+ mountpoint->setEnabled( false );
++#endif
+
+ readonly = new QCheckBox( this, "CheckBox_1" );
+ readonly->setGeometry( 220, 40, 130, 30 );
+ readonly->setText( klocale->translate("Readonly") );
++#ifndef __NetBSD__
+ if ( !IamRoot )
+ readonly->setEnabled( false );
++#endif
+
+ tmpQLabel = new QLabel( this, "Label_4" );
+ tmpQLabel->move( 10, 150 );
+@@ -2173,8 +2177,10 @@
+ fstype = new QLineEdit( this, "LineEdit_3" );
+ fstype->setGeometry( 10, 180, 280, 30 );
+ fstype->setText( "" );
++#ifndef __NetBSD__
+ if ( !IamRoot )
+ fstype->setEnabled( false );
++#endif
+
+ tmpQLabel = new QLabel( this, "Label_5" );
+ tmpQLabel->move( 10, 220 );