audacious: Update to 3.10.0

Upstream decided to drop GTK3 support.
GTK3 was previously the default UI in pkgsrc.

I've changed the deafult to Qt5 to retain HiDPI support.
GTK2 is also available for those who want it.

New plugins: sox-resampler, silence-removal, ffaudio (used for formats
not handled by other plugins like opus), alsa

12 files changed, 299 insertions, 173 deletions

diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 019a152041f..e24981bb473 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2019/07/05 15:21:18 nia Exp $
+# $NetBSD: Makefile,v 1.93 2019/07/06 13:17:01 nia Exp $
 
-DISTNAME=	audacious-plugins-3.5.2
-PKGREVISION=	29
+DISTNAME=	audacious-plugins-3.10.1
 CATEGORIES=	audio
-MASTER_SITES=	http://distfiles.audacious-media-player.org/
+MASTER_SITES=	https://distfiles.audacious-media-player.org/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -11,70 +10,55 @@ HOMEPAGE=	https://audacious-media-player.org/
 COMMENT=	Plugins for Audacious media player
 LICENSE=	2-clause-bsd
 
-TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake intltool pkg-config
-USE_TOOLS+=		msgfmt msgmerge xgettext
-GNU_CONFIGURE=		yes
-#CONFIGURE_ARGS+=	--disable-aac
-CONFIGURE_ARGS+=	--disable-amidiplug
-#CONFIGURE_ARGS+=	--disable-coreaudio
-CONFIGURE_ARGS+=	--disable-gnomeshortcuts
-CONFIGURE_ARGS+=	--disable-modplug
-CONFIGURE_ARGS+=	--with-ffmpeg=none
-
-.include "../../mk/compiler.mk"
-.if empty(PKGSRC_COMPILER:Mclang)
-# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least.
-# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++.
-# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 :
-# Systems with Clang are supposed to be new enough to have a correctly linked
-# libstdc++.
-LDFLAGS.NetBSD+=	-lgcc_s
-.endif
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake intltool pkg-config
+USE_TOOLS+=	msgfmt msgmerge xgettext
+GNU_CONFIGURE=	yes
 
-# From audio/bmp/Makefile:
-# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
-# any open plugin.  libstdc++ gets dynamically linked in when the id3lib
-# library is loaded, and is the one causing problems.  See PR pkg/26846
-# for more information.
-LDFLAGS.NetBSD+=	-lstdc++ -lm
+CONFIGURE_ARGS+=	--disable-ampache
+CONFIGURE_ARGS+=	--disable-bs2b
+CONFIGURE_ARGS+=	--disable-cue
+CONFIGURE_ARGS+=	--disable-notify
+# use SDL instead, it has working volume control
+CONFIGURE_ARGS+=	--disable-oss4
+CONFIGURE_ARGS+=	--disable-qtaudio
+CONFIGURE_ARGS+=	--disable-sndio
 
-# cdaudio plugin complains about missing OSS at runtime
-LDFLAGS+=		${LIBOSSAUDIO}
+PLIST_VARS+=	dbus gtk qt
 
-# do not use pkgsrc' flac if it is installed
-CFLAGS+=	-I. -I../flacng -Ilibflacng
-
-.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
-
-PLIST_VARS+=	oss4
-
-.if ${OPSYS} == "NetBSD"
-RAWPART_cmd=		/sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
-.elif ${OPSYS} == "SunOS"
-CPPFLAGS.SunOS=	-D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
-CONFIGURE_ARGS+=	--enable-oss4
-PLIST.oss4=	yes
-.endif
-
 .include "../../audio/audacious/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus)
+TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+PLIST.dbus=		yes
+.else
+CONFIGURE_ARGS+=	--disable-mpris2
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5)
+PLIST.qt=		yes
+CONFIGURE_ARGS+=	--enable-qt
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2)
+PLIST.gtk=		yes
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libsoxr/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/wavpack/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/libbinio/buildlink3.mk"
 .include "../../misc/libcdio-paranoia/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/libmms/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacious-plugins/PLIST b/audio/audacious-plugins/PLIST
