8 files changed, 214 insertions, 437 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 72828ca52921..e64fc0c5e30e 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.6.2
-PORTREVISION=	1
+PORTVERSION=	3.7
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
-MAINTAINER=	oliver@FreeBSD.org
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Plugins needed for audacious
 
 LICENSE=	GPLv3
@@ -15,346 +14,116 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig tar:bzip2 compiler:c++11-lib
+USES=		compiler:c++11-lib gettext-tools gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
-USE_GNOME=	glib20
+USE_GNOME=	glib20 libxml2
+
+CONFIGURE_ARGS+=--disable-console --disable-sndio --disable-soxr
+
+OPTIONS_MULTI=	TOOLKITS
+OPTIONS_MULTI_TOOLKITS=	GTK2 QT5
+OPTIONS_DEFINE=	AAC ALSA AMIDI AOSD AOSDXCOMP BS2B CDDA CUE DBUS 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 DBUS FFMPEG FLAC GTK2 MP3 \
+		MMS NEON NLS NOTIFY OSS SCROBBLER VORBIS WAVPACK
+
+AAC_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+AAC_CONFIGURE_OFF=	--disable-aac
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CONFIGURE_OFF=	--disable-alsa
+AMIDI_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
+AMIDI_CONFIGURE_OFF=	--disable-amidiplug
+AOSD_USE=	gnome=pango
+AOSD_CONFIGURE_ENABLE=	aosd
+AOSD_IMPLIES=	GTK2
+AOSDXCOMP_LIB_DEPENDS=	libXcomposite.so:${PORTSDIR}/x11/libXcomposite
+AOSDXCOMP_CONFIGURE_ENABLE=	aosd-xcomp
+AOSDXCOMP_IMPLIES=	AOSD
+BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CONFIGURE_OFF=	--disable-bs2b
+CDDA_LIB_DEPENDS=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
+	libcddb.so:${PORTSDIR}/audio/libcddb
+CDDA_CONFIGURE_OFF=	--disable-cdaudio
+CUE_LIB_DEPENDS=	libcue.so:${PORTSDIR}/textproc/libcue
+CUE_CONFIGURE_OFF=	--disable-cue
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+DBUS_CONFIGURE_ENABLE=	gnomeshortcuts
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CONFIGURE_WITH=	ffmpeg=ffmpeg
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/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
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
+	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+JACK_CONFIGURE_OFF=	--disable-jack
+LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_CONFIGURE_OFF=	--disable-filewriter_mp3
+LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
+LIRC_CONFIGURE_OFF=	--disable-lirc
+MP3_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MP3_CONFIGURE_OFF=	--disable-mp3
+MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_CONFIGURE_OFF=	--disable-mms
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_OFF=	--disable-modplug
+MPRIS_CONFIGURE_ENABLE=	mpris2
+MPRIS_IMPLIES=	DBUS
+NEON_LIB_DEPENDS=	libneon.so:${PORTSDIR}/www/neon
+NEON_CONFIGURE_OFF=	--disable-neon
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
+NOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/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:${PORTSDIR}/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:${PORTSDIR}/audio/libsamplerate
+SAMPLERATE_CONFIGURE_OFF=	--disable-resample
+SCROBBLER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+SCROBBLER_CONFIGURE_OFF=	--disable-scrobbler2
+SCROBBLER_IMPLIES=	GTK2
+SDL_LIB_DEPENDS=	libSDL2.so:${PORTSDIR}/devel/sdl20
+SDL_CONFIGURE_ON=	--enable-sdlout --with-libsdl=2
+SDL_CONFIGURE_OFF=	--disable-sdlout
+SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
+SID_CONFIGURE_OFF=	--disable-sid
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CONFIGURE_OFF=	--disable-sndfile
+SPEEDPITCH_CONFIGURE_OFF=	--disable-speedpitch
+SPEEDPITCH_IMPLIES=	SAMPLERATE
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_ENABLE=	vorbis
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_OFF=	--disable-wavpack
+OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \
-		ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \
-		CDAUDIO SCROBBLER MMS NLS RESAMPLE AMIDI GLSPECTRUM \
-		NOTIFY BS2B FFAUDIO PULSE NEON SPEEDPITCH LIRC MP3FILEWRITER \
-		SID MPRIS
-OPTIONS_DEFAULT=DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \
-		SCROBBLER NEON NLS OSS4 FFAUDIO
-
-ADPLUG_DESC=	ADPLUG decoder
 AMIDI_DESC=	Amidi decoder
 AOSD_DESC=	Audacious OSD
 AOSDXCOMP_DESC=	Audacious OSD X Composite
 BS2B_DESC=	BS2B effect
