- Update to 0.3.0

- Use USE_PKGCONFIG macro
- Convert to new framework OptionsNG
- Remove USE_AUTOTOOLS (libtool) macro

Submitted by:	myself
Approved by:	rene, miwi (mentors)

4 files changed, 142 insertions, 24 deletions

diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 60a33e1a4594..c49a52689d4e 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	parole
-PORTVERSION=	0.2.0.6
-PORTREVISION=	6
+PORTVERSION=	0.3.0
 CATEGORIES=	multimedia xfce
-MASTER_SITES=	XFCE/src/apps/parole/0.2/
+MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -21,7 +20,7 @@ LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
 		notify.4:${PORTSDIR}/devel/libnotify \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GSTREAMER=	core faad flac wavpack
@@ -32,27 +31,28 @@ CONFIGURE_ARGS=	--disable-power-manager-plugin \
 		--without-html-dir
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig \
-		desktopfileutils
-USE_XFCE=	configenv libgui libutil
+USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack desktopfileutils
+USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11 sm
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
-OPTIONS=	CDDA	"CD audio support (cdparanoia)"		on	\
-		HTTP	"HTTP streaming support (libsoup)"	on	\
-		NLS	"Native Language Support"		on
+OPTIONS_DEFINE=	CDDA HTTP NLS
+OPTIONS_DEFAULT=	CDDA HTTP NLS
+CDDA_DESC=	CD audio support (cdparanoia)
+HTTP_DESC=	HTTP streaming support (libsoup)
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CDDA)
+.if ${PORT_OPTIONS:MCDDA}
 USE_GSTREAMER+=	cdparanoia
 .endif
 
-.if !defined(WITHOUT_HTTP)
+.if ${PORT_OPTIONS:MHTTP}
 USE_GSTREAMER+=	soup
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=	NLS=""
@@ -61,6 +61,15 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+post-patch:
+# Fix installation directory plugins
+	${FIND} ${WRKSRC}/src -name 'Makefile.in' -type f \
+		| ${XARGS} ${REINPLACE_CMD} -e \
+		's|(datadir)/src/misc|(datadir)/${PORTNAME}|'
+# Fix .rc file path
+	${REINPLACE_CMD} -e 's|src/misc|${PORTNAME}|g' \
+		${WRKSRC}/src/common/parole-rc-utils.h
+
 post-install:
 	@-update-desktop-database
 
