diff options
Diffstat (limited to 'x11/kdebase/patches')
32 files changed, 0 insertions, 1046 deletions
diff --git a/x11/kdebase/patches/patch-aa b/x11/kdebase/patches/patch-aa deleted file mode 100644 index 4a6c7b57051..00000000000 --- a/x11/kdebase/patches/patch-aa +++ /dev/null @@ -1,168 +0,0 @@ -$NetBSD: patch-aa,v 1.19 2001/09/10 08:23:19 skrll Exp $ - ---- configure.orig Tue Sep 7 16:21:06 1999 -+++ configure -@@ -517,9 +517,10 @@ - # Prefer explicitly selected file to automatically selected ones. - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ CONFIG_SITE="$prefix/share/kde/config.site $prefix/etc/config.site" - else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+ CONFIG_SITE="$ac_default_prefix/share/kde/config.site $ac_default_prefix/e -+tc/config.site" - fi - fi - for ac_site_file in $CONFIG_SITE; do -@@ -3994,37 +3995,37 @@ - if test "$ac_use_path_checking" = "default"; then - - if test -z "$kde_htmldir"; then -- kde_htmldir='\$(prefix)/share/doc/HTML' -+ kde_htmldir='\$(prefix)/share/doc/kde/HTML' - fi - if test -z "$kde_appsdir"; then -- kde_appsdir='\$(prefix)/share/applnk' -+ kde_appsdir='\$(prefix)/share/kde/applnk' - fi - if test -z "$kde_icondir"; then -- kde_icondir='\$(prefix)/share/icons' -+ kde_icondir='\$(prefix)/share/kde/kde/icons' - fi - if test -z "$kde_sounddir"; then -- kde_sounddir='\$(prefix)/share/sounds' -+ kde_sounddir='\$(prefix)/share/kde/sounds' - fi - if test -z "$kde_datadir"; then -- kde_datadir='\$(prefix)/share/apps' -+ kde_datadir='\$(prefix)/share/kde/apps' - fi - if test -z "$kde_locale"; then -- kde_locale='\$(prefix)/share/locale' -+ kde_locale='\$(prefix)/share/kde/locale' - fi - if test -z "$kde_cgidir"; then -- kde_cgidir='\$(exec_prefix)/cgi-bin' -+ kde_cgidir='\$(exec_prefix)/kde-cgi-bin' - fi - if test -z "$kde_confdir"; then -- kde_confdir='\$(prefix)/share/config' -+ kde_confdir='\$(prefix)/share/kde/config' - fi - if test -z "$kde_mimedir"; then -- kde_mimedir='\$(prefix)/share/mimelnk' -+ kde_mimedir='\$(prefix)/share/kde/mimelnk' - fi - if test -z "$kde_toolbardir"; then -- kde_toolbardir='\$(prefix)/share/toolbar' -+ kde_toolbardir='\$(prefix)/share/kde/toolbar' - fi - if test -z "$kde_wallpaperdir"; then -- kde_wallpaperdir='\$(prefix)/share/wallpapers' -+ kde_wallpaperdir='\$(prefix)/share/kde/wallpapers' - fi - if test -z "$kde_bindir"; then - kde_bindir='\$(exec_prefix)/bin' -@@ -4823,7 +4824,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lpam -ldl $LIBS" -+LIBS="-lpam $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4829 "configure" - #include "confdefs.h" -@@ -4847,7 +4848,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PASSWDLIB="-lpam -ldl" -+ PASSWDLIB="-lpam" - cat >> confdefs.h <<EOF - #define HAVE_PAM_LIB 1 - EOF -@@ -5628,7 +5629,7 @@ - - ac_save_ldflags="$LDFLAGS" - ac_save_cflags="$CFLAGS" -- LDFLAGS="$LDFLAGS $GL_LDFLAGS $all_libraries -lMesaGL -lMesaGLU -lX11 -lXext -lm $LIBSOCKET" -+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $all_libraries -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET" - CFLAGS="$CFLAGS $X_INCLUDES" - test ! -z "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" - cat > conftest.$ac_ext <<EOF -@@ -5665,9 +5666,9 @@ - EOF - - if test "$GL_LDFLAGS" = ""; then -- GLLIB='-lMesaGL -lMesaGLU $(LIB_X11)' -+ GLLIB='-lGL -lGLU $(LIB_X11)' - else -- GLLIB="$GL_LDFLAGS -lMesaGL -lMesaGLU "'$(LIB_X11)' -+ GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)' - fi - if test "$GL_INCLUDE" = ""; then - GLINC="" -@@ -6166,6 +6167,46 @@ - - - -+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -+echo "configure:6171: checking for main in -lossaudio" >&5 -+ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lossaudio $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 6179 "configure" -+#include "confdefs.h" -+ -+int main() { -+main() -+; return 0; } -+EOF -+if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ LIBOSSAUDIO=-lossaudio -+else -+ echo "$ac_t""no" 1>&6 -+LIBOSSAUDIO='' -+fi -+ -+ -+ -+ - if test "$kde_have_setupterm" = "yes"; then - cat >> confdefs.h <<EOF - #define HAVE_SETUPTERM 1 -@@ -7420,6 +7461,7 @@ - s%@XPMLIB@%$XPMLIB%g - s%@XPM_SAVERS@%$XPM_SAVERS%g - s%@LIBCURSES@%$LIBCURSES%g -+s%@LIBOSSAUDIO@%$LIBOSSAUDIO%g - s%@LIBVOLMGT@%$LIBVOLMGT%g - s%@topdir@%$topdir%g - s%@RUN_KAPPFINDER@%$RUN_KAPPFINDER%g -@@ -7567,7 +7609,6 @@ - kdehelp/Makefile \ - kdehelp/index/Makefile \ - kdehelp/search/Makefile \ -- kdehelp/rman/Makefile \ - kdm/Makefile \ - kdm/config/Makefile \ - kdm/config/kdmrc \ diff --git a/x11/kdebase/patches/patch-ab b/x11/kdebase/patches/patch-ab deleted file mode 100644 index 075b567f04c..00000000000 --- a/x11/kdebase/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2001/09/10 08:23:19 skrll Exp $ - ---- kaudio/Makefile.in.orig Tue Sep 7 16:20:48 1999 -+++ kaudio/Makefile.in -@@ -201,7 +201,7 @@ - CPPFLAGS = @CPPFLAGS@ - LIBS = @LIBS@ - maudio_OBJECTS = io_oss.o maudio.o sample.o --maudio_LDADD = $(LDADD) -+maudio_LDADD = $(LDADD) @LIBOSSAUDIO@ - maudio_DEPENDENCIES = - maudio_LDFLAGS = - kaudioserver_OBJECTS = kaudioserver.o diff --git a/x11/kdebase/patches/patch-ac b/x11/kdebase/patches/patch-ac deleted file mode 100644 index 76ec37da146..00000000000 --- a/x11/kdebase/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2001/09/10 08:23:19 skrll Exp $ - ---- kcontrol/info/info.cpp.orig Fri Jul 23 22:56:57 1999 -+++ kcontrol/info/info.cpp -@@ -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 deleted file mode 100644 index 1627704df30..00000000000 --- a/x11/kdebase/patches/patch-ad +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ad,v 1.10 2001/09/10 08:23:19 skrll Exp $ - ---- kcontrol/info/memory.cpp.orig Fri Jul 23 22:56:59 1999 -+++ kcontrol/info/memory.cpp -@@ -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 deleted file mode 100644 index d44c13fdfd7..00000000000 --- a/x11/kdebase/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.8 2001/09/10 08:23:19 skrll Exp $ - ---- kcontrol/info/memory.h.orig Mon Nov 17 19:05:18 1997 -+++ kcontrol/info/memory.h -@@ -26,7 +26,11 @@ - - private: - -+#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 deleted file mode 100644 index 26b4653008c..00000000000 --- a/x11/kdebase/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.8 2001/09/10 08:23:19 skrll Exp $ - ---- kdehelp/khelp.h.orig Mon Mar 30 20:28:15 1998 -+++ kdehelp/khelp.h -@@ -22,9 +22,15 @@ - #include <sys/msg.h> - - #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 diff --git a/x11/kdebase/patches/patch-ag b/x11/kdebase/patches/patch-ag deleted file mode 100644 index 13dd76e5e1b..00000000000 --- a/x11/kdebase/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/Makefile.in.orig Tue Sep 7 16:20:54 1999 -+++ kdm/Makefile.in -@@ -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 deleted file mode 100644 index acaff167bdd..00000000000 --- a/x11/kdebase/patches/patch-ah +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/daemon.c.orig Wed Sep 30 22:19:53 1998 -+++ kdm/daemon.c -@@ -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 deleted file mode 100644 index 0f5b2042d01..00000000000 --- a/x11/kdebase/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.6 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/kdm-config.h.orig Tue Mar 9 16:49:34 1999 -+++ kdm/kdm-config.h -@@ -95,3 +95,8 @@ - #ifdef __cplusplus - } - #endif -+ -+ -+#ifdef SVR4 -+#define NeedVarargsPrototypes 1 -+#endif diff --git a/x11/kdebase/patches/patch-aj b/x11/kdebase/patches/patch-aj deleted file mode 100644 index 0da11e011b5..00000000000 --- a/x11/kdebase/patches/patch-aj +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aj,v 1.7 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/kdmconfig.cpp.orig Fri Apr 23 14:12:54 1999 -+++ kdm/kdmconfig.cpp -@@ -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()) -+#ifdef __NetBSD__ -+ *_restart = "/sbin/shutdown -r now"; -+#else /* !__NetBSD__ */ -+#ifdef __SVR4 -+ *_restart = "/usr/sbin/reboot"; -+#else /* !__SVR4 */ - *_restart = "/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 deleted file mode 100644 index aa50189da5b..00000000000 --- a/x11/kdebase/patches/patch-ak +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/kdmshutdown.h.orig Fri Sep 4 16:33:00 1998 -+++ kdm/kdmshutdown.h -@@ -49,9 +49,21 @@ - class KDMShutdown : public FDialog { - Q_OBJECT - public: -+#ifdef __NetBSD__ -+ KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0, -+ const char* _shutdown = "/sbin/shutdown -h now", -+ const char* _restart = "/sbin/shutdown -r now"); -+#else /* !__NetBSD__ */ -+#ifdef __SVR4 -+ KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0, -+ const char* _shutdown = "/usr/sbin/halt", -+ const char* _restart = "/usr/sbin/reboot"); -+#else /* !__SVR4 */ - KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0, - const char* _shutdown = "/sbin/halt", - const char* _restart = "/sbin/reboot"); -+#endif /* __SVR4 */ -+#endif /* __NetBSD__ */ - private slots: - void rb_clicked(int); - void pw_entered(); diff --git a/x11/kdebase/patches/patch-al b/x11/kdebase/patches/patch-al deleted file mode 100644 index 4bc3a3aa138..00000000000 --- a/x11/kdebase/patches/patch-al +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-al,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/resource.c.orig Thu Jan 28 14:10:02 1999 -+++ kdm/resource.c -@@ -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 deleted file mode 100644 index 8e53ed5544b..00000000000 --- a/x11/kdebase/patches/patch-am +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-am,v 1.8 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/session.c.orig Fri Aug 20 19:35:10 1999 -+++ kdm/session.c -@@ -50,6 +50,7 @@ - #include <pwd.h> - #include <grp.h> - #include <sys/types.h> -+#include <sys/param.h> - #ifdef AIXV3 - # include <usersec.h> - #endif -@@ -103,7 +104,7 @@ - char *crypt(char *key, char *salt); - #endif - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - #include <login_cap.h> /* BSDI-like login classes */ - #define HAVE_SETUSERCONTEXT /* assume we have setusercontext if we have - * the header file -@@ -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; - { diff --git a/x11/kdebase/patches/patch-an b/x11/kdebase/patches/patch-an deleted file mode 100644 index 375701cad6c..00000000000 --- a/x11/kdebase/patches/patch-an +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-an,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kbind.cpp.orig Wed Sep 1 15:52:08 1999 -+++ kfm/kbind.cpp -@@ -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 - - delete config; - return TRUE; diff --git a/x11/kdebase/patches/patch-ao b/x11/kdebase/patches/patch-ao deleted file mode 100644 index a6fedc03abe..00000000000 --- a/x11/kdebase/patches/patch-ao +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ao,v 1.7 2001/09/10 08:23:19 skrll Exp $ - ---- kdm/kgreeter.cpp.orig Mon Aug 16 12:36:34 1999 -+++ kdm/kgreeter.cpp -@@ -65,7 +65,7 @@ - #include <shadow.h> - #endif - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - #include <login_cap.h> /* BSDI-like login classes */ - #endif - -@@ -521,7 +521,7 @@ - memset(swd->sp_pwdp, 0, strlen(swd->sp_pwdp)); - #endif - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - lc = login_getpwclass(pwd); - #endif - -@@ -531,7 +531,7 @@ - restrict_time()) - rval = true; - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - login_close(lc); - lc = NULL; - #endif -@@ -539,7 +539,7 @@ - return rval; - } - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - bool - KGreeter::restrict_time() - { -@@ -581,7 +581,7 @@ - #define _PATH_NOLOGIN "/etc/nologin" - #endif - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - /* Do we ignore a nologin file? */ - if (login_getcapbool(lc, "ignorenologin", 0)) - return false; -@@ -597,7 +597,7 @@ - - QFile f; - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - if (*file) { - f.setName(file); - f.open(IO_ReadOnly); -@@ -632,7 +632,7 @@ - // don't deny root to log in - if (!pwd->pw_uid) return false; - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - bool quietlog = login_getcapbool(lc, "hushlogin", 0); - time_t warntime = login_getcaptime(lc, "warnexpire", - DEFAULT_WARN, DEFAULT_WARN); -@@ -694,7 +694,7 @@ - } - #endif - --#ifdef HAVE_LOGIN_CAP_H -+#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__) - bool - KGreeter::restrict_nohome(){ - // don't deny root to log in diff --git a/x11/kdebase/patches/patch-ap b/x11/kdebase/patches/patch-ap deleted file mode 100644 index 229321a1ec4..00000000000 --- a/x11/kdebase/patches/patch-ap +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ap,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kiojob.cpp.orig Wed May 5 23:10:12 1999 -+++ kfm/kiojob.cpp -@@ -163,10 +163,11 @@ - server->getSlave( this ); - } - --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 deleted file mode 100644 index 091a4f4caa8..00000000000 --- a/x11/kdebase/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kiojob.h.orig Mon Dec 21 22:21:00 1998 -+++ kfm/kiojob.h -@@ -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 deleted file mode 100644 index 21a4a23b132..00000000000 --- a/x11/kdebase/patches/patch-ar +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ar,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kioserver.cpp.orig Mon Aug 23 17:01:03 1999 -+++ kfm/kioserver.cpp -@@ -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 deleted file mode 100644 index 7616eba4264..00000000000 --- a/x11/kdebase/patches/patch-as +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-as,v 1.8 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kioslave/main.cpp.orig Wed Apr 7 23:56:48 1999 -+++ kfm/kioslave/main.cpp -@@ -319,7 +319,7 @@ - return; - } - --void KIOSlave::unmount( const char *_point ) -+void KIOSlave::unmount( const char *_dev ) - { - char buffer[ 1024 ]; - int t = (int)time( 0L ); -@@ -331,7 +331,7 @@ - char *res; - - if( volmgt_running() ) { -- if( (res = volmgt_symname( (char *) _point )) == NULL ) { -+ if( (res = volmgt_symname( (char *) _dev )) == NULL ) { - retvalue = 1; - err = QString( strerror( errno )); - } else { -@@ -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 deleted file mode 100644 index c4378132b42..00000000000 --- a/x11/kdebase/patches/patch-at +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-at,v 1.4 2001/09/10 08:23:19 skrll Exp $ - ---- kvt/command.c.orig Mon Aug 30 21:09:45 1999 -+++ kvt/command.c -@@ -191,8 +191,6 @@ - extern int console; - - 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 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 deleted file mode 100644 index e69abcd34fc..00000000000 --- a/x11/kdebase/patches/patch-au +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-au,v 1.4 2001/09/10 08:23:19 skrll Exp $ - ---- kvt/resources.c.orig Tue Mar 30 09:23:19 1999 -+++ kvt/resources.c -@@ -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 @@ - - 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 deleted file mode 100644 index 7623deb380b..00000000000 --- a/x11/kdebase/patches/patch-av +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-av,v 1.5 2001/09/10 08:23:19 skrll Exp $ - ---- kvt/xsetup.c.orig Tue Mar 30 09:23:20 1999 -+++ kvt/xsetup.c -@@ -135,8 +135,6 @@ - - - extern KeySym SecureKeysym; --extern KeySym BigFontKeysym; --extern KeySym SmallFontKeysym; - extern KeySym PageUpKeysym; - extern KeySym PageDownKeysym; - #ifdef GREEK_KBD -@@ -145,9 +143,11 @@ - #endif - - static char *termlist[] = { -+#ifndef __NetBSD__ - "kvt-color", - "xterm-color", - "kvt", -+#endif - "xterm", - "vt100", - "ansi", diff --git a/x11/kdebase/patches/patch-aw b/x11/kdebase/patches/patch-aw deleted file mode 100644 index 30d91d80e1f..00000000000 --- a/x11/kdebase/patches/patch-aw +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aw,v 1.3 2001/09/10 08:23:19 skrll Exp $ - ---- po/cs/kcminfo.po.orig Tue Mar 30 00:21:49 1999 -+++ po/cs/kcminfo.po -@@ -205,6 +205,13 @@ - msgid "Buffer memory" - msgstr "Vyrovnávací pamě»" - -+#: 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 deleted file mode 100644 index ab59b300e34..00000000000 --- a/x11/kdebase/patches/patch-ax +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ax,v 1.3 2001/09/10 08:23:19 skrll Exp $ - ---- po/kcminfo.pot.orig Tue Mar 30 00:21:33 1999 -+++ po/kcminfo.pot -@@ -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 "" diff --git a/x11/kdebase/patches/patch-ay b/x11/kdebase/patches/patch-ay deleted file mode 100644 index 3f64fe27d41..00000000000 --- a/x11/kdebase/patches/patch-ay +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ay,v 1.3 2001/09/10 08:23:19 skrll Exp $ - ---- kfm/kfmprops.cpp.orig Wed Aug 18 17:15:38 1999 -+++ kfm/kfmprops.cpp -@@ -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 ); diff --git a/x11/kdebase/patches/patch-az b/x11/kdebase/patches/patch-az deleted file mode 100644 index 228b59cf0ff..00000000000 --- a/x11/kdebase/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.2 2001/09/10 08:23:19 skrll Exp $ - ---- kcontrol/kwm/titlebar.cpp.orig Fri Apr 9 03:55:32 1999 -+++ kcontrol/kwm/titlebar.cpp -@@ -66,7 +66,7 @@ - static QPixmap* loadIcon(const char* name) - { - QPixmap *result = new QPixmap; -- QString fn = "/share/apps/kwm/pics/"; -+ QString fn = "/share/kde/apps/kwm/pics/"; - fn.append(name); - QString s = KApplication::findFile(fn); - if (!s.isEmpty()) -@@ -1146,7 +1146,7 @@ - - iconLoader->getDirList()->clear(); - -- iconLoader->insertDirectory(0, kapp->localkdedir()+"/share/apps/kwm/pics"); -+ iconLoader->insertDirectory(0, kapp->localkdedir()+"/share/kde/apps/kwm/pics"); - iconLoader->insertDirectory(1, kapp->kde_datadir()+"/kwm/pics"); - iconLoader->insertDirectory(2, kapp->localkdedir()+"/share/apps/kwm/toolbar"); - iconLoader->insertDirectory(3, kapp->kde_datadir()+"/kwm/toolbar"); diff --git a/x11/kdebase/patches/patch-ba b/x11/kdebase/patches/patch-ba deleted file mode 100644 index b5906e0bde7..00000000000 --- a/x11/kdebase/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2001/09/10 08:23:19 skrll Exp $ - ---- kdehelp/Makefile.am.orig Sun Aug 8 15:26:45 1999 -+++ kdehelp/Makefile.am -@@ -2,7 +2,7 @@ - INCLUDES = $(all_includes) - LDFLAGS = $(all_libraries) $(KDE_RPATH) - LDADD = $(LIB_KFILE) $(LIB_KHTMLW) $(LIBCOMPAT) --SUBDIRS = search index rman -+SUBDIRS = search index - - ########## Files ########## - diff --git a/x11/kdebase/patches/patch-bb b/x11/kdebase/patches/patch-bb deleted file mode 100644 index 9a2741206e8..00000000000 --- a/x11/kdebase/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.2 2001/09/10 08:23:19 skrll Exp $ - ---- kdehelp/Makefile.in.orig Tue Sep 7 16:20:54 1999 -+++ kdehelp/Makefile.in -@@ -174,7 +174,7 @@ - INCLUDES = $(all_includes) - LDFLAGS = $(all_libraries) $(KDE_RPATH) - LDADD = $(LIB_KFILE) $(LIB_KHTMLW) $(LIBCOMPAT) --SUBDIRS = search index rman -+SUBDIRS = search index - - ########## Files ########## - diff --git a/x11/kdebase/patches/patch-bc b/x11/kdebase/patches/patch-bc deleted file mode 100644 index 0b48e86a9d8..00000000000 --- a/x11/kdebase/patches/patch-bc +++ /dev/null @@ -1,107 +0,0 @@ -$NetBSD: patch-bc,v 1.5 2003/07/02 18:06:40 jmmv Exp $ - ---- kdehelp/man.cpp.orig Thu Aug 19 20:32:11 1999 -+++ kdehelp/man.cpp -@@ -20,6 +20,9 @@ - #include "man.h" - #include "error.h" - #include <errno.h> -+#ifdef __NetBSD__ -+#include <sys/param.h> -+#endif - - #include "dbnew.h" - -@@ -171,11 +174,17 @@ - } - else - { --#ifndef __FreeBSD__ -- searchPath[numPaths++] = StrDup("/usr/man"); --#else -+#ifdef __FreeBSD__ - searchPath[numPaths++] = StrDup(_PATH_MAN); - searchPath[numPaths++] = StrDup("/usr/X11R6/man"); -+#else -+#ifdef __NetBSD__ -+ searchPath[numPaths++] = StrDup(PREFIX "/man"); -+ searchPath[numPaths++] = StrDup("/usr/share/man"); -+ searchPath[numPaths++] = StrDup("/usr/X11R6/man"); -+#else -+ searchPath[numPaths++] = StrDup("/usr/man"); -+#endif - #endif - searchPath[numPaths++] = StrDup("/usr/local/man"); - } -@@ -271,10 +280,18 @@ - // - void cManSection::ReadDir(const char *dirName ) - { -+#ifdef __NetBSD__ -+ DIR *dir, *subdir; -+#else - DIR *dir; -+#endif - struct dirent *dirEntry; - char *ptr; -+#ifdef __NetBSD__ -+ char buffer[256], subdirName[256]; -+#else - char buffer[256]; -+#endif - - // cout << klocale->translate("Reading Dir: ") << dirName << endl; - -@@ -287,6 +304,39 @@ - if ( dirEntry->d_name[0] == '.' ) - continue; - -+#ifdef __NetBSD__ -+ if ( !strcmp( dirEntry->d_name, MACHINE_ARCH ) ) -+ { -+ sprintf( subdirName, "%s/%s", dirName, MACHINE_ARCH ); -+ subdir = opendir(subdirName); -+ if ( subdir ) -+ { -+ while ( (dirEntry = readdir(subdir)) ) -+ { -+ if ( dirEntry->d_name[0] == '.' ) -+ continue; -+ -+ strcpy( buffer, dirEntry->d_name ); -+ -+ ptr = strrchr( buffer, '.' ); -+ if ( !strcmp(ptr, ".gz") || !strcmp(ptr, ".Z") || -+ !strcmp(ptr,".bz2") ) // skip compress extn -+ { -+ *ptr = '\0'; -+ ptr = strrchr( buffer, '.' ); -+ } -+ if (ptr) -+ { -+ *ptr = '\0'; -+ AddPage( buffer ); -+ } -+ } -+ closedir(subdir); -+ } -+ continue; -+ } -+#endif /* __NetBSD__ */ -+ - strcpy( buffer, dirEntry->d_name ); - - ptr = strrchr( buffer, '.' ); -@@ -475,8 +525,12 @@ - sprintf(errFile, "%s/khelpXXXXXX", _PATH_TMP); // temp file - mktemp(errFile); - -+#ifdef RMAN -+ sprintf(rmanCmd, "%s -f HTML", RMAN); -+#else - sprintf(rmanCmd, "%s/rman -f HTML", - (const char *)KApplication::kde_bindir()); -+#endif - - // create the system cmd to read the man page - if ( (ptr = strchr(tmpName, '(')) ) diff --git a/x11/kdebase/patches/patch-bd b/x11/kdebase/patches/patch-bd deleted file mode 100644 index 80c4a470f82..00000000000 --- a/x11/kdebase/patches/patch-bd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2001/09/10 08:28:28 skrll Exp $ - ---- kscreensaver/space.cpp.orig Sat Aug 7 02:09:28 1999 -+++ kscreensaver/space.cpp -@@ -64,7 +64,6 @@ - #include <space.h> - #include <math.h> - #include <X11/Intrinsic.h> --#include <GL/xmesa.h> - #include <GL/gl.h> - #include <GL/glx.h> - diff --git a/x11/kdebase/patches/patch-be b/x11/kdebase/patches/patch-be deleted file mode 100644 index 7b5869f6ab4..00000000000 --- a/x11/kdebase/patches/patch-be +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-be,v 1.1 2001/09/10 08:28:28 skrll Exp $ - ---- kscreensaver/morph3d.cpp.orig Sun Mar 21 00:17:33 1999 -+++ kscreensaver/morph3d.cpp -@@ -52,7 +52,6 @@ - - #include <math.h> - #include <X11/Intrinsic.h> --#include <GL/xmesa.h> - #include <GL/gl.h> - #include <GL/glx.h> - diff --git a/x11/kdebase/patches/patch-bf b/x11/kdebase/patches/patch-bf deleted file mode 100644 index 6294dbb4af2..00000000000 --- a/x11/kdebase/patches/patch-bf +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2001/09/10 08:28:28 skrll Exp $ - ---- kscreensaver/pipes.cpp.orig Sun Mar 21 00:17:35 1999 -+++ kscreensaver/pipes.cpp -@@ -128,7 +128,6 @@ - - #ifdef HAVE_GL - --#include <GL/xmesa.h> - #include <GL/gl.h> - #include <GL/glx.h> - |