-CDAUDIO_DESC=	CD audio input
-FFAUDIO_DESC=	FFAudio decoder
-GLSPECTRUM_DESC=OpenGL Spectrum Analyzer
-OSS4_DESC=	Open Sound System 4
-PULSE_DESC=	PulseAudio support
-RESAMPLE_DESC=	Resample effect
 SCROBBLER_DESC=	Scrobbler decoder
-SDLOUT_DESC=	SDL Output
-SID_DESC=	SID decoder
-STATUSICON_DESC=X11 Status icon
+SID_DESC=	Sound chip emulator of Commodore
 NEON_DESC=	Neon plugin
 SPEEDPITCH_DESC=Speed and Pitch plugin
-LIRC_DESC=	LIRC plugin
-MP3FILEWRITER=	Filewriter plugin for MP3
 MPRIS_DESC=	NPRIS plugin
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSDLOUT}
-PLIST_SUB+=	SDL=""
-USE_SDL=	sdl
-CONFIGURE_ARGS+=--enable-sdlout
-.else
-PLIST_SUB+=	SDL="@comment "
-CONFIGURE_ARGS+=--disable-sdlout
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY} || exists(${LOCALBASE}/lib/libnotify.so)
-LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-notify
-PLIST_SUB+=	NOTIFY=""
-.else
-PLIST_SUB+=	NOTIFY="@comment "
-CONFIGURE_ARGS+=--disable-notify
-.endif
-
-.if ${PORT_OPTIONS:MGLSPECTRUM}
-USE_GL=		gl
-CONFIGURE_ARGS+=--enable-glspectrum
-PLIST_SUB+=	GLSPECTRUM=""
-.else
-CONFIGURE_ARGS+=--disable-glspectrum
-PLIST_SUB+=	GLSPECTRUM="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-gnomeshortcuts
-PLIST_SUB+=	DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-gnomeshortcuts
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCUE}
-LIB_DEPENDS+=	libcue.so:${PORTSDIR}/textproc/libcue
-CONFIGURE_ARGS+=--enable-cue
-PLIST_SUB+=	CUEPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-cue
-PLIST_SUB+=	CUEPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMP3}
-LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
-CONFIGURE_ARGS+=--enable-mp3 --enable-filewriter_mp3
-PLIST_SUB+=	MP3PLUGIN=""
-.if ${PORT_OPTIONS:MMP3FILEWRITER}
-LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
-CONFIGURE_ARGS+=--enable-filewriter_mp3
-.else
-CONFIGURE_ARGS+=--disable-filewriter_mp3
-.endif
-.else
-CONFIGURE_ARGS+=--disable-mp3 --disable-filewriter_mp3
-PLIST_SUB+=	MP3PLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSTATUSICON}
-USE_GNOME+=	gtk30
-CONFIGURE_ARGS+=--enable-statusicon
-PLIST_SUB+=	STATUSICONPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-statusicon
-PLIST_SUB+=	STATUSICONPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAOSD}
-USE_GNOME+=	pango
-CONFIGURE_ARGS+=--enable-aosd
-PLIST_SUB+=	AOSDPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-aosd
-PLIST_SUB+=	AOSDPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAOSDXCOMP}
-LIB_DEPENDS+=	libXcomposite.so:${PORTSDIR}/x11/libXcomposite
-CONFIGURE_ARGS+=--enable-aosd-xcomp
-PLIST_SUB+=	AOSDXCOMPPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-aosd-xcomp
-PLIST_SUB+=	AOSDXCOMPPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MADPLUG}
-LIB_DEPENDS+=	libbinio.so:${PORTSDIR}/devel/libbinio
-CONFIGURE_ARGS+=--enable-adplug
-PLIST_SUB+=	ADPLUGPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-adplug
-PLIST_SUB+=	ADPLUGPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-vorbis
-PLIST_SUB+=	VORBISPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
-CONFIGURE_ARGS+=--enable-flacng --enable-filewriter_flac
-PLIST_SUB+=	FLACPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-flacng --disable-filewriter_flac
-PLIST_SUB+=	FLACPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFAUDIO}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=--with-ffmpeg=ffmpeg
-PLIST_SUB+=	FFAUDIOPLUGIN=""
-.else
-CONFIGURE_ARGS+=--with-ffmpeg=none
-PLIST_SUB+=	FFAUDIOPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MWAVPACK}
-LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
-CONFIGURE_ARGS+=--enable-wavpack
-PLIST_SUB+=	WAVPACKPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-wavpack
-PLIST_SUB+=	WAVPACKPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAAC}
-CONFIGURE_ARGS+=--enable-aac
-PLIST_SUB+=	AACPLUGIN=""
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-.else
-CONFIGURE_ARGS+=--disable-aac
-PLIST_SUB+=	AACPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-CONFIGURE_ARGS+=--enable-sndfile
-PLIST_SUB+=	SNDFILEPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-sndfile
-PLIST_SUB+=	SNDFILEPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
-PLIST_SUB+=	MODPLUG=""
-CONFIGURE_ARGS+=--enable-modplug
-.else
-PLIST_SUB+=	MODPLUG="@comment "
-CONFIGURE_ARGS+=--disable-modplug
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
-		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=--enable-jack
-PLIST_SUB+=	JACKPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-jack
-PLIST_SUB+=	JACKPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSCROBBLER}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-PLIST_SUB+=	SCROBBLERPLUGIN=""
-CONFIGURE_ARGS+=--enable-scrobbler2
-.else
-PLIST_SUB+=	SCROBBLERPLUGIN="@comment "
-CONFIGURE_ARGS+=--disable-scrobbler2
-.endif
-
-.if ${PORT_OPTIONS:MOSS4}
-PLIST_SUB+=	OSS4PLUGIN=""
-CONFIGURE_ARGS+=--enable-oss4
-.else
-PLIST_SUB+=	OSS4PLUGIN="@comment "
-CONFIGURE_ARGS+=--disable-oss4
-.endif
-
-.if ${PORT_OPTIONS:MSID}
-LIB_DEPENDS+=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
-PLIST_SUB+=	SIDPLUGIN=""
-CONFIGURE_ARGS+=--enable-sid
-.else
-PLIST_SUB+=	SIDPLUGIN="@comment "
-CONFIGURE_ARGS+=--disable-sid
-.endif
-
-.if ${PORT_OPTIONS:MCDAUDIO}
-LIB_DEPENDS+=	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia \
-		libcddb.so:${PORTSDIR}/audio/libcddb
-CONFIGURE_ARGS+=--enable-cdaudio
-PLIST_SUB+=	CDAUDIOPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-cdaudio
-PLIST_SUB+=	CDAUDIOPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon
-CONFIGURE_ARGS+=--enable-neon
-PLIST_SUB+=	NEONPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-neon
-PLIST_SUB+=	NEONPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMMS}
-LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
-CONFIGURE_ARGS+=--enable-mms
-PLIST_SUB+=	MMSPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-mms
-PLIST_SUB+=	MMSPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRESAMPLE}
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=--enable-resample
-PLIST_SUB+=	RESAMPLEPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-resample
-PLIST_SUB+=	RESAMPLEPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSPEEDPITCH}
-LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
-CONFIGURE_ARGS+=--enable-speedpitch
-PLIST_SUB+=	SPEEDPITCHPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-speedpitch
-PLIST_SUB+=	SPEEDPITCHPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-CONFIGURE_ARGS+=--enable-alsa
-PLIST_SUB+=	ALSAPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-alsa
-PLIST_SUB+=	ALSAPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MAMIDI}
-LIB_DEPENDS+=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
-CONFIGURE_ARGS+=--enable-amidiplug
-PLIST_SUB+=	AMIDIPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-amidiplug
-PLIST_SUB+=	AMIDIPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MBS2B}
-LIB_DEPENDS+=	libbs2b.so:${PORTSDIR}/audio/libbs2b
-CONFIGURE_ARGS+=--enable-bs2b
-PLIST_SUB+=	BS2BPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-bs2b
-PLIST_SUB+=	BS2BPLUGIN="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPULSE}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-CONFIGURE_ARGS+=--enable-pulse
-PLIST_SUB+=	PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulse
-PLIST_SUB+=	PULSE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLIRC}
-LIB_DEPENDS+=	liblirc_client.so:${PORTSDIR}/comms/lirc
-CONFIGURE_ARGS+=--enable-lirc
-PLIST_SUB+=	LIRC=""
-.else
-CONFIGURE_ARGS+=--disable-lirc
-PLIST_SUB+=	LIRC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMPRIS}
-CONFIGURE_ARGS+=--enable-mpris2
-PLIST_SUB+=	MPRIS=""
-.else
-CONFIGURE_ARGS+=--disable-mpris2
-PLIST_SUB+=	MPRIS="@comment "
-.endif
-
 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 f842bb410bb6..fc80e85e2b89 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.6.2.tar.bz2) = e7798936249e1601177503d148a3dd59edd289579f3f1667351eb0ba463642e8