diff --git a/multimedia/xfce4-parole/distinfo b/multimedia/xfce4-parole/distinfo
index 5f6d37da7bc3..636effa8e31b 100644
--- a/multimedia/xfce4-parole/distinfo
+++ b/multimedia/xfce4-parole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/parole-0.2.0.6.tar.bz2) = 1bfcb6ca34eb496bc08ce3ac803a20b4fea566bddca4ce4400d3edf7b25804b6
-SIZE (xfce4/parole-0.2.0.6.tar.bz2) = 652946
+SHA256 (xfce4/parole-0.3.0.tar.bz2) = 4e96524bfbfaa8f81f3a6e655edb0ce58d62543531609ba10cffdf2dc894a840
+SIZE (xfce4/parole-0.3.0.tar.bz2) = 620227
diff --git a/multimedia/xfce4-parole/files/patch-src_gst_parole-gst.c b/multimedia/xfce4-parole/files/patch-src_gst_parole-gst.c
new file mode 100644
index 000000000000..40645e3b9f82
--- /dev/null
+++ b/multimedia/xfce4-parole/files/patch-src_gst_parole-gst.c
@@ -0,0 +1,103 @@
+--- src/gst/parole-gst.c.orig	2012-08-08 19:34:30.000000000 +0000
++++ src/gst/parole-gst.c	2012-08-10 22:16:18.000000000 +0000
+@@ -84,7 +84,7 @@
+ 
+     GstBus       *bus;
+     
+-    GMutex       lock;
++    GMutex       *lock;
+     GstState      state;
+     GstState      target;
+     ParoleState media_state;
+@@ -166,7 +166,7 @@
+     if ( gst->priv->device )
+ 	g_free (gst->priv->device);
+     
+-    g_mutex_clear (&gst->priv->lock);
++    g_mutex_free (gst->priv->lock);
+ 
+     G_OBJECT_CLASS (parole_gst_parent_class)->finalize (object);
+ }
+@@ -1515,10 +1515,10 @@
+ 		  "has-video", &playing_video,
+ 		  NULL);
+     
+-    g_mutex_lock (&gst->priv->lock);
++    g_mutex_lock (gst->priv->lock);
+     gst->priv->target = GST_STATE_NULL;
+     parole_stream_init_properties (gst->priv->stream);
+-    g_mutex_unlock (&gst->priv->lock);
++    g_mutex_unlock (gst->priv->lock);
+ 
+     parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+     
+@@ -1844,7 +1844,7 @@
+     gst->priv->target = GST_STATE_VOID_PENDING;
+     gst->priv->media_state = PAROLE_STATE_STOPPED;
+     gst->priv->aspect_ratio = PAROLE_ASPECT_RATIO_NONE;
+-    g_mutex_init (&gst->priv->lock);
++    gst->priv->lock = g_mutex_new ();
+     gst->priv->stream = parole_stream_new ();
+     gst->priv->tick_id = 0;
+     gst->priv->hidecursor_timer = g_timer_new ();
+@@ -1921,7 +1921,7 @@
+ 
+ void parole_gst_play_uri (ParoleGst *gst, const gchar *uri, const gchar *subtitles)
+ {
+-    g_mutex_lock (&gst->priv->lock);
++    g_mutex_lock (gst->priv->lock);
+     
+     gst->priv->target = GST_STATE_PLAYING;
+     parole_stream_init_properties (gst->priv->stream);
+@@ -1931,7 +1931,7 @@
+ 		  "subtitles", subtitles,
+ 		  NULL);
+ 
+-    g_mutex_unlock (&gst->priv->lock);
++    g_mutex_unlock (gst->priv->lock);
+     
+     if ( gst->priv->state_change_id == 0 )
+ 	gst->priv->state_change_id = g_timeout_add_seconds (20, 
+@@ -1972,11 +1972,11 @@
+ 
+ void parole_gst_pause (ParoleGst *gst)
+ {
+-    g_mutex_lock (&gst->priv->lock);
++    g_mutex_lock (gst->priv->lock);
+     
+     gst->priv->target = GST_STATE_PAUSED;
+     
+-    g_mutex_unlock (&gst->priv->lock);
++    g_mutex_unlock (gst->priv->lock);
+ 
+     parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+     parole_gst_change_state (gst, GST_STATE_PAUSED);
+@@ -1984,11 +1984,11 @@
+ 
+ void parole_gst_resume (ParoleGst *gst)
+ {
+-    g_mutex_lock (&gst->priv->lock);
++    g_mutex_lock (gst->priv->lock);
+     
+     gst->priv->target = GST_STATE_PLAYING;
+     
+-    g_mutex_unlock (&gst->priv->lock);
++    g_mutex_unlock (gst->priv->lock);
+ 
+     parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+     parole_gst_change_state (gst, GST_STATE_PLAYING);
+@@ -2008,12 +2008,12 @@
+ 
+ void parole_gst_stop (ParoleGst *gst)
+ {
+-    g_mutex_lock (&gst->priv->lock);
++    g_mutex_lock (gst->priv->lock);
+     
+     parole_stream_init_properties (gst->priv->stream);
+     gst->priv->target = GST_STATE_NULL;
+ 		  
+-    g_mutex_unlock (&gst->priv->lock);
++    g_mutex_unlock (gst->priv->lock);
+ 
+     parole_window_busy_cursor (GTK_WIDGET (gst)->window);
+     
diff --git a/multimedia/xfce4-parole/pkg-plist b/multimedia/xfce4-parole/pkg-plist
index b647fd5a7b9f..5ed605f76fe8 100644
--- a/multimedia/xfce4-parole/pkg-plist
+++ b/multimedia/xfce4-parole/pkg-plist
@@ -7,21 +7,17 @@ include/parole/parole-provider-player.h
 include/parole/parole-provider-plugin.h
 include/parole/parole-stream.h
 include/parole/parole.h
-lib/parole-0/stream-properties.a
 lib/parole-0/stream-properties.la
 lib/parole-0/stream-properties.so
-lib/parole-0/tray-icon.a
 lib/parole-0/tray-icon.la
 lib/parole-0/tray-icon.so
-lib/parole-0/window-title.a
-lib/parole-0/window-title.la
-lib/parole-0/window-title.so
 share/applications/parole.desktop
 share/icons/hicolor/16x16/apps/parole.png
-share/icons/hicolor/22x22/apps/parole.png
+share/icons/hicolor/24x24/apps/parole.png
 share/icons/hicolor/32x32/apps/parole.png
 share/icons/hicolor/48x48/apps/parole.png
 share/icons/hicolor/scalable/apps/parole.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/parole.mo
@@ -33,33 +29,43 @@ share/icons/hicolor/scalable/apps/parole.svg
 %%NLS%%share/locale/eu/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/he/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/id/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/is/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/it/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/te/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/th/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/parole.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/parole.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/parole.mo
 %%DATADIR%%/parole-plugins-0/stream-properties.desktop
 %%DATADIR%%/parole-plugins-0/system-tray.desktop
-%%DATADIR%%/parole-plugins-0/window-title.desktop
-share/pixmaps/loader.gif
 share/pixmaps/parole.png
 @dirrm %%DATADIR%%/parole-plugins-0
 @dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-@dirrmtry share/applications
 @dirrm lib/parole-0
 @dirrm include/parole
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true