3 files changed, 29 insertions, 22 deletions

diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 2872a6f41c9d..0fa1ef99a031 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -5,37 +5,31 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xfce4-parole
+PORTNAME=	parole
 PORTVERSION=	0.2.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia xfce
-MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/apps/parole/0.2
+MASTER_SITES=	XFCE/src/apps/parole/0.2/
 DIST_SUBDIR=	xfce4
-DISTNAME=	parole-${PORTVERSION}
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Lightweight media player for Xfce4 based on the gstreamer engine
+COMMENT=	Lightweight media player for Xfce4 based on gstreamer
 
-DATADIR=	${PREFIX}/share/${PORTNAME:S/xfce4-//}
+LICENSE=	GPLv2
 
 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=	ffmpeg good theora xvid mp3 faad ogg dvd x264 \
-		flac wavpack soup
+USE_GSTREAMER=	core faad flac wavpack
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-power-manager-plugin \
 		--enable-libnotify \
 		--enable-taglib \
-		--disable-gtk-doc-html \
 		--without-html-dir
-CONFIGURE_ENV=	ac_cv_prog_AWK="${AWK}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	gnomehack gtk20 glib20 intltool intlhack pkgconfig \
@@ -44,10 +38,19 @@ USE_XFCE=	configenv libgui libutil
 USE_XORG=	x11 sm
 USE_LDCONFIG=	yes
 
-OPTIONS=	NLS "Enable Native Language Support" on \
-		CDDA "Enable CD audio support" on
+OPTIONS=	CDDA	"CD audio support (cdparanoia)"		on	\
+		HTTP	"HTTP streaming support (libsoup)"	on	\
+		NLS	"Native Language Support"		on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_CDDA)
+USE_GSTREAMER+=	cdparanoia
+.endif
+
+.if !defined(WITHOUT_HTTP)
+USE_GSTREAMER+=	soup
+.endif
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -58,12 +61,7 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_CDDA)
-LIB_DEPENDS+=	cdio++.0:${PORTSDIR}/sysutils/gstreamer-plugins-cdio
-USE_GSTREAMER+=	cdaudio
-.endif
-
 post-install:
 	@-update-desktop-database
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/xfce4-parole/files/patch-configure b/multimedia/xfce4-parole/files/patch-configure
index 00c30adb3310..01e687a56402 100644
--- a/multimedia/xfce4-parole/files/patch-configure
+++ b/multimedia/xfce4-parole/files/patch-configure
@@ -1,6 +1,14 @@
 --- configure.orig	2010-01-25 12:47:28.000000000 +0100
 +++ configure	2011-03-11 17:11:27.000000000 +0100
-@@ -20717,17 +20717,17 @@
+@@ -18550,7 +18550,6 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
+@@ -21388,17 +21387,17 @@
  if test "x${prefix}" = "xNONE"; then
  
  cat >>confdefs.h <<_ACEOF
diff --git a/multimedia/xfce4-parole/pkg-plist b/multimedia/xfce4-parole/pkg-plist
index 58857c527175..b647fd5a7b9f 100644
--- a/multimedia/xfce4-parole/pkg-plist
+++ b/multimedia/xfce4-parole/pkg-plist
@@ -59,6 +59,7 @@ share/pixmaps/parole.png
 %%NLS%%@dirrmtry share/locale/ug
 %%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