Updated to Xfce 4.4.1

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

13 files changed, 69 insertions, 130 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 44fa5cc9118..c42196f0111 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:08 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
-#PKGREVISION=	1
 CATEGORIES=	audio
 COMMENT=	Xfce mixer plugin
 
+USE_TOOLS+=	intltool
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/audio/xfce4-mixer/PLIST b/audio/xfce4-mixer/PLIST
index a5da2074e79..168a5ee57ff 100644
--- a/audio/xfce4-mixer/PLIST
+++ b/audio/xfce4-mixer/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/04/12 09:55:08 martti Exp $
 bin/xfce4-mixer
 lib/xfce4/mcs-plugins/sound_settings.la
 lib/xfce4/modules/libxfce4mixer.la
-lib/xfce4/panel-plugins/libmixer.la
+libexec/xfce4/panel-plugins/xfce4-mixer-plugin
 share/applications/xfce-mixer-settings.desktop
 share/icons/hicolor/48x48/apps/xfce4-mixer.png
-share/locale/af/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
 share/locale/az/LC_MESSAGES/xfce4-mixer.mo
 share/locale/be/LC_MESSAGES/xfce4-mixer.mo
@@ -13,8 +12,8 @@ share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
 share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
 share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
-share/locale/da/LC_MESSAGES/xfce4-mixer.mo
 share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/dz/LC_MESSAGES/xfce4-mixer.mo
 share/locale/el/LC_MESSAGES/xfce4-mixer.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
 share/locale/es/LC_MESSAGES/xfce4-mixer.mo
@@ -24,6 +23,7 @@ share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
 share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/he/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
@@ -31,9 +31,10 @@ share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
 share/locale/hy/LC_MESSAGES/xfce4-mixer.mo
 share/locale/it/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ka/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ku/LC_MESSAGES/xfce4-mixer.mo
 share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/mk/LC_MESSAGES/xfce4-mixer.mo
 share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
@@ -45,8 +46,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
 share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sl/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sq/LC_MESSAGES/xfce4-mixer.mo
 share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
 share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
 share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
@@ -54,3 +53,6 @@ share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
 share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
+share/xfce4/panel-plugins/xfce4-mixer.desktop
+@unexec ${RMDIR} %D/libexec/xfce4/panel-plugins 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/xfce4/modules 2>/dev/null || ${TRUE}
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index c90895070f9..44973b8e6f8 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:08 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+=	xfce4-mixer
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-mixer
 
 .if ${XFCE4_MIXER_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.4.1
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 .endif	# XFCE4_MIXER_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/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/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 5ad62f7bf22..f0052a0d846 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:08 martti Exp $
 
-SHA1 (xfce4-mixer-4.2.4.tar.gz) = aa3f12f6ce13774a296566db10c2c90396d0e3b2
-RMD160 (xfce4-mixer-4.2.4.tar.gz) = c545b70960cecc2f9ee5f923b3dd11a56cec05d1
-Size (xfce4-mixer-4.2.4.tar.gz) = 607409 bytes
-SHA1 (patch-aa) = 813b37e41c8a19c8ce2d2b4ed9fc5e53601dd025
-SHA1 (patch-ab) = 52d3d875c335a55e00870385cc114af7265748dc
+SHA1 (xfce4-mixer-4.4.1.tar.bz2) = 23bbaf2e56adea6d1c7be9e2b7bea4b9c1d27be5
+RMD160 (xfce4-mixer-4.4.1.tar.bz2) = 77c8c9cc206bd4ca9bd7c4b93ed20a35575350ac
+Size (xfce4-mixer-4.4.1.tar.bz2) = 459005 bytes
diff --git a/audio/xfce4-mixer/patches/patch-aa b/audio/xfce4-mixer/patches/patch-aa
deleted file mode 100644
index c7989e7cc96..00000000000
--- a/audio/xfce4-mixer/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/11/28 18:57:25 rillig Exp $
-
---- panel-plugin/plugin.c.orig	2006-11-28 19:25:31.314565636 +0100
-+++ panel-plugin/plugin.c	2006-11-28 19:27:08.972814548 +0100
-@@ -18,6 +18,14 @@
- /* DO: timeout -> update volume */
- #define UPDATE_TIMEOUT 1000
- 
-+#ifdef XFCE_PANEL_THREADED
-+#  define XFCE_PANEL_LOCK() gdk_threads_enter()
-+#  define XFCE_PANEL_UNLOCK() gdk_threads_leave()
-+#else
-+#  define XFCE_PANEL_LOCK() do { } while (0)
-+#  define XFCE_PANEL_UNLOCK() do { } while (0)
-+#endif
-+
- typedef struct
- {
- 	GtkWidget *box;
diff --git a/audio/xfce4-mixer/patches/patch-ab b/audio/xfce4-mixer/patches/patch-ab
deleted file mode 100644
index abb62294577..00000000000
--- a/audio/xfce4-mixer/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/01/23 11:53:46 martti Exp $
-
-SunPro cannot handle function-like macros on the command line.
-
---- configure.orig	2007-01-14 21:05:51.000000000 +0000
-+++ configure	2007-01-23 12:35:37.000000000 +0000
-@@ -23199,13 +23199,9 @@
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-     xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_THREADED=1"
--    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\)"
--    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
-   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
--    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\)"
--    xdt_cv_CFLAGS="$xdt_cv_CFLAGS -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
-   fi
-   XFCE4_PANEL_CFLAGS="$xdt_cv_CFLAGS"
- 
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index 49e9233d016..e555eca5238 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.11 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/04/12 09:55:08 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.3.1
+XFCE4_VERSION=	0.5.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION=	3
+#PKGREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://download.berlios.de/xfce-goodies/
+MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-xmms-plugin/
 COMMENT=	Xfce XMMS plugin
 
