Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.

6 files changed, 21 insertions, 46 deletions

diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index ba196c52b69..eb9e9a86abc 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/04/12 09:55:16 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.3.3
+XFCE4_VERSION=	0.4.0
 
 DISTNAME=	xfce4-netload-plugin-${XFCE4_VERSION}
-PKGREVISION=	4
+#PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-netload-plugin/
 COMMENT=	Xfce network load plugin
 
-EXTRACT_SUFX=	.tar.bz2
-
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-netload-plugin/PLIST b/sysutils/xfce4-netload-plugin/PLIST
index c43ada7b60a..165707d67fe 100644
--- a/sysutils/xfce4-netload-plugin/PLIST
+++ b/sysutils/xfce4-netload-plugin/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:35 jlam Exp $
-lib/xfce4/panel-plugins/libnetload.la
-share/locale/ca/LC_MESSAGES/xfce4-netload.mo
-share/locale/de/LC_MESSAGES/xfce4-netload.mo
-share/locale/fr/LC_MESSAGES/xfce4-netload.mo
-share/locale/ko/LC_MESSAGES/xfce4-netload.mo
-share/locale/lt/LC_MESSAGES/xfce4-netload.mo
-share/locale/pl/LC_MESSAGES/xfce4-netload.mo
-share/locale/uk/LC_MESSAGES/xfce4-netload.mo
+@comment $NetBSD: PLIST,v 1.7 2007/04/12 09:55:16 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-netload-plugin
+share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo
+share/xfce4/panel-plugins/netload.desktop
diff --git a/sysutils/xfce4-netload-plugin/buildlink3.mk b/sysutils/xfce4-netload-plugin/buildlink3.mk
index 721c3991876..29f396d9a46 100644
--- a/sysutils/xfce4-netload-plugin/buildlink3.mk
+++ b/sysutils/xfce4-netload-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/04/12 09:55:16 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK:=	${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+=	xfce4-netload-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-netload-plugin
 
 .if ${XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.3.3nb4
+BUILDLINK_API_DEPENDS.xfce4-netload-plugin+=	xfce4-netload-plugin>=0.4.0
 BUILDLINK_PKGSRCDIR.xfce4-netload-plugin?=	../../sysutils/xfce4-netload-plugin
 .endif	# XFCE4_NETLOAD_PLUGIN_BUILDLINK3_MK
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index 51265114353..358b936b6c1 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.8 2006/02/05 13:15:37 martti Exp $
+$NetBSD: distinfo,v 1.9 2007/04/12 09:55:16 martti Exp $
 
-SHA1 (xfce4-netload-plugin-0.3.3.tar.bz2) = 7f43826f7a5cc2256ac27657aa45fede2f2d764f
-RMD160 (xfce4-netload-plugin-0.3.3.tar.bz2) = db0ca8fc0cc8cb5856fdd3a4a9b5e5d52a354925
-Size (xfce4-netload-plugin-0.3.3.tar.bz2) = 247015 bytes
-SHA1 (patch-aa) = 0a5771eab05ab1acb20f8cc8b7775212d00d234a
-SHA1 (patch-ab) = 76217b49da5d6e4d4600d726842e1eb4047c318c
+SHA1 (xfce4-netload-plugin-0.4.0.tar.bz2) = 197231f99773f4e299c64125dd0d1a25bfb533bb
+RMD160 (xfce4-netload-plugin-0.4.0.tar.bz2) = 47d8183da3885b6a476504fd8d5762be7d4fffac
+Size (xfce4-netload-plugin-0.4.0.tar.bz2) = 125046 bytes
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-aa b/sysutils/xfce4-netload-plugin/patches/patch-aa
deleted file mode 100644
index e8772549bcd..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/05 13:15:38 martti Exp $
-
---- panel-plugin/Makefile.am.orig	2006-02-05 13:08:23.000000000 +0200
-+++ panel-plugin/Makefile.am	2006-02-05 13:08:42.000000000 +0200
-@@ -28,6 +28,5 @@
- 	@XFCE4_PANEL_CFLAGS@
- 
- libnetload_la_LIBADD = 							\
--	@LIBGTOP_LIBS@							    \
-     @SOLLIBS@                                   \
- 	@XFCE4_PANEL_LIBS@
diff --git a/sysutils/xfce4-netload-plugin/patches/patch-ab b/sysutils/xfce4-netload-plugin/patches/patch-ab
deleted file mode 100644
index bd1ac8020f3..00000000000
--- a/sysutils/xfce4-netload-plugin/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/02/05 13:15:38 martti Exp $
-
---- panel-plugin/Makefile.in.orig	2006-02-05 13:08:55.000000000 +0200
-+++ panel-plugin/Makefile.in	2006-02-05 13:09:01.000000000 +0200
-@@ -228,7 +228,6 @@
- 	@XFCE4_PANEL_CFLAGS@
- 
- libnetload_la_LIBADD = \
--	@LIBGTOP_LIBS@							    \
-     @SOLLIBS@                                   \
- 	@XFCE4_PANEL_LIBS@
-