ports/173751: [PATCH] multimedia/gxmms update to 0.3.0

[Chris Petrik]

>Number:         173751
>Category:       ports
>Synopsis:       [PATCH] multimedia/gxmms update to 0.3.0
>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:   Wed Nov 21 04:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
Update to 0.3.0
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: gxmms/Makefile
==================================================================
--- gxmms/Makefile
+++ gxmms/Makefile
@@ -1,25 +1,45 @@
 # Created by: Radek Kozlowski <radek at raadradd.com>
 # $FreeBSD: head/multimedia/gxmms/Makefile 305074 2012-09-30 06:25:19Z rm $
 
 PORTNAME=	gxmms
-PORTVERSION=	0.2.1
-PORTREVISION=	14
+PORTVERSION=	0.3.0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	c.petrik.sosa at gmail.com
 COMMENT=	Simple GNOME panel applet for controlling XMMS
 
-BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
-
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomepanel gnomeprefix intlhack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="`pkg-config --libs libgnomeui-2.0`"
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+
+OPTIONS_DEFINE=	XMMS BMP
+OPTIONS_DEFAULT=	XMMS
+
+XMMS_DESC=	Use xmms as frontend
+BMP_DESC=	Use BMP as frontend
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MXMMS}
+CONFIGURE_ARGS+=	--with-xmms
+BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+.else
+CONFIGURE_ARGS+=--disable-xmms
+.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
+.else
+CONFIGURE_ARGS+=--disable-bmp
+.endif
+
 .include <bsd.port.mk>

Index: gxmms/distinfo
==================================================================
--- gxmms/distinfo
+++ gxmms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gxmms-0.2.1.tar.gz) = bf3cc3bd5b42935db7589434a4777bc6125de3f49f8885bb086e9ebd9e85fb26
-SIZE (gxmms-0.2.1.tar.gz) = 129794
+SHA256 (gxmms-0.3.0.tar.gz) = a6515796cca60cc01e52af7acf42875e6dda0132737abe2d5525f1f6d9dc2606
+SIZE (gxmms-0.3.0.tar.gz) = 148662

Index: gxmms/files/patch-src-xmmsctrl.c
==================================================================
--- gxmms/files/patch-src-xmmsctrl.c
+++ gxmms/files/patch-src-xmmsctrl.c
@@ -1,22 +1,17 @@
---- src/xmmsctrl.c.orig	2004-09-03 00:19:54.000000000 +0200
-+++ src/xmmsctrl.c	2008-04-24 15:36:57.000000000 +0200
-@@ -45,16 +45,17 @@
- xmms_start(XMMSData *xmms)
+--- src/xmmsctrl.c.bak	2012-10-30 21:26:50.000000000 +0000
++++ src/xmmsctrl.c	2012-10-30 21:33:13.000000000 +0000
+@@ -44,11 +44,11 @@
+ void
+ player_start(XMMSData *xmms)
  {
-     static gchar *exec_cmd = "xmms";
--    static gchar *msg_error = _("Sorry, unable to launch XMMS.");
-+    gchar *msg_error = _("Sorry, unable to launch XMMS.");
+-    static gchar *msg_error = _("Unable to launch XMMS.");
+-    static gchar *exec_cmd = "xmms &";
++    gchar *msg_error = _("Unable to launch XMMS.");
++    gchar *exec_cmd = "xmms &";
      gint timer;
      time_t lt;
-+    gchar *exec_this;
- 
-     if (xmms_remote_is_running(xmms->session))
+-
++    	
+     if (player_is_running(xmms))
      {
          return;
-     }
- 
--    gchar *exec_this = g_strdup_printf("%s &", exec_cmd);
-+    exec_this = g_strdup_printf("%s &", exec_cmd);
- 
-     if (system(exec_this))
-     {

Index: gxmms/pkg-plist
==================================================================
--- gxmms/pkg-plist
+++ gxmms/pkg-plist
@@ -5,10 +5,12 @@
 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



>Release-Note:
>Audit-Trail:
>Unformatted: