Updated to Xfce 4.4.1

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

7 files changed, 50 insertions, 74 deletions

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; }; }