svn commit: r313840 - head/multimedia/gxmms

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 10 20:03:03 2013
New Revision: 313840
URL: http://svnweb.freebsd.org/changeset/ports/313840

Log:
  - Fix and enable BMP option
  
  PR:		ports/176814
  Submitted by:	Chris Petrik <c.petrik.sosa at gmail.com> (maintainer)

Modified:
  head/multimedia/gxmms/Makefile
  head/multimedia/gxmms/pkg-plist

Modified: head/multimedia/gxmms/Makefile
==============================================================================
--- head/multimedia/gxmms/Makefile	Sun Mar 10 20:03:03 2013	(r313839)
+++ head/multimedia/gxmms/Makefile	Sun Mar 10 20:03:03 2013	(r313840)
@@ -19,7 +19,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include `pkg-c
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_SINGLE=			FRONTEND
-OPTIONS_SINGLE_FRONTEND=	XMMS # BMP
+OPTIONS_SINGLE_FRONTEND=	XMMS BMP
 OPTIONS_DEFAULT=		XMMS
 
 XMMS_DESC=	Use xmms as frontend
@@ -31,16 +31,20 @@ BMP_DESC=	Use BMP as frontend
 CONFIGURE_ARGS+=	--with-xmms
 BUILD_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
+PLIST_SUB+=	XMMS=""
 .else
 CONFIGURE_ARGS+=--disable-xmms
+PLIST_SUB+=	XMMS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MBMP}
 CONFIGURE_ARGS+=--with-bmp
 BUILD_DEPENDS+=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 RUN_DEPENDS+=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
+PLIST_SUB+=	BMP=""
 .else
 CONFIGURE_ARGS+=--disable-bmp
+PLIST_SUB+=	BMP="@comment "
 .endif
 
 .include <bsd.port.mk>

Modified: head/multimedia/gxmms/pkg-plist
==============================================================================
--- head/multimedia/gxmms/pkg-plist	Sun Mar 10 20:03:03 2013	(r313839)
+++ head/multimedia/gxmms/pkg-plist	Sun Mar 10 20:03:03 2013	(r313840)
@@ -1,16 +1,32 @@
-libdata/bonobo/servers/GNOME_gxmmsApplet.server
-libexec/gxmms_applet
-share/gnome-2.0/ui/GNOME_gxmmsApplet.xml
-share/gxmms/gxmms.png
-share/gxmms/gxmms_eject.png
-share/gxmms/gxmms_next.png
-share/gxmms/gxmms_play_pause.png
-share/gxmms/gxmms_prev.png
-share/gxmms/gxmms_stop.png
-share/gxmms/gxmms_mini.png
-share/pixmaps/gxmms_mini.png
-share/pixmaps/gxmms.png
-share/locale/ca/LC_MESSAGES/gxmms.mo
-share/locale/es/LC_MESSAGES/gxmms.mo
-share/locale/fr/LC_MESSAGES/gxmms.mo
- at dirrm share/gxmms
+%%XMMS%%libdata/bonobo/servers/GNOME_gxmmsApplet.server
+%%XMMS%%libexec/gxmms_applet
+%%XMMS%%share/gnome-2.0/ui/GNOME_gxmmsApplet.xml
+%%XMMS%%share/gxmms/gxmms.png
+%%XMMS%%share/gxmms/gxmms_eject.png
+%%XMMS%%share/gxmms/gxmms_next.png
+%%XMMS%%share/gxmms/gxmms_play_pause.png
+%%XMMS%%share/gxmms/gxmms_prev.png
+%%XMMS%%share/gxmms/gxmms_stop.png
+%%XMMS%%share/gxmms/gxmms_mini.png
+%%XMMS%%share/pixmaps/gxmms_mini.png
+%%XMMS%%share/pixmaps/gxmms.png
+%%XMMS%%share/locale/ca/LC_MESSAGES/gxmms.mo
+%%XMMS%%share/locale/es/LC_MESSAGES/gxmms.mo
+%%XMMS%%share/locale/fr/LC_MESSAGES/gxmms.mo
+%%XMMS%%@dirrm share/gxmms
+%%BMP%%libdata/bonobo/servers/GNOME_gxmms_bmpApplet.server
+%%BMP%%libexec/gxmms_bmp_applet
+%%BMP%%share/gnome-2.0/ui/GNOME_gxmms_bmpApplet.xml
+%%BMP%%share/gxmms-bmp/gxmms_bmp.png
+%%BMP%%share/gxmms-bmp/gxmms_eject.png
+%%BMP%%share/gxmms-bmp/gxmms_next.png
+%%BMP%%share/gxmms-bmp/gxmms_play_pause.png
+%%BMP%%share/gxmms-bmp/gxmms_prev.png
+%%BMP%%share/gxmms-bmp/gxmms_stop.png
+%%BMP%%share/gxmms-bmp/gxmms_bmp_mini.png
+%%BMP%%share/pixmaps/gxmms_bmp_mini.png
+%%BMP%%share/pixmaps/gxmms_bmp.png
+%%BMP%%share/locale/ca/LC_MESSAGES/gxmms.mo
+%%BMP%%share/locale/es/LC_MESSAGES/gxmms.mo
+%%BMP%%share/locale/fr/LC_MESSAGES/gxmms.mo
+%%BMP%%@dirrm share/gxmms-bmp