4 files changed, 59 insertions, 63 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index c8d55c096701..b405b52928f3 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.7.2
-PORTREVISION=	2
+PORTVERSION=	3.8
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -13,25 +12,31 @@ COMMENT=	Plugins needed for audacious
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	audacious:multimedia/audacious
+LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
+	libdbus-1.so:devel/dbus \
+	libfontconfig.so:x11-fonts/fontconfig \
+	libfreetype.so:print/freetype2
+RUN_DEPENDS=	audacious:multimedia/audacious
+
+CONFLICTS_INSTALL=	audacious-plugins-gtk3-3.*
 
 GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lib gettext-tools gmake pkgconfig tar:bzip2
+USES=		compiler:c++11-lib execinfo gettext-tools gmake iconv \
+	localbase pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
-USE_GNOME=	glib20 libxml2
+USE_GNOME=	gtk20 glib20 libxml2 cairo gdkpixbuf2
+USE_XORG=	x11
 
-CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr
+CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr \
+	--enable-gnomeshortcuts \
+	--enable-gtk --enable-filewriter --enable-hotkey
 
-OPTIONS_MULTI=	TOOLKITS
-OPTIONS_MULTI_TOOLKITS=	GTK2 QT5
-OPTIONS_EXCLUDE=	QT5
-OPTIONS_DEFINE=	AAC ALSA AMIDI AOSD AOSDXCOMP BS2B CDDA CUE DBUS FFMPEG \
+OPTIONS_DEFINE=	AAC ALSA AMIDI AOSD BS2B CDDA CUE FFMPEG \
 		FLAC JACK LAME LIRC MP3 MMS MODPLUG MPRIS NEON NLS NOTIFY \
 		OPENGL OSS PULSEAUDIO SAMPLERATE SCROBBLER SDL SID SNDFILE \
 		SPEEDPITCH VORBIS WAVPACK
-OPTIONS_DEFAULT=	AAC AOSD AOSDXCOMP CDDA CUE DBUS FFMPEG FLAC GTK2 \
-		MP3 MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
+OPTIONS_DEFAULT=	AAC AOSD CDDA CUE FFMPEG FLAC MP3 \
+		MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
 
 AAC_LIB_DEPENDS=	libfaad.so:audio/faad
 AAC_CONFIGURE_OFF=	--disable-aac
@@ -40,29 +45,22 @@ ALSA_CONFIGURE_OFF=	--disable-alsa
 AMIDI_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 AMIDI_CONFIGURE_OFF=	--disable-amidiplug
 AOSD_USE=	gnome=pango
+AOSD_USE=	xorg=xrender
+AOSD_LIB_DEPENDS=	libXcomposite.so:x11/libXcomposite
 AOSD_CONFIGURE_ENABLE=	aosd
-AOSD_IMPLIES=	GTK2
-AOSDXCOMP_LIB_DEPENDS=	libXcomposite.so:x11/libXcomposite
-AOSDXCOMP_CONFIGURE_ENABLE=	aosd-xcomp
-AOSDXCOMP_IMPLIES=	AOSD
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
 BS2B_CONFIGURE_OFF=	--disable-bs2b
 CDDA_LIB_DEPENDS=	libcdio_cdda.so:sysutils/libcdio-paranoia \
-	libcddb.so:audio/libcddb
+	libcddb.so:audio/libcddb \
+	libcdio.so:sysutils/libcdio
 CDDA_CONFIGURE_OFF=	--disable-cdaudio
 CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
 CUE_CONFIGURE_OFF=	--disable-cue
-DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
-DBUS_CONFIGURE_ENABLE=	gnomeshortcuts
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_WITH=	ffmpeg=ffmpeg
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
-FLAC_CONFIGURE_ON=	--enable-flacng --enable-filewriter_flac
-FLAC_CONFIGURE_OFF=	--disable-flacng --disable-filewriter_flac
-GTK2_USE=	gnome=gtk20
-GTK2_CONFIGURE_ON=	--enable-gtk --enable-filewriter --enable-hotkey
-GTK2_CONFIGURE_OFF=	--disable-gtk --disable-filewriter --disable-hotkey
-GTK2_IMPLIES=	DBUS
+FLAC_CONFIGURE_ON=	--enable-flac --enable-filewriter
+FLAC_CONFIGURE_OFF=	--disable-flac --disable-filewriter
 JACK_LIB_DEPENDS=	libjack.so:audio/jack \
 	libsamplerate.so:audio/libsamplerate
 JACK_CONFIGURE_OFF=	--disable-jack