-EXTRACT_SUFX=	.tar.bz2
+USE_TOOLS+=	intltool
+
+.include "options.mk"
 
-.include "../../audio/xmms/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/PLIST b/audio/xfce4-xmms-plugin/PLIST
index 5bbde0056e8..7f3229caa18 100644
--- a/audio/xfce4-xmms-plugin/PLIST
+++ b/audio/xfce4-xmms-plugin/PLIST
@@ -1,18 +1,22 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:12 jlam Exp $
-lib/xfce4/panel-plugins/libxmms_plugin.la
+@comment $NetBSD: PLIST,v 1.5 2007/04/12 09:55:08 martti Exp $
+libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+share/locale/ca/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
 share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/xmms-plugin/xmms-plugin-menu-eject.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-icon.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-next.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-play.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-stop.png
-share/xfce4/xmms-plugin/xmms-plugin-next.png
-share/xfce4/xmms-plugin/xmms-plugin-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-play.png
-share/xfce4/xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-stop.png
-@dirrm share/xfce4/xmms-plugin
+share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/tr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/xfce4/panel-plugins/xfce4-xmms-plugin.desktop
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-menu.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-pause.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-play.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-prev.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-stop.png
+@dirrm share/xfce4/xfce4-xmms-plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index 761304518eb..21ba5be9d94 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/10/12 06:06:07 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:08 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -12,12 +12,14 @@ BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-xmms-plugin
 
 .if ${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1nb3
+BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.5.1
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
 .endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
-.include "../../audio/xmms/buildlink3.mk"
+.include "options.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/audio/xfce4-xmms-plugin/distinfo b/audio/xfce4-xmms-plugin/distinfo
index bdb8f088233..5ed7c13de66 100644
--- a/audio/xfce4-xmms-plugin/distinfo
+++ b/audio/xfce4-xmms-plugin/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/10/12 05:43:20 martti Exp $
+$NetBSD: distinfo,v 1.5 2007/04/12 09:55:08 martti Exp $
 
-SHA1 (xfce4-xmms-plugin-0.3.1.tar.bz2) = f59c799d672941dfadd19272daff6f6e5b1c02fd
-RMD160 (xfce4-xmms-plugin-0.3.1.tar.bz2) = 955f0ffcce94480d1144416076e3bfd8de76ac00
-Size (xfce4-xmms-plugin-0.3.1.tar.bz2) = 518730 bytes
-SHA1 (patch-aa) = 4fb80effa95987e87ae305db886cfc34cffb4292
-SHA1 (patch-ab) = b24664d40d4c05b872bdb5696a4182cd55ec088e
+SHA1 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 8fa306b003935d1c54ed078c5f18cb61513df682
+RMD160 (xfce4-xmms-plugin-0.5.1.tar.bz2) = 52ac130a300a9b3e79d103e51a56c7bee639270c
+Size (xfce4-xmms-plugin-0.5.1.tar.bz2) = 314121 bytes
diff --git a/audio/xfce4-xmms-plugin/options.mk b/audio/xfce4-xmms-plugin/options.mk
new file mode 100644
index 00000000000..109f7610307
--- /dev/null
+++ b/audio/xfce4-xmms-plugin/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2007/04/12 09:55:09 martti Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xfce4-xmms-plugin
+PKG_SUPPORTED_OPTIONS=
+PKG_OPTIONS_REQUIRED_GROUPS+=	xfce4-xmms-plugin-player
+PKG_OPTIONS_GROUP.xfce4-xmms-plugin-player=	xmms bmp
+PKG_SUGGESTED_OPTIONS=		xmms
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbmp)
+.include "../../audio/bmp/buildlink3.mk"
+.else
+.include "../../audio/xmms/buildlink3.mk"
+.endif
diff --git a/audio/xfce4-xmms-plugin/patches/patch-aa b/audio/xfce4-xmms-plugin/patches/patch-aa
deleted file mode 100644
index a3f914aea77..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.ac.orig	2006-10-12 08:38:23.000000000 +0000
-+++ configure.ac	2006-10-12 08:38:33.000000000 +0000
-@@ -35,7 +35,7 @@
- dnl check for player
- AC_MSG_CHECKING([what player to link with])
- AC_ARG_WITH([player], [  --with-player=xmms/beep Specify player to link with [default=xmms]])
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
-   AC_MSG_RESULT([Beep media player])
-   BM_DEPEND([PLAYER], [beep], [0.9.6.0])
- 
-@@ -44,7 +44,7 @@
-   AC_MSG_RESULT([XMMS media player])
- 
-   AC_CHECK_PROGS([XMMS_CONFIG], [xmms-config], [no])
--  if test x"$XMMS_CONFIG" == x"no"; then
-+  if test x"$XMMS_CONFIG" = x"no"; then
-     AC_MSG_ERROR([*** XMMS not found. Please install XMMS first. ***])
-   fi
- 
diff --git a/audio/xfce4-xmms-plugin/patches/patch-ab b/audio/xfce4-xmms-plugin/patches/patch-ab
deleted file mode 100644
index 869a2c40476..00000000000
--- a/audio/xfce4-xmms-plugin/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/10/12 05:43:20 martti Exp $
-
---- configure.orig	2006-10-12 08:39:06.000000000 +0000
-+++ configure	2006-10-12 08:39:35.000000000 +0000
-@@ -20790,7 +20790,7 @@
-   withval="$with_player"
- 
- fi;
--if test x"$with_player" == x"beep"; then
-+if test x"$with_player" = x"beep"; then
-   echo "$as_me:$LINENO: result: Beep media player" >&5
- echo "${ECHO_T}Beep media player" >&6
- 
-@@ -20942,7 +20942,7 @@
- done
- test -n "$XMMS_CONFIG" || XMMS_CONFIG="no"
- 
--  if test x"$XMMS_CONFIG" == x"no"; then
-+  if test x"$XMMS_CONFIG" = x"no"; then
-     { { echo "$as_me:$LINENO: error: *** XMMS not found. Please install XMMS first. ***" >&5
- echo "$as_me: error: *** XMMS not found. Please install XMMS first. ***" >&2;}
-    { (exit 1); exit 1; }; }