Date: Sun, 10 Mar 2013 15:09:13 GMT From: chris petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/176814: [PATCH] multimedia/gxmms fix pkg-plist for BMP support Message-ID: <201303101509.r2AF9DvG079539@red.freebsd.org> Resent-Message-ID: <201303101510.r2AFA1JU056990@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176814
>Category: ports
>Synopsis: [PATCH] multimedia/gxmms fix pkg-plist for BMP support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 10 15:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: chris petrik
>Release: FreeBSD 9.1
>Organization:
na
>Environment:
>Description:
Fix build to properly work when bmp is used instead of xmms.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: gxmms/Makefile
===================================================================
--- gxmms/Makefile (revision 313786)
+++ gxmms/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= gxmms
PORTVERSION= 0.3.0
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -19,7 +20,7 @@
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 +32,19 @@
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>
Index: gxmms/pkg-plist
===================================================================
--- gxmms/pkg-plist (revision 313786)
+++ gxmms/pkg-plist (working copy)
@@ -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
-@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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303101509.r2AF9DvG079539>