index f3aa36ba507..d8ccabc6404 100644
--- a/audio/audacious-plugins/PLIST
+++ b/audio/audacious-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2018/07/31 14:01:40 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/07/06 13:17:01 nia Exp $
 lib/audacious/Container/asx.so
 lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
@@ -9,34 +9,47 @@ 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
+${PLIST.gtk}lib/audacious/Effect/ladspa.so
 lib/audacious/Effect/mixer.so
 lib/audacious/Effect/resample.so
+lib/audacious/Effect/silence-removal.so
+lib/audacious/Effect/sox-resampler.so
 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
-lib/audacious/General/aosd.so
+${PLIST.gtk}lib/audacious/General/alarm.so
+${PLIST.qt}lib/audacious/General/albumart-qt.so
+${PLIST.gtk}lib/audacious/General/albumart.so
+${PLIST.gtk}lib/audacious/General/aosd.so
 lib/audacious/General/cd-menu-items.so
 lib/audacious/General/delete-files.so
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.so
-lib/audacious/General/lyricwiki.so
-lib/audacious/General/mpris2.so
+${PLIST.gtk}lib/audacious/General/gtkui.so
+${PLIST.gtk}lib/audacious/General/hotkey.so
+${PLIST.qt}lib/audacious/General/lyricwiki-qt.so
+${PLIST.gtk}lib/audacious/General/lyricwiki.so
+${PLIST.dbus}lib/audacious/General/mpris2.so
+${PLIST.qt}lib/audacious/General/playlist-manager-qt.so
+${PLIST.gtk}lib/audacious/General/playlist-manager.so
+${PLIST.qt}lib/audacious/General/qtui.so
 lib/audacious/General/scrobbler.so
-lib/audacious/General/search-tool.so
-lib/audacious/General/skins.so
+${PLIST.qt}lib/audacious/General/search-tool-qt.so
+${PLIST.gtk}lib/audacious/General/search-tool.so
+${PLIST.qt}lib/audacious/General/skins-qt.so
+${PLIST.gtk}lib/audacious/General/skins.so
+${PLIST.qt}lib/audacious/General/song-info-qt.so
 lib/audacious/General/song_change.so
-lib/audacious/General/statusicon.so
+${PLIST.qt}lib/audacious/General/statusicon-qt.so
+${PLIST.gtk}lib/audacious/General/statusicon.so
 lib/audacious/Input/aac-raw.so
-lib/audacious/Input/aac.so
-lib/audacious/Input/adplug.so
+${PLIST.adplug}lib/audacious/Input/adplug.so
+${PLIST.fluidsynth}lib/audacious/Input/amidi-plug.so
 lib/audacious/Input/cdaudio-ng.so
-lib/audacious/Input/console.so
+${PLIST.libgme}lib/audacious/Input/console.so
+lib/audacious/Input/ffaudio.so
 lib/audacious/Input/flacng.so
 lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
+${PLIST.modplug}lib/audacious/Input/modplug.so
 lib/audacious/Input/psf2.so
 lib/audacious/Input/sndfile.so
 lib/audacious/Input/tonegen.so
@@ -44,17 +57,18 @@ lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
 lib/audacious/Input/wavpack.so
 lib/audacious/Input/xsf.so
+${PLIST.alsa}lib/audacious/Output/alsa.so
 lib/audacious/Output/filewriter.so
-${PLIST.jack}lib/audacious/Output/jackout.so
-${PLIST.oss4}lib/audacious/Output/oss4.so
+${PLIST.jack}lib/audacious/Output/jack-ng.so
 ${PLIST.pulse}lib/audacious/Output/pulse_audio.so
 lib/audacious/Output/sdlout.so
 lib/audacious/Transport/gio.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-lib/audacious/Visualization/gl-spectrum.so
+${PLIST.gtk}lib/audacious/Visualization/blur_scope.so
+${PLIST.gtk}lib/audacious/Visualization/cairo-spectrum.so
+${PLIST.qt}lib/audacious/Visualization/gl-spectrum-qt.so
+${PLIST.gtk}lib/audacious/Visualization/gl-spectrum.so
 share/audacious/Skins/Classic/balance.png
 share/audacious/Skins/Classic/cbuttons.png
 share/audacious/Skins/Classic/eq_ex.png