-SIZE (audacious-plugins-3.6.2.tar.bz2) = 1786338
+SHA256 (audacious-plugins-3.7.tar.bz2) = 3856e9f7261cbb27b5e15246ee3959189ab950389ef02aaec27d645a0a516c2c
+SIZE (audacious-plugins-3.7.tar.bz2) = 1834606
diff --git a/multimedia/audacious-plugins/files/extra-patch-Makefile b/multimedia/audacious-plugins/files/extra-patch-Makefile
new file mode 100644
index 000000000000..394926882882
--- /dev/null
+++ b/multimedia/audacious-plugins/files/extra-patch-Makefile
@@ -0,0 +1,8 @@
+--- Makefile.orig	2015-11-07 23:04:08 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS = src po
++SUBDIRS = src
+ 
+ DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk
+ 
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 94b7ba55cb23..af0325060817 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,70 +1,79 @@
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
-%%CUEPLUGIN%%lib/audacious/Container/cue.so
+%%CUE%%lib/audacious/Container/cue.so
 lib/audacious/Container/m3u.so
 lib/audacious/Container/pls.so
 lib/audacious/Container/xspf.so
-%%BS2BPLUGIN%%lib/audacious/Effect/bs2b.so
+%%BS2B%%lib/audacious/Effect/bs2b.so
 lib/audacious/Effect/compressor.so
 lib/audacious/Effect/crossfade.so
 lib/audacious/Effect/crystalizer.so
 lib/audacious/Effect/echo.so
