From nobody@FreeBSD.org  Sun Mar 10 15:09:14 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 001D4C00
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Mar 2013 15:09:13 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E2F56FCC
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Mar 2013 15:09:13 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2AF9DHg079540
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Mar 2013 15:09:13 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2AF9DvG079539;
	Sun, 10 Mar 2013 15:09:13 GMT
	(envelope-from nobody)
Message-Id: <201303101509.r2AF9DvG079539@red.freebsd.org>
Date: Sun, 10 Mar 2013 15:09:13 GMT
From: chris petrik <c.petrik.sosa@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] multimedia/gxmms fix pkg-plist for BMP support
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176814
>Category:       ports
>Synopsis:       [PATCH] multimedia/gxmms fix pkg-plist for BMP support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 10 15:10:01 UTC 2013
>Closed-Date:    Sun Mar 10 15:03:12 CDT 2013
>Last-Modified:  Sun Mar 10 20:10:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->bdrewery 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 10 15:10:08 UTC 2013 
Responsible-Changed-Why:  
bdrewery@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176814 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Sun Mar 10 15:03:11 CDT 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176814 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176814: commit references a PR
Date: Sun, 10 Mar 2013 20:03:17 +0000 (UTC)

 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@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
 -@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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
