Updated to Xfce 4.4.1

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

5 files changed, 30 insertions, 36 deletions

diff --git a/sysutils/xfce4-xkb-plugin/Makefile b/sysutils/xfce4-xkb-plugin/Makefile
index 5b12b61c9fb..661e03dd95c 100644
--- a/sysutils/xfce4-xkb-plugin/Makefile
+++ b/sysutils/xfce4-xkb-plugin/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2007/01/19 14:58:17 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/04/12 09:55:19 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.3.3
+XFCE4_VERSION=	0.4.3
 
 DISTNAME=	xfce4-xkb-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-xkb-plugin/
 COMMENT=	Xfce Keyboard plugin
 
-.include "../../x11/libXpm/buildlink3.mk"
+USE_TOOLS+=	intltool
+
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfce4-xkb-plugin/PLIST b/sysutils/xfce4-xkb-plugin/PLIST
index a4da7907735..73cfb2735b9 100644
--- a/sysutils/xfce4-xkb-plugin/PLIST
+++ b/sysutils/xfce4-xkb-plugin/PLIST
@@ -1,5 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/10 08:25:05 martti Exp $
-lib/xfce4/panel-plugins/libxkb.la
+@comment $NetBSD: PLIST,v 1.4 2007/04/12 09:55:19 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-xkb-plugin
+share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/xfce4/panel-plugins/xkb-plugin.desktop
 share/xfce4/xkb/flags/ae.png
 share/xfce4/xkb/flags/am.png
 share/xfce4/xkb/flags/ar.png
@@ -20,12 +34,12 @@ share/xfce4/xkb/flags/dk.png
 share/xfce4/xkb/flags/dz.png
 share/xfce4/xkb/flags/ee.png
 share/xfce4/xkb/flags/eg.png
-share/xfce4/xkb/flags/el.png
 share/xfce4/xkb/flags/es.png
 share/xfce4/xkb/flags/eu.png
 share/xfce4/xkb/flags/fi.png
 share/xfce4/xkb/flags/fr.png
 share/xfce4/xkb/flags/ge.png
+share/xfce4/xkb/flags/gr.png
 share/xfce4/xkb/flags/hr.png
 share/xfce4/xkb/flags/hu.png
 share/xfce4/xkb/flags/il.png
diff --git a/sysutils/xfce4-xkb-plugin/buildlink3.mk b/sysutils/xfce4-xkb-plugin/buildlink3.mk
index ca1dbe2bae5..ff8de8d535e 100644
--- a/sysutils/xfce4-xkb-plugin/buildlink3.mk
+++ b/sysutils/xfce4-xkb-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/04/12 09:55:19 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XKB_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XKB_PLUGIN_BUILDLINK3_MK}+
@@ -12,11 +12,12 @@ BUILDLINK_PACKAGES+=	xfce4-xkb-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xkb-plugin
 
 .if ${XFCE4_XKB_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.3.3nb1
+BUILDLINK_API_DEPENDS.xfce4-xkb-plugin+=	xfce4-xkb-plugin>=0.4.3
 BUILDLINK_PKGSRCDIR.xfce4-xkb-plugin?=	../../sysutils/xfce4-xkb-plugin
 .endif	# XFCE4_XKB_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-xkb-plugin/distinfo b/sysutils/xfce4-xkb-plugin/distinfo
index 8a2027c2872..9df43eed585 100644
--- a/sysutils/xfce4-xkb-plugin/distinfo
+++ b/sysutils/xfce4-xkb-plugin/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/05/04 06:14:51 martti Exp $
+$NetBSD: distinfo,v 1.7 2007/04/12 09:55:19 martti Exp $
 
-SHA1 (xfce4-xkb-plugin-0.3.3.tar.gz) = d326bad6ef61a7519f3b72e585f2b58a97d5bb62
-RMD160 (xfce4-xkb-plugin-0.3.3.tar.gz) = b14dcf6d8b8b30d5dd72c6b7cc41be7beae1659c
-Size (xfce4-xkb-plugin-0.3.3.tar.gz) = 338116 bytes
-SHA1 (patch-aa) = dce92aee6d21db1d4c609a3d67e7b1b17aacbcc8
+SHA1 (xfce4-xkb-plugin-0.4.3.tar.bz2) = 962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234
+RMD160 (xfce4-xkb-plugin-0.4.3.tar.bz2) = b2f80e3a44123b82792a3fa981f40799cb29477f
+Size (xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843 bytes
diff --git a/sysutils/xfce4-xkb-plugin/patches/patch-aa b/sysutils/xfce4-xkb-plugin/patches/patch-aa
deleted file mode 100644
index 06c80173c4f..00000000000
--- a/sysutils/xfce4-xkb-plugin/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/05/04 06:14:51 martti Exp $
-
---- panel-plugin/xfce4-xkb-plugin.c.orig	2006-05-04 06:04:50.000000000 +0300
-+++ panel-plugin/xfce4-xkb-plugin.c	2006-05-04 06:06:13.000000000 +0300
-@@ -77,6 +77,7 @@
- static t_xkb * xkb_new(void) {
-   t_xkb *xkb;
-   char *initial_group;
-+  NetkScreen* netk_screen;
-   
-   xkb = g_new(t_xkb, 1);
- 
-@@ -122,7 +123,7 @@
-   plugin = xkb;
- 
-   // track signals about window change
--	NetkScreen* netk_screen = netk_screen_get_default ();
-+	netk_screen = netk_screen_get_default ();
- 	win_change_hanler = g_signal_connect( G_OBJECT (netk_screen), "active_window_changed", 
- 		G_CALLBACK(active_window_changed), NULL);
-