Add kcm_usb support for NetBSD and add appropriate PLIST entries on

platforms that now support it (NetBSD, FreeBSD and Linux).
Bump PKGREVISION.

6 files changed, 105 insertions, 10 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index b0f1a9466be..a41a421a0f5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2005/04/14 20:53:30 markd Exp $
+# $NetBSD: Makefile,v 1.77 2005/04/14 21:01:48 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 3 integrated X11 desktop
 
@@ -89,6 +89,12 @@ PLIST_SUBST+=		HAVE_SMB=""
 PLIST_SUBST+=		HAVE_SMB="@comment "
 .endif
 
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
+PLIST_SUBST+=		HAVE_USBVIEW=""
+.else
+PLIST_SUBST+=		HAVE_USBVIEW="@comment "
+.endif
+
 ICONDIR=		share/kde/icons
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 04b0a893f12..56fc9939504 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2005/03/27 21:54:52 markd Exp $
+@comment $NetBSD: PLIST,v 1.33 2005/04/14 21:01:48 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -211,6 +211,7 @@ lib/kde3/kcm_smserver.la
 lib/kde3/kcm_spellchecking.la
 lib/kde3/kcm_style.la
 lib/kde3/kcm_taskbar.la
+${HAVE_USBVIEW}lib/kde3/kcm_usb.la
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcminit.la
@@ -418,6 +419,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+${HAVE_USBVIEW}share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -1388,6 +1390,7 @@ share/kde/apps/kcmkeys/win3.kksrc
 share/kde/apps/kcmkeys/win4.kksrc
 share/kde/apps/kcmkeys/wm3.kksrc
 share/kde/apps/kcmlocale/pics/background.png
+${HAVE_USBVIEW}share/kde/apps/kcmusb/usb.ids
 share/kde/apps/kconf_update/convertShortcuts.pl
 share/kde/apps/kconf_update/favicons.upd
 share/kde/apps/kconf_update/kaccel.upd
@@ -4286,6 +4289,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/kcontrol/about
 @comment in kde: @dirrm share/kde/apps/kcontrol
 @comment in kde: @dirrm share/kde/apps/kconf_update
+${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kcmlocale/pics
 @dirrm share/kde/apps/kcmlocale
 @dirrm share/kde/apps/kcmkeys
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 9b0d3b95106..3cbb611efd6 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2005/03/30 13:38:17 markd Exp $
+$NetBSD: distinfo,v 1.66 2005/04/14 21:01:48 markd Exp $
 
 SHA1 (kdebase-3.4.0.tar.bz2) = ca61fe258c46b20f5f2397fb71b784786a9510b6
 RMD160 (kdebase-3.4.0.tar.bz2) = 49b70391564ef757dc5195314e6ebeba656f18bc
@@ -12,7 +12,7 @@ Size (Daemon.README) = 2191 bytes
 SHA1 (NetBSD-flag.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag.png) = 4532 bytes
-SHA1 (patch-aa) = fcb678ef0112e2d39f2d7ced126c88f2862b3351
+SHA1 (patch-aa) = 5386271402506fe3024f0b152ef8cbee94315636
 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
 SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
 SHA1 (patch-ae) = 5e3e097598874a87719074370eb11851e1ce5f36
@@ -48,3 +48,5 @@ SHA1 (patch-fv) = 8ec683f004e0e432b3820cbe8660f1d547d71fb6
 SHA1 (patch-fz) = 49dcc3508edf4deccadce5ff788b424bb0fc6d78
 SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e
+SHA1 (patch-gc) = f3d732fc8d7754b86a0fd9a160857f08ce7a5254
+SHA1 (patch-gd) = f169e7b5e2cd6ef36691abd7c8b669a633ba5af7
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa
index 589564ae483..dd7ffc623ba 100644
--- a/x11/kdebase3/patches/patch-aa
+++ b/x11/kdebase3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2004/02/04 14:25:58 markd Exp $
+$NetBSD: patch-aa,v 1.13 2005/04/14 21:01:48 markd Exp $
 
---- configure.orig	2004-01-26 08:22:39.000000000 +1300
+--- configure.orig	2005-03-05 02:15:11.000000000 +1300
 +++ configure
-@@ -27907,7 +27907,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
+@@ -30682,7 +30682,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
  	# if you're trying to debug this check and think it's incorrect,
  	# better check your installation. The check _is_ correct - your
  	# installation is not.
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 2004/02/04 14:25:58 markd Exp $
  		kde_cv_uic_plugins=yes
  	fi
  fi
-@@ -38076,6 +38076,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -42279,6 +42279,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  
                    ac_cv_have_dpms="-lXdpms"
  
@@ -35,7 +35,17 @@ $NetBSD: patch-aa,v 1.12 2004/02/04 14:25:58 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -45372,6 +45389,7 @@ fi
+@@ -44908,6 +44925,9 @@ case "$host" in
+   *-*-freebsd*)
+ 	FOUND_USBVIEW=yes
+ 	;;
++  *-*-netbsd*)
++	FOUND_USBVIEW=yes
++	;;
+ esac
+ 
+ 
+@@ -52928,6 +52948,7 @@ fi
  case "$UNAME" in
  	Linux) LIBHOSTS="$LIBSENSORS" ;;
  	FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