-lib/audacious/Effect/ladspa.so
+%%GTK2%%lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
-%%RESAMPLEPLUGIN%%lib/audacious/Effect/resample.so
+%%SAMPLERATE%%lib/audacious/Effect/resample.so
 lib/audacious/Effect/silence-removal.so
-%%SPEEDPITCHPLUGIN%%lib/audacious/Effect/speed-pitch.so
+%%SPEEDPITCH%%lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
-lib/audacious/General/alarm.so
-lib/audacious/General/albumart.so
-%%AOSDPLUGIN%%lib/audacious/General/aosd.so
-%%CDAUDIOPLUGIN%%lib/audacious/General/cd-menu-items.so
-lib/audacious/General/delete-files.so
+%%GTK2%%lib/audacious/General/alarm.so
+%%GTK2%%lib/audacious/General/albumart.so
+%%QT5%%lib/audacious/General/albumart-qt.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
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.so
+%%GTK2%%lib/audacious/General/gtkui.so
+%%GTK2%%lib/audacious/General/hotkey.so
 %%LIRC%%lib/audacious/General/lirc.so
-lib/audacious/General/lyricwiki.so
+%%GTK2%%lib/audacious/General/lyricwiki.so
+%%QT5%%lib/audacious/General/lyricwiki-qt.so
 %%MPRIS%%lib/audacious/General/mpris2.so
 %%NOTIFY%%lib/audacious/General/notify.so