@@ -77,7 +75,6 @@ MMS_CONFIGURE_OFF=	--disable-mms
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_OFF=	--disable-modplug
 MPRIS_CONFIGURE_ENABLE=	mpris2
-MPRIS_IMPLIES=	DBUS
 NEON_LIB_DEPENDS=	libneon.so:www/neon
 NEON_CONFIGURE_OFF=	--disable-neon
 NLS_USES=	gettext-runtime
@@ -85,22 +82,15 @@ NLS_CONFIGURE_OFF=	--disable-nls
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=	notify
-NOTIFY_IMPLIES=	GTK2
 OPENGL_USE=	xorg=x11 gl=gl
 OPENGL_CONFIGURE_ENABLE=	glspectrum
-OPENGL_IMPLIES=	GTK2
 OSS_CONFIGURE_ENABLE=	oss4
 PULSEAUDIO_LIB_DEPENDS=	libpulse-mainloop-glib.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
-PULSEAUDIO_IMPLIES=	DBUS
-QT5_USE=	qt5=multimedia,opengl
-QT5_CONFIGURE_ENABLE=	qt
-QT5_CONFIGURE_OFF=	--disable-qtaudio
 SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_OFF=	--disable-resample
 SCROBBLER_LIB_DEPENDS=	libcurl.so:ftp/curl
 SCROBBLER_CONFIGURE_OFF=	--disable-scrobbler2
-SCROBBLER_IMPLIES=	GTK2
 SDL_LIB_DEPENDS=	libSDL2.so:devel/sdl20
 SDL_CONFIGURE_ON=	--enable-sdlout --with-libsdl=2
 SDL_CONFIGURE_OFF=	--disable-sdlout
@@ -110,7 +100,8 @@ SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_OFF=	--disable-sndfile
 SPEEDPITCH_CONFIGURE_OFF=	--disable-speedpitch
 SPEEDPITCH_IMPLIES=	SAMPLERATE
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+	libogg.so:audio/libogg
 VORBIS_CONFIGURE_ENABLE=	vorbis
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_OFF=	--disable-wavpack
@@ -118,7 +109,6 @@ OPTIONS_SUB=	yes
 
 AMIDI_DESC=	Amidi decoder
 AOSD_DESC=	Audacious OSD
-AOSDXCOMP_DESC=	Audacious OSD X Composite
 BS2B_DESC=	BS2B effect
 SCROBBLER_DESC=	Scrobbler decoder
 SID_DESC=	Sound chip emulator of Commodore
@@ -126,6 +116,10 @@ NEON_DESC=	Neon plugin
 SPEEDPITCH_DESC=Speed and Pitch plugin
 MPRIS_DESC=	NPRIS plugin
 