@@ -174,6 +188,7 @@ share/audacious/Skins/TinyPlayer/text.png
 share/audacious/Skins/TinyPlayer/titlebar.png
 share/audacious/Skins/TinyPlayer/viscolor.txt
 share/audacious/Skins/TinyPlayer/volume.png
+share/locale/ar/LC_MESSAGES/audacious-plugins.mo
 share/locale/be/LC_MESSAGES/audacious-plugins.mo
 share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 share/locale/ca/LC_MESSAGES/audacious-plugins.mo
diff --git a/audio/audacious-plugins/distinfo b/audio/audacious-plugins/distinfo
index 8fd0c99b756..3df43991614 100644
--- a/audio/audacious-plugins/distinfo
+++ b/audio/audacious-plugins/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:12:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2019/07/06 13:17:01 nia Exp $
 
-SHA1 (audacious-plugins-3.5.2.tar.bz2) = 470a9c009a92627fb824118762b156eb4604099f
-RMD160 (audacious-plugins-3.5.2.tar.bz2) = 2cf98e4fbf0e778672d509cd486274a8f7e4f10d
-SHA512 (audacious-plugins-3.5.2.tar.bz2) = eaf46f403a77b5de63f26e096b968a6d94bbe3917df4400e5791143d846c1f3cbf83f2937210055a9b493dfa56ddb36b12d6d57b1453708b23dd41c0e2a94a72
-Size (audacious-plugins-3.5.2.tar.bz2) = 1734588 bytes
+SHA1 (audacious-plugins-3.10.1.tar.bz2) = d2e549a402baa59b0181aabad6d7481369e8930e
+RMD160 (audacious-plugins-3.10.1.tar.bz2) = 96b7f2b0041508e8cea5f8188d9fb7b69b08f0a3
+SHA512 (audacious-plugins-3.10.1.tar.bz2) = 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
+Size (audacious-plugins-3.10.1.tar.bz2) = 1715477 bytes
diff --git a/audio/audacious-plugins/hacks.mk b/audio/audacious-plugins/hacks.mk
new file mode 100644
index 00000000000..0843b2fe834
--- /dev/null
+++ b/audio/audacious-plugins/hacks.mk
@@ -0,0 +1,29 @@
+# $NetBSD: hacks.mk,v 1.1 2019/07/06 13:17:01 nia Exp $
+
+.if !defined(AUDACIOUS_PLUGINS_HACKS_MK)
+AUDACIOUS_PLUGINS_HACKS_MK:=
+
+.include "../../mk/compiler.mk"
+
+.if empty(PKGSRC_COMPILER:Mclang)
+# This should avoid an error like: libstdc++.so.6: Undefined PLT symbol "_Unwind_GetIP" on NetBSD i386 and maybe amd64, with gcc4 at least.
+# This seems to happen when libstdc++ gets linked in with the plug-ins and the code is not compiled with g++.
+# For a similar problem see http://archive.netbsd.se/?ml=netbsd-java&a=2007-08&m=4912662 :
+# Systems with Clang are supposed to be new enough to have a correctly linked
+# libstdc++.
+LDFLAGS.NetBSD+=	-lgcc_s
+.endif
+
+# From audio/bmp/Makefile:
+# XXX Workaround a crash during shutdown that happens when dlclose(3)ing
+# any open plugin.  libstdc++ gets dynamically linked in when the id3lib
+# library is loaded, and is the one causing problems.  See PR pkg/26846
+# for more information.
+LDFLAGS.NetBSD+=	-lstdc++ -lm
+.endif
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CPPFLAGS.SunOS=		-D__EXTENSIONS__ -D__uint32_t=uint32_t -D__uint64_t=uint64_t
+.endif
diff --git a/audio/audacious-plugins/options.mk b/audio/audacious-plugins/options.mk
index 4661260718a..963cce94d13 100644
--- a/audio/audacious-plugins/options.mk
+++ b/audio/audacious-plugins/options.mk
@@ -1,17 +1,19 @@
-# $NetBSD: options.mk,v 1.9 2019/07/05 15:21:18 nia Exp $
+# $NetBSD: options.mk,v 1.10 2019/07/06 13:17:01 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious-plugins
-PKG_SUPPORTED_OPTIONS=	jack pulseaudio sid
-PKG_SUGGESTED_OPTIONS+=	pulseaudio jack
+PKG_OPTIONS_VAR=		PKG_OPTIONS.audacious-plugins
+PKG_SUPPORTED_OPTIONS+=		alsa jack pulseaudio lirc
+PKG_SUPPORTED_OPTIONS+=		adplug sidplay fluidsynth libgme modplug
+PKG_SUGGESTED_OPTIONS.Linux+=	alsa lirc
+PKG_OPTIONS_LEGACY_OPTS+=	sid:sidplay
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	sid
-.if !empty(PKG_OPTIONS:Msid)
-.  include "../../audio/libsidplay/buildlink3.mk"
-PLIST.sid=	yes
+PLIST_VARS+=	alsa
+.if !empty(PKG_OPTIONS:Malsa)
+.  include "../../audio/alsa-lib/buildlink3.mk"
+PLIST.alsa=	yes
 .else