-lib/audacious/General/playlist-manager.so
-%%SCROBBLERPLUGIN%%lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins.so
+%%GTK2%%lib/audacious/General/playlist-manager.so
+%%QT5%%lib/audacious/General/playlist-manager-qt.so
+%%QT5%%lib/audacious/General/qtui.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/song_change.so
-%%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
-%%AACPLUGIN%%lib/audacious/Input/aac-raw.so
-%%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
-%%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
-%%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
-lib/audacious/Input/console.so
-%%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so
-%%FLACPLUGIN%%lib/audacious/Input/flacng.so
-%%MP3PLUGIN%%lib/audacious/Input/madplug.so
+%%QT5%%lib/audacious/General/song-info-qt.so
+%%GTK2%%lib/audacious/General/statusicon.so
+%%QT5%%lib/audacious/General/statusicon-qt.so
+%%AAC%%lib/audacious/Input/aac-raw.so
+lib/audacious/Input/adplug.so
+%%AMIDI%%lib/audacious/Input/amidi-plug.so
+%%CDDA%%lib/audacious/Input/cdaudio-ng.so
+%%FFMPEG%%lib/audacious/Input/ffaudio.so
+%%FLAC%%lib/audacious/Input/flacng.so
+%%MP3%%lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
 %%MODPLUG%%lib/audacious/Input/modplug.so
 lib/audacious/Input/psf2.so
-%%SIDPLUGIN%%lib/audacious/Input/sid.so
-%%SNDFILEPLUGIN%%lib/audacious/Input/sndfile.so
+%%SID%%lib/audacious/Input/sid.so
+%%SNDFILE%%lib/audacious/Input/sndfile.so
 lib/audacious/Input/tonegen.so
-%%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
+%%VORBIS%%lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
+%%WAVPACK%%lib/audacious/Input/wavpack.so
 lib/audacious/Input/xsf.so
-%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
-%%ALSAPLUGIN%%lib/audacious/Output/alsa.so
-lib/audacious/Output/filewriter.so
-%%JACKPLUGIN%%lib/audacious/Output/jack-ng.so
-%%OSS4PLUGIN%%lib/audacious/Output/oss4.so
-%%PULSE%%lib/audacious/Output/pulse_audio.so
+%%ALSA%%lib/audacious/Output/alsa.so
+%%GTK2%%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
-%%MMSPLUGIN%%lib/audacious/Transport/mms.so
-%%NEONPLUGIN%%lib/audacious/Transport/neon.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-%%GLSPECTRUM%%lib/audacious/Visualization/gl-spectrum.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
+%%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
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index de270dc9f542..79252c84361e 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -2,82 +2,57 @@
 # $FreeBSD$
 
 PORTNAME=	audacious
-PORTVERSION=	3.6.2
+PORTVERSION=	3.7
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
-MAINTAINER=	oliver@FreeBSD.org
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Media player based on BMP and XMMS
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libmcs.so:${PORTSDIR}/devel/libmcs \
-		libmowgli.so:${PORTSDIR}/devel/libmowgli
-
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake tar:bzip2 desktop-file-utils gettext-tools compiler:c++11-lib
+USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
+	pkgconfig tar:bzip2
 USE_XORG=	x11 sm
-USE_GNOME=	gtk30 libxml2
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--disable-chardet --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-
-OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO SSE2
-OPTIONS_DEFAULT=DBUS ICONV NLS EXECINFO SSE2
+INSTALLS_ICONS=	yes
+
+CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
+OPTIONS_MULTI=	TOOLKITS
+OPTIONS_MULTI_TOOLKITS=	GTK2 QT5
+OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO
+OPTIONS_DEFAULT=DBUS GTK2 ICONV NLS EXECINFO
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+ICONV_USES=	iconv
+GTK2_USE=	gnome=gtk20
+GTK2_IMPLIES=	DBUS
+GTK2_CONFIGURE_ENABLE=	gtk
+QT5_USE=	qt5=core,gui,widgets
+QT5_CONFIGURE_ENABLE=	qt
+QT5_IMPLIES=	DBUS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
+EXECINFO_USES=	execinfo
+OPTIONS_SUB=	yes
 EXECINFO_DESC=	Build with libexecinfo support