+post-patch:
+	${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \
+		${WRKSRC}/buildsys.mk.in
+
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/audacious/ -name "*.so" \
 		-exec ${STRIP_CMD} {} \;
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 612d3d26c857..efbd2007dae9 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (audacious-plugins-3.7.2.tar.bz2) = fcf7488f01781c8f51e0af5cabacdd582b22537a0085f26aa5ca636373f8e1ff
-SIZE (audacious-plugins-3.7.2.tar.bz2) = 1839881
+TIMESTAMP = 1474527260
+SHA256 (audacious-plugins-3.8.tar.bz2) = 8179b80fffc893d4a2533fc7b7c4800981bc9ab3c6d1742a4c832fd6176ca24a
+SIZE (audacious-plugins-3.8.tar.bz2) = 1812251
diff --git a/multimedia/audacious-plugins/files/patch-buildsys.mk.in b/multimedia/audacious-plugins/files/patch-buildsys.mk.in
new file mode 100644
index 000000000000..8aa7e48c80b8
--- /dev/null
+++ b/multimedia/audacious-plugins/files/patch-buildsys.mk.in
@@ -0,0 +1,11 @@
+--- buildsys.mk.in.orig	2016-09-22 01:16:40 UTC
++++ buildsys.mk.in
+@@ -205,7 +205,7 @@ pre-depend:
+ 
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ 	${LINK_STATUS}
+-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
++	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
+ 		${LINK_OK}; \
+ 	else \
+ 		${LINK_FAILED}; \
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index af0325060817..a07a6e69340a 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -10,39 +10,31 @@ lib/audacious/Effect/compressor.so
 lib/audacious/Effect/crossfade.so
 lib/audacious/Effect/crystalizer.so
 lib/audacious/Effect/echo.so
-%%GTK2%%lib/audacious/Effect/ladspa.so
+lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
 %%SAMPLERATE%%lib/audacious/Effect/resample.so
 lib/audacious/Effect/silence-removal.so
 %%SPEEDPITCH%%lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
-%%GTK2%%lib/audacious/General/alarm.so
-%%GTK2%%lib/audacious/General/albumart.so
-%%QT5%%lib/audacious/General/albumart-qt.so
+lib/audacious/General/alarm.so
+lib/audacious/General/albumart.so
 %%AOSD%%lib/audacious/General/aosd.so
 %%CDDA%%lib/audacious/General/cd-menu-items.so
-%%GTK2%%lib/audacious/General/delete-files.so
-%%DBUS%%lib/audacious/General/gnomeshortcuts.so
-%%GTK2%%lib/audacious/General/gtkui.so
-%%GTK2%%lib/audacious/General/hotkey.so
+lib/audacious/General/delete-files.so
+lib/audacious/General/gnomeshortcuts.so
+lib/audacious/General/gtkui.so
+lib/audacious/General/hotkey.so
 %%LIRC%%lib/audacious/General/lirc.so
-%%GTK2%%lib/audacious/General/lyricwiki.so
-%%QT5%%lib/audacious/General/lyricwiki-qt.so
+lib/audacious/General/lyricwiki.so
 %%MPRIS%%lib/audacious/General/mpris2.so
 %%NOTIFY%%lib/audacious/General/notify.so
-%%GTK2%%lib/audacious/General/playlist-manager.so
-%%QT5%%lib/audacious/General/playlist-manager-qt.so
-%%QT5%%lib/audacious/General/qtui.so
+lib/audacious/General/playlist-manager.so
 %%SCROBBLER%%lib/audacious/General/scrobbler.so
-%%GTK2%%lib/audacious/General/search-tool.so
-%%QT5%%lib/audacious/General/search-tool-qt.so
-%%GTK2%%lib/audacious/General/skins.so
-%%QT5%%lib/audacious/General/skins-qt.so
+lib/audacious/General/search-tool.so
+lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
-%%QT5%%lib/audacious/General/song-info-qt.so
-%%GTK2%%lib/audacious/General/statusicon.so
-%%QT5%%lib/audacious/General/statusicon-qt.so
+lib/audacious/General/statusicon.so
 %%AAC%%lib/audacious/Input/aac-raw.so
 lib/audacious/Input/adplug.so
 %%AMIDI%%lib/audacious/Input/amidi-plug.so
@@ -61,19 +53,17 @@ lib/audacious/Input/vtx.so
 %%WAVPACK%%lib/audacious/Input/wavpack.so
 lib/audacious/Input/xsf.so
 %%ALSA%%lib/audacious/Output/alsa.so
-%%GTK2%%lib/audacious/Output/filewriter.so
+lib/audacious/Output/filewriter.so
 %%JACK%%lib/audacious/Output/jack-ng.so
 %%OSS%%lib/audacious/Output/oss4.so
 %%PULSEAUDIO%%lib/audacious/Output/pulse_audio.so
-%%QT5%%lib/audacious/Output/qtaudio.so
 %%SDL%%lib/audacious/Output/sdlout.so
 lib/audacious/Transport/gio.so
 %%MMS%%lib/audacious/Transport/mms.so
 %%NEON%%lib/audacious/Transport/neon.so
-%%GTK2%%lib/audacious/Visualization/blur_scope.so
-%%GTK2%%lib/audacious/Visualization/cairo-spectrum.so
+lib/audacious/Visualization/blur_scope.so
+lib/audacious/Visualization/cairo-spectrum.so
 %%OPENGL%%lib/audacious/Visualization/gl-spectrum.so
-%%QT5%%lib/audacious/Visualization/gl-spectrum-qt.so
 share/audacious/Skins/Classic/balance.png
 share/audacious/Skins/Classic/cbuttons.png
 share/audacious/Skins/Classic/eq_ex.png