-CONFIGURE_ARGS+=	--disable-sid
+CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
 PLIST_VARS+=	jack
@@ -29,3 +31,51 @@ PLIST.pulse=	yes
 .else
 CONFIGURE_ARGS+=	--disable-pulse
 .endif
+
+PLIST_VARS+=	lirc
+.if !empty(PKG_OPTIONS:Mlirc)
+.  include "../../comms/lirc/buildlink3.mk"
+PLIST.lirc=	yes
+.else
+CONFIGURE_ARGS+=	--disable-lirc
+.endif
+
+PLIST_VARS+=	adplug
+.if !empty(PKG_OPTIONS:Madplug)
+.  include "../../audio/adplug/buildlink3.mk"
+PLIST.adplug=	yes
+.else
+CONFIGURE_ARGS+=	--disable-adplug
+.endif
+
+PLIST_VARS+=	sid
+.if !empty(PKG_OPTIONS:Msidplay)
+.  include "../../audio/libsidplay/buildlink3.mk"
+PLIST.sid=	yes
+.else
+CONFIGURE_ARGS+=	--disable-sid
+.endif
+
+PLIST_VARS+=	fluidsynth
+.if !empty(PKG_OPTIONS:Mfluidsynth)
+.  include "../../audio/fluidsynth/buildlink3.mk"
+PLIST.fluidsynth=	yes
+.else
+CONFIGURE_ARGS+=	--disable-amidiplug
+.endif
+
+PLIST_VARS+=	libgme
+.if !empty(PKG_OPTIONS:Mlibgme)
+.  include "../../audio/game-music-emu/buildlink3.mk"
+PLIST.libgme=	yes
+.else
+CONFIGURE_ARGS+=	--disable-console
+.endif
+
+PLIST_VARS+=	modplug
+.if !empty(PKG_OPTIONS:Mmodplug)
+.  include "../../audio/libmodplug/buildlink3.mk"
+PLIST.modplug=	yes
+.else
+CONFIGURE_ARGS+=	--disable-modplug
+.endif
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index e5db376bee6..1b90ce90b8f 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2018/11/14 22:20:59 kleink Exp $
+# $NetBSD: Makefile,v 1.55 2019/07/06 13:17:00 nia Exp $
 
-DISTNAME=	audacious-3.5.2
-PKGREVISION=	10
+DISTNAME=	audacious-3.10.1
 CATEGORIES=	audio
-MASTER_SITES=	http://distfiles.audacious-media-player.org/
+MASTER_SITES=	https://distfiles.audacious-media-player.org/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,25 +11,18 @@ COMMENT=	Media player based on BMP and XMMS
 LICENSE=	2-clause-bsd
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		intltool msgfmt msgmerge xgettext
 GNU_CONFIGURE=		yes
