* Strongly buildinkify.

* Manage all of the icon directories for all of the KDE2 packages in the
  PLIST.
* Workaround a NetBSD/alpha egcs optimization bug.
* Allow artsdsp pre-loadable module to be built.
* Fix pkg/14430 by Mark Davies <mark@mcs.vuw.ac.nz> where mounting devices
  from KDE2 when /sbin isn't in your path doesn't work because mount/umount
  can't be found.  We append /sbin:/usr/sbin to the path before calling
  mount/umount.
* Properly recognize that NetBSD's OSS implementation doesn't include the
  Linux MIDI interface.
* Fix and sort PLIST.

4 files changed, 154 insertions, 15 deletions

diff --git a/x11/kdelibs2/patches/patch-af b/x11/kdelibs2/patches/patch-af
index 260d903484c..22d2def2b61 100644
--- a/x11/kdelibs2/patches/patch-af
+++ b/x11/kdelibs2/patches/patch-af
@@ -1,20 +1,8 @@
-$NetBSD: patch-af,v 1.2 2001/10/15 22:46:22 skrll Exp $
+$NetBSD: patch-af,v 1.3 2001/11/13 21:09:07 jlam Exp $
 
---- configure.orig	Wed Sep 12 06:10:21 2001
+--- configure.orig	Wed Sep 12 01:10:21 2001
 +++ configure
-@@ -6211,9 +6211,10 @@
-   x_libraries="/usr/lib";  else
-   x_libraries=$kde_x_libraries
-   X_LDFLAGS="-L$x_libraries"
-+  X_WLRFLAGS="-Wl,-R$x_libraries"
- fi
- all_includes="$X_INCLUDES"
--all_libraries="$X_LDFLAGS"
-+all_libraries="$X_LDFLAGS $X_WLRFLAGS"
- 
- 
- 
-@@ -6889,7 +6890,7 @@
+@@ -6889,7 +6889,7 @@
  ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
