ports/157153: [Patch] Cleanup (PLIST/OPTIONS/LIB_DEPENDS) of multimedia/audacious-plugins

[Herbert J. Skuhra]

>Number:         157153
>Category:       ports
>Synopsis:       [Patch] Cleanup (PLIST/OPTIONS/LIB_DEPENDS) of multimedia/audacious-plugins
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 19:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 8.2-STABLE FreeBSD 8.2-STABLE #8 r222048: Wed May 18 11:16:59 CEST 2011     herbert at oslo.ath.cx:/usr/obj/usr/src/sys/PC1  i386
>Description:
The attached patch cleans up multimedia/audacious-plugins:

* add option for Scrobbler plugin, it's built by default (when ftp/curl is installed), but missing in PLIST
* esd plugin is gone; remove OPTION for it
* remove unrecognized configure options: --(enable|disable)-dbus, --disable-projectm
* notify support is built when devel/libnotify is installed
* replace some spaces with tab (line 39 and 50)

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN audacious-plugins.bak/Makefile audacious-plugins/Makefile
--- audacious-plugins.bak/Makefile	2011-05-18 13:27:10.000000000 +0200
+++ audacious-plugins/Makefile	2011-05-18 20:44:16.000000000 +0200
@@ -23,7 +23,7 @@
 		CFLAGS="-I${LOCALBASE}/include" \
 		CPP=${CPP}
 CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa \
-		--disable-pulse --disable-projectm --disable-projectm-1.0
+		--disable-pulse --disable-projectm-1.0
 WANT_GNOME=	yes
 WANT_EFL=	yes
 WANT_SDL=	yes
@@ -36,8 +36,7 @@
 #		PROJECTM	"Enable projectM vis plugin"		on \
 
 OPTIONS=	DBUS		"Enable dbus support"			on  \
-                CUE             "Enable CUE support"                    on  \
-		ESOUND		"Enable Esound output output"		off \
+		CUE             "Enable CUE support"                    on  \
 		MP3		"Enable mp3 plugin"			on  \
 		ROCKLIGHT	"Enable Rocklight vis plugin"		on  \
 		LIRC		"Enable LIRC plugin"			off \
@@ -47,7 +46,7 @@
 		ADPLUG		"Enable AdPlug plugin"			off \
 		VORBIS		"Enable Ogg Vorbis input plugin"	off \
 		FLAC		"Enable FLAC input plugin"		off \
-                FFAUDIO         "Enable FFAUDIO input plugin"           off \
+		FFAUDIO         "Enable FFAUDIO input plugin"           off \
 		WAVPACK 	"Enable WavPack input plugin"		off \
 		AAC		"Enable aac plugin"			on  \
 		SNDFILE 	"Enable sndfile extensions"		off \
@@ -57,6 +56,7 @@
 		OSS		"Enable OSS output plugin"		on  \
 		OSS4		"Enable OSS4 output plugin"		off \
 		CDAUDIO		"Enable cdaudio-ng input plugin"        on  \
+		SCROBBLER	"Enable Scrobbler Plugin"		on  \
 		NEON		"Enable neon (HTTP) support"            on  \
 		MMS		"Enable mms support"			off \
 		MTP		"Enable MTP upload support"             off \
@@ -80,20 +80,21 @@
 CONFIGURE_ARGS+=--disable-sdlout
 .endif
 
-.if defined(WITH_NOTIFY)
-PLIST_SUB+=	NOTIFY=""
+.if defined(WITH_NOTIFY) || exists(${LOCALBASE}/lib/libnotify.so.1)
+LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
+PLIST_SUB+=     NOTIFY=""
 .else
 PLIST_SUB+=	NOTIFY="@comment "
 CONFIGURE_ARGS+=--disable-notify
 .endif
 
 .if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus --enable-gnomeshortcuts
+LIB_DEPENDS+=   dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-gnomeshortcuts
 PLIST_SUB+=	DBUS=""
 .else
-CONFIGURE_ARGS+=--disable-dbus --disable-gnomeshortcuts
+CONFIGURE_ARGS+=--disable-gnomeshortcuts
 PLIST_SUB+=	DBUS="@comment "
 .endif
 
@@ -106,20 +107,6 @@
 PLIST_SUB+=	CUEPLUGIN="@comment "
 .endif
 
-.if defined(WITH_ESOUND)
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=--enable-esd
-PLIST_SUB+=	ESDPLUGIN=""
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
-.else
-PKGNAMESUFFIX=	-esound
-.endif
-.else
-CONFIGURE_ARGS+=--disable-esd
-PLIST_SUB+=	ESDPLUGIN="@comment "
-.endif
-
 .if !defined(WITHOUT_MP3)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=--enable-mp3
@@ -263,6 +250,15 @@
 CONFIGURE_ARGS+=--disable-oss
 .endif
 
+.if !defined(WITHOUT_SCROBBLER)
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	SCROBBLERPLUGIN=""
+CONFIGURE_ARGS+=--enable-scrobbler
+.else
+PLIST_SUB+=	SCROBBLERPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-scrobbler
+.endif
+
 .if !defined(WITHOUT_OSS4)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
 PLIST_SUB+=	OSS4PLUGIN=""
diff -ruN audacious-plugins.bak/pkg-plist audacious-plugins/pkg-plist
--- audacious-plugins.bak/pkg-plist	2011-05-18 13:27:10.000000000 +0200
+++ audacious-plugins/pkg-plist	2011-05-18 14:55:47.000000000 +0200
@@ -23,6 +23,7 @@
 %%LIRCPLUGIN%%lib/audacious/General/lirc.so
 lib/audacious/General/lyricwiki.so
 %%NOTIFY%%lib/audacious/General/notify.so
+%%SCROBBLERPLUGIN%%lib/audacious/General/scrobbler.so
 lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 %%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
@@ -49,7 +50,6 @@
 lib/audacious/Input/xsf.so
 %%OSSPLUGIN%%lib/audacious/Output/OSS.so
 %%OSS4PLUGIN%%lib/audacious/Output/oss4.so
-%%ESDPLUGIN%%lib/audacious/Output/ESD.so
 lib/audacious/Output/filewriter.so
 %%JACKPLUGIN%%lib/audacious/Output/jackout.so
 lib/audacious/Output/null.so


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