-# requires libguess which is not available any more
-CONFIGURE_ARGS+=	--disable-chardet
 PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
-TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
 # XXX does not solve linking problem completely
 LDFLAGS.Darwin+=	-flat_namespace -undefined suppress
 
-.include "../../devel/atk/buildlink3.mk"
+.include "options.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/audacious/PLIST b/audio/audacious/PLIST
index 71761a45c72..e79eea065f9 100644
--- a/audio/audacious/PLIST
+++ b/audio/audacious/PLIST
@@ -1,68 +1,64 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/09 15:02:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/07/06 13:17:00 nia Exp $
 bin/audacious
-bin/audtool
-include/audacious/api-alias-begin.h
-include/audacious/api-alias-end.h
-include/audacious/api-define-begin.h
-include/audacious/api-define-end.h
-include/audacious/api.h
+${PLIST.dbus}bin/audtool
 include/audacious/audtag.h
-include/audacious/debug.h
-include/audacious/drct-api.h
-include/audacious/drct.h
-include/audacious/i18n.h
-include/audacious/input-api.h
-include/audacious/input.h
-include/audacious/misc-api.h
-include/audacious/misc.h
-include/audacious/playlist-api.h
-include/audacious/playlist.h
-include/audacious/plugin.h
-include/audacious/plugins-api.h
-include/audacious/plugins.h
-include/audacious/preferences.h
-include/audacious/types.h
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
-include/libaudcore/core.h
+include/libaudcore/drct.h
+include/libaudcore/equalizer.h
+include/libaudcore/export.h
 include/libaudcore/hook.h
+include/libaudcore/i18n.h
 include/libaudcore/index.h
 include/libaudcore/inifile.h
+include/libaudcore/interface.h
+include/libaudcore/list.h
+include/libaudcore/mainloop.h
 include/libaudcore/multihash.h
+include/libaudcore/objects.h
+include/libaudcore/playlist.h
+include/libaudcore/plugin.h
+include/libaudcore/plugins.h
+include/libaudcore/preferences.h
+include/libaudcore/probe.h
+include/libaudcore/ringbuf.h
+include/libaudcore/runtime.h
+include/libaudcore/templates.h
 include/libaudcore/tinylock.h
 include/libaudcore/tuple.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_async.h
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
+include/libaudcore/visualizer.h
+${PLIST.gtk}include/libaudgui/libaudgui-gtk.h
+${PLIST.gtk}include/libaudgui/libaudgui.h
+${PLIST.gtk}include/libaudgui/list.h
+${PLIST.gtk}include/libaudgui/menu.h
+${PLIST.qt}include/libaudqt/export.h
+${PLIST.qt}include/libaudqt/iface.h
+${PLIST.qt}include/libaudqt/info-widget.h
+${PLIST.qt}include/libaudqt/libaudqt.h
+${PLIST.qt}include/libaudqt/menu.h
 lib/libaudcore.so
-lib/libaudcore.so.2
-lib/libaudcore.so.2.0.0
-lib/libaudgui.so
-lib/libaudgui.so.2
-lib/libaudgui.so.2.0.0
+lib/libaudcore.so.5
+lib/libaudcore.so.5.1.0
+${PLIST.gtk}lib/libaudgui.so
+${PLIST.gtk}lib/libaudgui.so.5
+${PLIST.gtk}lib/libaudgui.so.5.0.0
+${PLIST.qt}lib/libaudqt.so
+${PLIST.qt}lib/libaudqt.so.2
+${PLIST.qt}lib/libaudqt.so.2.1.0
 lib/libaudtag.so
-lib/libaudtag.so.1
-lib/libaudtag.so.1.0.0
+lib/libaudtag.so.3
+lib/libaudtag.so.3.0.0
 lib/pkgconfig/audacious.pc
 man/man1/audacious.1
 man/man1/audtool.1
 share/applications/audacious.desktop
 share/audacious/AUTHORS
 share/audacious/COPYING