diff --git a/x11/kdelibs2/patches/patch-bp b/x11/kdelibs2/patches/patch-bp
new file mode 100644
index 00000000000..cd205a7407f
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bp
@@ -0,0 +1,68 @@
+$NetBSD: patch-bp,v 1.1 2001/11/13 21:09:07 jlam Exp $
+
+--- arts/artsc/artsdsp.c.orig	Sun Jul 29 00:54:48 2001
++++ arts/artsc/artsdsp.c
+@@ -127,6 +127,9 @@
+ 
+ static void artsdsp_doinit()
+ {
++#if defined(__NetBSD__)
++	void *handle;
++#endif
+ 	const char *env;
+ 	artsdsp_init = 1;
+ 
+@@ -139,6 +142,18 @@
+ 	mmapemu = env && !strcmp(env,"1");
+ 
+ 	/* resolve original symbols */
++#if defined(__NetBSD__)
++	handle = dlopen(NULL, DL_LAZY);
++	orig_open = (orig_open_ptr)dlsym(handle,"open");
++	orig_close = (orig_close_ptr)dlsym(handle,"close");
++	orig_write = (orig_write_ptr)dlsym(handle,"write");
++	orig_ioctl = (orig_ioctl_ptr)dlsym(handle,"_oss_ioctl");
++	orig_mmap = (orig_mmap_ptr)dlsym(handle,"mmap");
++	orig_munmap = (orig_munmap_ptr)dlsym(handle,"munmap");
++	orig_fopen = (orig_fopen_ptr)dlsym(handle,"fopen");
++	orig_access = (orig_access_ptr)dlsym(handle,"access");
++	(void) dlclose(handle);
++#else
+ 	orig_open = (orig_open_ptr)dlsym(RTLD_NEXT,"open");
+ 	orig_close = (orig_close_ptr)dlsym(RTLD_NEXT,"close");
+ 	orig_write = (orig_write_ptr)dlsym(RTLD_NEXT,"write");
+@@ -147,6 +162,7 @@
+ 	orig_munmap = (orig_munmap_ptr)dlsym(RTLD_NEXT,"munmap");
+ 	orig_fopen = (orig_fopen_ptr)dlsym(RTLD_NEXT,"fopen");
+ 	orig_access = (orig_access_ptr)dlsym(RTLD_NEXT,"access");
++#endif
+ }
+ 
+ static void artsdspdebug(const char *fmt,...)
+@@ -230,13 +246,18 @@
+   return sndfd;
+ }
+ 
++#if defined(__NetBSD__)
++int _oss_ioctl (int fd, unsigned long request, void *argp)
++#else
+ int ioctl (int fd, ioctl_request_t request, ...)
++#endif
+ {
+   static int channels;
+   static int bits;
+   static int speed;
+   int space, size, latency, odelay;
+ 
++#if !defined(__NetBSD__)
+   /*
+    * FreeBSD needs ioctl with varargs. However I have no idea how to "forward"
+    * the variable args ioctl to the orig_ioctl routine. So I expect the ioctl
+@@ -248,6 +269,7 @@
+   va_start(args,request);
+   argp = va_arg(args, void *);
+   va_end(args);
++#endif
+ 
+   CHECK_INIT();
+ 
diff --git a/x11/kdelibs2/patches/patch-bq b/x11/kdelibs2/patches/patch-bq
new file mode 100644
index 00000000000..5fb2e1de65c
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bq
@@ -0,0 +1,65 @@
+$NetBSD: patch-bq,v 1.1 2001/11/13 21:09:07 jlam Exp $
+
+--- kio/file/file.cc.orig	Tue Sep  4 19:08:16 2001
++++ kio/file/file.cc
+@@ -42,6 +42,8 @@
+ #ifdef HAVE_VOLMGT
+ #include <volmgt.h>
+ #include <sys/mnttab.h>
++#else
++#include <kstddirs.h>
+ #endif
+ 
+ #include <kio/ioslave_defaults.h>
+@@ -1071,24 +1073,31 @@
+     QCString point = QFile::encodeName( shellQuote(_point) );
+     QCString fstype = _fstype;
+     QCString readonly = _ro ? "-r" : "";
++    QString path = getenv("PATH");
++    path.append(":/usr/sbin:/sbin");
++    QString mountProg = KGlobal::dirs()->findExe("mount", path);
++
++    if (mountProg.isEmpty()) {
++        mountProg = "mount";
++    }
+ 
+     // Two steps, in case mount doesn't like it when we pass all options
+     for ( int step = 0 ; step <= 1 ; step++ )
+     {
+         // Mount using device only if no fstype nor mountpoint (KDE-1.x like)
+         if ( !_dev.isEmpty() && _point.isEmpty() && fstype.isEmpty() )
+-            buffer.sprintf( "mount %s 2>%s", dev.data(), tmp );
++            buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), dev.data(), tmp );
+         else
+           // Mount using the mountpoint, if no fstype nor device (impossible in first step)
+           if ( !_point.isEmpty() && _dev.isEmpty() && fstype.isEmpty() )
+-            buffer.sprintf( "mount %s 2>%s", point.data(), tmp );
++            buffer.sprintf( "%s %s 2>%s", mountProg.latin1(), point.data(), tmp );
+           else
+             // mount giving device + mountpoint but no fstype
+             if ( !_point.isEmpty() && !_dev.isEmpty() && fstype.isEmpty() )
+-              buffer.sprintf( "mount %s %s %s 2>%s", readonly.data(), dev.data(), point.data(), tmp );
++              buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp );
+             else
+               // mount giving device + mountpoint + fstype
+-              buffer.sprintf( "mount %s -t %s %s %s 2>%s", readonly.data(),
++              buffer.sprintf( "%s %s -t %s %s %s 2>%s", mountProg.latin1(), readonly.data(),
+                               fstype.data(), dev.data(), point.data(), tmp );
+ 
+         kdDebug(7101) << buffer << endl;
+@@ -1232,7 +1241,14 @@
+ 		return;
+ 	}
+ #else
+-    buffer.sprintf( "umount %s 2>%s", QFile::encodeName(_point).data(), tmp );
++    QString path = getenv("PATH");
++    path.append(":/usr/sbin:/sbin");
++    QString umountProg = KGlobal::dirs()->findExe("umount", path);
++
++    if (umountProg.isEmpty()) {
++        umountProg = "umount";
++    }
++    buffer.sprintf( "%s %s 2>%s", umountProg.latin1(), QFile::encodeName(_point).data(), tmp );
+     system( buffer.ascii() );
+ #endif /* HAVE_VOLMGT */
+ 
diff --git a/x11/kdelibs2/patches/patch-br b/x11/kdelibs2/patches/patch-br
new file mode 100644
index 00000000000..795c0757f45
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-br
@@ -0,0 +1,18 @@
+$NetBSD: patch-br,v 1.1 2001/11/13 21:09:07 jlam Exp $
+
+--- libkmid/sndcard.h.orig	Sat Jun 24 09:35:18 2000
++++ libkmid/sndcard.h
+@@ -31,9 +31,12 @@
+  
+ #ifdef HAVE_SYS_SOUNDCARD_H
+  #include <sys/soundcard.h>
+- #define HAVE_OSS_SUPPORT
+ #elif defined(HAVE_MACHINE_SOUNDCARD_H)
+  #include <machine/soundcard.h>
++#endif
++
++/* Check for OSS MIDI API */
++#if defined(SNDCTL_SEQ_NRSYNTHS) && defined(CTL_MAIN_VOLUME)
+  #define HAVE_OSS_SUPPORT
+ #else
+  #undef HAVE_OSS_SUPPORT