-SSE2_DESC=	Build with SSE2 instruction set
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+=	WITH_DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	WITH_DBUS="@comment "
-.endif
-
-.if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
-LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-.endif
-
-.if  ${PORT_OPTIONS:MICONV} || exists(${LOCALBASE}/lib/libiconv.so)
-USES+=		iconv
-.endif
-
-.if  ${PORT_OPTIONS:MNLS}
-USES+=		gettext-runtime
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if  empty(PORT_OPTIONS:MSSE2)
-CONFIGURE_ARGS+=--disable-sse2
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile
 .if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
-	@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
+	@${REINPLACE_CMD} 's|-lm |-lm -L${LOCALBASE}/lib -lexecinfo |' \
 		${WRKSRC}/src/audacious/Makefile
 	@${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \
 		${WRKSRC}/audacious.pc.in
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audacious
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.3.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.3.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.2.0.0
-.if ${PORT_OPTIONS:MDBUS}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audtool
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*
 
 .include <bsd.port.mk>
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 8a19dabdee97..8fada7c9ab22 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.6.2.tar.bz2) = b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
-SIZE (audacious-3.6.2.tar.bz2) = 539843
+SHA256 (audacious-3.7.tar.bz2) = 4e5a74394c85b1135fc5a89dcc3a03601cddc53af060f587e489352d1fc9cf67
+SIZE (audacious-3.7.tar.bz2) = 570484
diff --git a/multimedia/audacious/files/extra-patch-Makefile b/multimedia/audacious/files/extra-patch-Makefile
new file mode 100644
index 000000000000..256612067781
--- /dev/null
+++ b/multimedia/audacious/files/extra-patch-Makefile
@@ -0,0 +1,8 @@
+--- Makefile.orig	2015-11-08 04:44:35 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS = src man images po
++SUBDIRS = src man images
+ 
+ DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk
+ 
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 5c99046497f8..0332cc149369 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,5 +1,5 @@
 bin/audacious
-%%WITH_DBUS%%bin/audtool
+%%DBUS%%bin/audtool
 include/audacious/audtag.h
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
@@ -27,19 +27,27 @@ include/libaudcore/tuple.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_async.h
 include/libaudcore/visualizer.h
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
+%%GTK2%%include/libaudgui/libaudgui-gtk.h
+%%GTK2%%include/libaudgui/libaudgui.h
+%%GTK2%%include/libaudgui/list.h
+%%GTK2%%include/libaudgui/menu.h
+%%QT5%%include/libaudqt/iface.h
+%%QT5%%include/libaudqt/info-widget.h
+%%QT5%%include/libaudqt/libaudqt.h
+%%QT5%%include/libaudqt/menu.h
+%%QT5%%include/libaudqt/volumebutton.h
 lib/libaudcore.so
 lib/libaudcore.so.3
-lib/libaudcore.so.3.0.0
-lib/libaudgui.so
-lib/libaudgui.so.3
-lib/libaudgui.so.3.0.0
+lib/libaudcore.so.3.1.0
+%%GTK2%%lib/libaudgui.so
+%%GTK2%%lib/libaudgui.so.3
+%%GTK2%%lib/libaudgui.so.3.1.0
+%%QT5%%lib/libaudqt.so
+%%QT5%%lib/libaudqt.so.0
+%%QT5%%lib/libaudqt.so.0.1.0
 lib/libaudtag.so
 lib/libaudtag.so.2
-lib/libaudtag.so.2.0.0
+lib/libaudtag.so.2.1.0
 libdata/pkgconfig/audacious.pc
 man/man1/audacious.1.gz
 man/man1/audtool.1.gz