-share/audacious/images/about-logo.png
-share/audacious/images/album.png
-share/audacious/images/appearance.png
-share/audacious/images/audio.png
-share/audacious/images/connectivity.png
-share/audacious/images/info.png
-share/audacious/images/playlist.png
-share/audacious/images/plugins.png
 share/icons/hicolor/48x48/apps/audacious.png
 share/icons/hicolor/scalable/apps/audacious.svg
-share/locale/ast/LC_MESSAGES/audacious.mo
+share/locale/ar/LC_MESSAGES/audacious.mo
 share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
@@ -72,7 +68,6 @@ share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/en_GB/LC_MESSAGES/audacious.mo
-share/locale/eo/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
 share/locale/es_AR/LC_MESSAGES/audacious.mo
 share/locale/es_MX/LC_MESSAGES/audacious.mo
@@ -82,7 +77,6 @@ share/locale/fa_IR/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
 share/locale/gl/LC_MESSAGES/audacious.mo
-share/locale/he/LC_MESSAGES/audacious.mo
 share/locale/hu/LC_MESSAGES/audacious.mo
 share/locale/id_ID/LC_MESSAGES/audacious.mo
 share/locale/it/LC_MESSAGES/audacious.mo
@@ -101,14 +95,11 @@ share/locale/ro/LC_MESSAGES/audacious.mo
 share/locale/ru/LC_MESSAGES/audacious.mo
 share/locale/si/LC_MESSAGES/audacious.mo
 share/locale/sk/LC_MESSAGES/audacious.mo
-share/locale/sq/LC_MESSAGES/audacious.mo
 share/locale/sr/LC_MESSAGES/audacious.mo
-share/locale/sr@latin/LC_MESSAGES/audacious.mo
 share/locale/sr_RS/LC_MESSAGES/audacious.mo
 share/locale/sv/LC_MESSAGES/audacious.mo
 share/locale/ta/LC_MESSAGES/audacious.mo
 share/locale/tr/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
-share/locale/vi/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index 547ed86426b..5ecefc6cfee 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,22 +1,31 @@
-# $NetBSD: buildlink3.mk,v 1.39 2018/11/14 22:20:59 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2019/07/06 13:17:00 nia Exp $
 
 BUILDLINK_TREE+=	audacious
 
 .if !defined(AUDACIOUS_BUILDLINK3_MK)
 AUDACIOUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.5.1
-BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.5.2nb10
+BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.10.1
+BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.10.1
 BUILDLINK_PKGSRCDIR.audacious?=		../../audio/audacious
 
-.include "../../devel/atk/buildlink3.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+
+pkgbase := audacious
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mdbus)
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mgtk2)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.audacious:Mqt5)
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
 .endif # AUDACIOUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-audacious
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index 5eac4730a21..938b3ec0756 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2018/07/31 13:46:31 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2019/07/06 13:17:00 nia Exp $
 
