Pullup ticket 58 to the pkgsrc-2004Q2 branch, requested by Martti Kuparinen.

Further xfce4 pullups to version 4.0.6 - bug fixes.

	Module Name:    pkgsrc
	Committed By:   martti
	Date:           Wed Jul  7 11:26:05 UTC 2004

	Modified Files:
		pkgsrc/sysutils/xfce4-diskperf-plugin: Makefile buildlink3.mk
		distinfo

	Log Message:
	Updated xfce4-diskperf-plugin to 1.4.1

	* Bug fixes

and

	Module Name:    pkgsrc
	Committed By:   martti
	Date:           Tue Jul 13 09:20:35 UTC 2004

	Update of /cvsroot/pkgsrc/net/xfce4-wavelan-plugin
	In directory ivanova.netbsd.org:/tmp/cvs-serv11778

	Log Message:
	WLAN plugin for XFce4.

10 files changed, 55 insertions, 10 deletions

diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index b0e727eb3f3..d349df41e5e 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.23 2004/07/14 12:39:00 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.24 2004/07/14 12:49:18 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -42,3 +42,5 @@ Pullup ticket 56, requested by Martti Kuparinen [agc 2004-07-14]
 	Update xfce4 to 4.0.6 - bugfix release
 Pullup ticket 57, requested by Grant Beattie [agc 2004-07-14]
 	apache2 security and bug fix
+Pullup ticket 58, requested by Martti Kuparinen [agc 2004-07-14]
+	Further updates to bring xfce4 to 4.0.6 - bugfix release
diff --git a/net/Makefile b/net/Makefile
index 57a466942da..1c7df83f2f4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.475 2004/06/05 19:04:42 nathanw Exp $
+# $NetBSD: Makefile,v 1.475.2.1 2004/07/14 12:49:18 agc Exp $
 #
 
 COMMENT=	Networking tools
@@ -374,6 +374,7 @@ SUBDIR+=	wmpload
 SUBDIR+=	wol
 SUBDIR+=	wu-ftpd
 SUBDIR+=	x2vnc
+SUBDIR+=	xfce4-wavelan-plugin
 SUBDIR+=	xipdump
 SUBDIR+=	xmftp
 SUBDIR+=	xnap
diff --git a/net/xfce4-wavelan-plugin/DESCR b/net/xfce4-wavelan-plugin/DESCR
new file mode 100644
index 00000000000..969c949a290
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/DESCR
@@ -0,0 +1 @@
+WLAN plugin for XFce4.
diff --git a/net/xfce4-wavelan-plugin/Makefile b/net/xfce4-wavelan-plugin/Makefile
new file mode 100644
index 00000000000..362183d2d8f
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1.1.1.2.2 2004/07/14 12:49:18 agc Exp $
+
+.include "../../meta-pkgs/xfce4/Makefile.common"
+
+XFCE4_VERSION=	0.3.2
+
+DISTNAME=	xfce4-wavelan-plugin-${XFCE4_VERSION}
+CATEGORIES=	sysutils
+MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+COMMENT=	XFce4 WLAN plugin
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/xfce4-wavelan-plugin/PLIST b/net/xfce4-wavelan-plugin/PLIST
new file mode 100644
index 00000000000..989dec07460
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1.2.2 2004/07/14 12:49:18 agc Exp $
+lib/xfce4/panel-plugins/libwavelan.a
+lib/xfce4/panel-plugins/libwavelan.la
+lib/xfce4/panel-plugins/libwavelan.so
diff --git a/net/xfce4-wavelan-plugin/buildlink3.mk b/net/xfce4-wavelan-plugin/buildlink3.mk
new file mode 100644
index 00000000000..17bcc0dbff5
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1.2.2 2004/07/14 12:49:18 agc Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:=	${XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	xfce4-wavelan-plugin
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-wavelan-plugin}
+BUILDLINK_PACKAGES+=	xfce4-wavelan-plugin
+
+.if !empty(XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xfce4-wavelan-plugin+=	xfce4-wavelan-plugin>=0.3.2
+BUILDLINK_PKGSRCDIR.xfce4-wavelan-plugin?=	../../net/xfce4-wavelan-plugin
+.endif	# XFCE4_WAVELAN_PLUGIN_BUILDLINK3_MK
+
+.include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/xfce4-wavelan-plugin/distinfo b/net/xfce4-wavelan-plugin/distinfo
new file mode 100644
index 00000000000..964b6137c6b
--- /dev/null
+++ b/net/xfce4-wavelan-plugin/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1.1.1.2.2 2004/07/14 12:49:18 agc Exp $
+
+SHA1 (xfce4-wavelan-plugin-0.3.2.tar.gz) = 33c82e47e6f3d93e2ee0ad44fee0715be0c7dac0
+Size (xfce4-wavelan-plugin-0.3.2.tar.gz) = 523917 bytes
diff --git a/sysutils/xfce4-diskperf-plugin/Makefile b/sysutils/xfce4-diskperf-plugin/Makefile
index c6419035004..76617bbab58 100644
--- a/sysutils/xfce4-diskperf-plugin/Makefile
+++ b/sysutils/xfce4-diskperf-plugin/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2004/07/14 12:49:18 agc Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	1.4
+XFCE4_VERSION=	1.4.1
 
 DISTNAME=	xfce4-diskperf-plugin-${XFCE4_VERSION}
-PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	XFce4 disk performance plugin
diff --git a/sysutils/xfce4-diskperf-plugin/buildlink3.mk b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
index ffb761343c6..379cf31e804 100644
--- a/sysutils/xfce4-diskperf-plugin/buildlink3.mk
+++ b/sysutils/xfce4-diskperf-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2.4.1 2004/07/14 12:49:18 agc Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:=	${XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-diskperf-plugin}
 BUILDLINK_PACKAGES+=	xfce4-diskperf-plugin
 
 .if !empty(XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.4nb4
+BUILDLINK_DEPENDS.xfce4-diskperf-plugin+=	xfce4-diskperf-plugin>=1.4.1
 BUILDLINK_PKGSRCDIR.xfce4-diskperf-plugin?=	../../sysutils/xfce4-diskperf-plugin
 .endif	# XFCE4_DISKPERF_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-diskperf-plugin/distinfo b/sysutils/xfce4-diskperf-plugin/distinfo
index 5873f50e656..d0a920576a8 100644
--- a/sysutils/xfce4-diskperf-plugin/distinfo
+++ b/sysutils/xfce4-diskperf-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/03 05:07:32 martti Exp $
+$NetBSD: distinfo,v 1.1.1.1.4.1 2004/07/14 12:49:18 agc Exp $
 
-SHA1 (xfce4-diskperf-plugin-1.4.tar.gz) = 1f61d46fbb7a7b202e964380f3164535a8351a00
-Size (xfce4-diskperf-plugin-1.4.tar.gz) = 314724 bytes
+SHA1 (xfce4-diskperf-plugin-1.4.1.tar.gz) = 51e2653eda48895b9f6521b7850071f4a03fab87
+Size (xfce4-diskperf-plugin-1.4.1.tar.gz) = 314273 bytes
 SHA1 (patch-aa) = 3b244cfbcd7098bdcbd8b44ef9adc0d1aa38e732