diff --git a/x11/kdebase3/patches/patch-gc b/x11/kdebase3/patches/patch-gc
new file mode 100644
index 00000000000..39b4d6d4ca7
--- /dev/null
+++ b/x11/kdebase3/patches/patch-gc
@@ -0,0 +1,22 @@
+$NetBSD: patch-gc,v 1.1 2005/04/14 21:01:48 markd Exp $
+
+--- kcontrol/usbview/usbdevices.h.orig	2005-01-04 03:50:45.000000000 +1300
++++ kcontrol/usbview/usbdevices.h
+@@ -16,7 +16,7 @@
+ #include <qstring.h>
+ #include <qptrlist.h>
+ 
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ #include <dev/usb/usb.h>
+ #endif
+ 
+@@ -63,7 +63,7 @@ private:
+ 
+   unsigned int _vendorID, _prodID, _revMajor, _revMinor;
+ 
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+   void collectData( int fd, int level, usb_device_info &di, int parent );
+   QStringList _devnodes;
+ #endif
diff --git a/x11/kdebase3/patches/patch-gd b/x11/kdebase3/patches/patch-gd
new file mode 100644
index 00000000000..7f7970238c4
--- /dev/null
+++ b/x11/kdebase3/patches/patch-gd
@@ -0,0 +1,51 @@
+$NetBSD: patch-gd,v 1.1 2005/04/14 21:01:48 markd Exp $
+
+--- kcontrol/usbview/usbdevices.cpp.orig	2005-01-04 03:50:45.000000000 +1300
++++ kcontrol/usbview/usbdevices.cpp
+@@ -24,7 +24,7 @@
+ #include "usbdb.h"
+ #include "usbdevices.h"
+ 
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ #include <sys/ioctl.h>
+ #endif
+ 
+@@ -133,7 +133,7 @@ QString USBDevice::dump()
+   if (!prname.isEmpty())
+     pr += "<td>(" + prname +")</td>";
+   r += i18n("<tr><td><i>Protocol</i></td>%1</tr>").arg(pr);
+-#ifndef Q_OS_FREEBSD
++#if !(defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD))
+   r += i18n("<tr><td><i>USB Version</i></td><td>%1.%2</td></tr>")
+     .arg(_verMajor,0,16)
+     .arg(QString::number(_verMinor,16).prepend('0').right(2));
+@@ -157,7 +157,7 @@ QString USBDevice::dump()
+ 
+   r += i18n("<tr><td><i>Speed</i></td><td>%1 Mbit/s</td></tr>").arg(_speed);
+   r += i18n("<tr><td><i>Channels</i></td><td>%1</td></tr>").arg(_channels);
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ 	if ( _power )
+ 		r += i18n("<tr><td><i>Power Consumption</i></td><td>%1 mA</td></tr>").arg(_power);
+ 	else
+@@ -185,7 +185,7 @@ QString USBDevice::dump()
+ }
+ 
+ 
+-#ifndef Q_OS_FREEBSD
++#if !(defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD))
+ bool USBDevice::parse(QString fname)
+ {
+   _devices.clear();
+@@ -325,8 +325,10 @@ bool USBDevice::parse(QString fname)
+ 				}
+ 			}
+ 			controller.close();
++#ifndef Q_OS_NETBSD
+ 		} else {
+ 			error = true;
++#endif
+ 		}
+ 		controller.setName( QString::fromLocal8Bit("/dev/usb%1").arg(i++) );
+ 	}