-SHA1 (audacious-3.5.2.tar.bz2) = 1c92ddb079ec1b0109cd4bc65a1329db5eb8cb1b
-RMD160 (audacious-3.5.2.tar.bz2) = dd41e56544d9563b47401a670d96a34d7be920b6
-SHA512 (audacious-3.5.2.tar.bz2) = 70fd5bf81fd86a867102917c9328e1e647e9566ecfbc773b15fe0d181f176cfb333976c817493b1e485f15a045da054f19a9d6d81106d55636fca14ac09f8008
-Size (audacious-3.5.2.tar.bz2) = 448436 bytes
-SHA1 (patch-configure) = b35fcc193c90401ed5b927d200022e8b05e1fee8
+SHA1 (audacious-3.10.1.tar.bz2) = 297000119e0d7b94e355bd78d484c85baeab3795
+RMD160 (audacious-3.10.1.tar.bz2) = 6fc2c88fc681a58f42f45d19de36f2f24bc7e1bf
+SHA512 (audacious-3.10.1.tar.bz2) = e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
+Size (audacious-3.10.1.tar.bz2) = 564481 bytes
+SHA1 (patch-configure) = 2f310b55fdfc4147af6132dd821a9f81a1be6864
+SHA1 (patch-src_libaudcore_audio.h.in) = 621afba8a610ab0f30d064d5d9ed581e781de7d2
diff --git a/audio/audacious/options.mk b/audio/audacious/options.mk
new file mode 100644
index 00000000000..145741345ee
--- /dev/null
+++ b/audio/audacious/options.mk
@@ -0,0 +1,32 @@
+# $NetBSD: options.mk,v 1.1 2019/07/06 13:17:00 nia Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.audacious
+PKG_OPTIONS_OPTIONAL_GROUPS=	ui
+PKG_OPTIONS_GROUP.ui=		qt5 gtk2
+PKG_SUPPORTED_OPTIONS+=		dbus
+PKG_SUGGESTED_OPTIONS+=		dbus qt5 gtk2
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	dbus gtk qt
+
+.if !empty(PKG_OPTIONS:Mdbus)
+PLIST.dbus=	yes
+TOOL_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+.include "../../sysutils/dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.qt=	yes
+CONFIGURE_ARGS+=	--enable-qt
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk2)
+PLIST.gtk=	yes
+.include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-gtk
+.endif
diff --git a/audio/audacious/patches/patch-configure b/audio/audacious/patches/patch-configure
index 26ae75bba3f..047c4e605f1 100644
--- a/audio/audacious/patches/patch-configure
+++ b/audio/audacious/patches/patch-configure
@@ -1,24 +1,20 @@
-$NetBSD: patch-configure,v 1.2 2018/07/31 13:46:31 jperkin Exp $
+$NetBSD: patch-configure,v 1.3 2019/07/06 13:17:01 nia Exp $
 
 Fix install_name on Darwin.
 
---- configure.orig	2014-10-17 00:00:43.000000000 +0000
+--- configure.orig	2018-12-26 07:25:42.000000000 +0000
 +++ configure
-@@ -5217,18 +5217,18 @@ $as_echo_n "checking for shared library
- 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+@@ -6935,7 +6935,7 @@ $as_echo_n "checking for shared library 
  $as_echo "Darwin" >&6; }
  			LIB_CFLAGS='-fPIC -DPIC'
--			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
-+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name ${libdir}/${SHARED_LIB}'
+ 			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+-			LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
++			LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/${SHARED_LIB}'
  			LIB_PREFIX='lib'
  			LIB_SUFFIX='.dylib'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
- 			PLUGIN_CFLAGS='-fPIC -DPIC'
- 			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
- 			PLUGIN_SUFFIX='.bundle'
--			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && install_name_tool -id ${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-+			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
- 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+@@ -6978,7 +6978,7 @@ $as_echo "OpenBSD" >&6; }
+ 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
  			CLEAN_LIB=''
  			;;
 -		solaris*)
diff --git a/audio/audacious/patches/patch-src_libaudcore_audio.h.in b/audio/audacious/patches/patch-src_libaudcore_audio.h.in
new file mode 100644
index 00000000000..8083a13e600
--- /dev/null
+++ b/audio/audacious/patches/patch-src_libaudcore_audio.h.in
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_libaudcore_audio.h.in,v 1.1 2019/07/06 13:17:01 nia Exp $
+
+NetBSD has these in libc.
+
+--- src/libaudcore/audio.h.in.orig	2018-12-26 06:55:16.000000000 +0000
++++ src/libaudcore/audio.h.in
+@@ -42,7 +42,10 @@ struct StereoVolume {
+ };
+ 
+ #ifdef WANT_AUD_BSWAP
+-
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <machine/bswap.h>
++#else
+ #include <stdint.h>
+ 
+ #undef bswap16
+@@ -66,7 +69,7 @@ constexpr uint64_t bswap64 (uint64_t x)
+            ((x & 0x00000000ff000000) << 8) | ((x & 0x0000000000ff0000) << 24) |
+            ((x & 0x000000000000ff00) << 40) | ((x & 0x00000000000000ff) << 56);
+ }
+-
++#endif // __NetBSD__
+ #endif // WANT_AUD_BSWAP
+ 
+ #if @BIGENDIAN@