5 files changed, 26 insertions, 30 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 2225da87e441..ac720e8282e7 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
@@ -23,7 +23,7 @@ CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 		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 @@ PORTDOCS=	AUTHORS
 #		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 @@ OPTIONS=	DBUS		"Enable dbus support"			on  \
 		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 @@ OPTIONS=	DBUS		"Enable dbus support"			on  \
 		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 @@ PLIST_SUB+=	SDL="@comment "
 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 @@ CONFIGURE_ARGS+=--disable-cue
 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 @@ PLIST_SUB+=	OSSPLUGIN="@comment "
 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 --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 1655dc0b9389..8933a6b3deba 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-2.5.0.tgz) = 1e1bcf88b350a6ad4b9c0c40a0921f7fc20c89eafd7f8f616a82de738b6c5de2
-SIZE (audacious-plugins-2.5.0.tgz) = 3480901
+SHA256 (audacious-plugins-2.5.1.tgz) = cc60f91d04593ebff0603a0cdc6e03e8ddf873614b0256baad11601e519d37e7
+SIZE (audacious-plugins-2.5.1.tgz) = 3488198
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 7bdb82815b8e..153da9c2656b 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -23,6 +23,7 @@ lib/audacious/General/hotkey.so
 %%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/vtx.so
 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
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index d0e05f3455cb..225f86d4fa69 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index e8ebe0eac82a..78ff739a4eba 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-2.5.0.tgz) = a4d7f6897df91f2d76bb6f388fc47d0d4aa1443fdb8dcf7a0c5debf80360c900
-SIZE (audacious-2.5.0.tgz) = 1224598
+SHA256 (audacious-2.5.1.tgz) = 5f2aead4959db5918efde06fee64f8ae528f5c2dc737d38595ea26e1cae112dd
+SIZE (audacious-2.5.1.tgz) = 1227443