3 files changed, 12 insertions, 38 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index a9c2c61c9dff..f72d479ca157 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
@@ -20,7 +19,7 @@ USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-mpris2
-WANT_GNOME=	yes
+USE_GNOME=	glib20
 WANT_EFL=	yes
 WANT_SDL=	yes
 
@@ -28,7 +27,7 @@ PORTDOCS=	AUTHORS
 
 OPTIONS_DEFINE=	DBUS OSS4 SDLOUT ALSA CUE MP3 STATUSICON AOSD AOSDXCOMP \
 		ADPLUG VORBIS FLAC WAVPACK AAC SNDFILE MODPLUG JACK \
-		CDAUDIO SCROBBLER MMS GIO NLS RESAMPLE AMIDI GLSPECTRUM \
+		CDAUDIO SCROBBLER MMS NLS RESAMPLE AMIDI GLSPECTRUM \
 		NOTIFY BS2B FFAUDIO PULSE NEON SPEEDPITCH LIRC MP3FILEWRITER \
 		SID
 OPTIONS_DEFAULT=DBUS CUE MP3 STATUSICON AOSD AOSDXCOMP AAC CDAUDIO \
@@ -42,7 +41,6 @@ BS2B_DESC=	BS2B effect
 CDAUDIO_DESC=	CD audio input
 FFAUDIO_DESC=	FFAudio decoder
 GLSPECTRUM_DESC=OpenGL Spectrum Analyzer
-GIO_DESC=	GIO support
 OSS4_DESC=	Open Sound System 4
 PULSE_DESC=	PulseAudio support
 RESAMPLE_DESC=	Resample effect
@@ -308,21 +306,11 @@ PLIST_SUB+=	ALSAPLUGIN="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MAMIDI}
-.if ${PORT_OPTIONS:MALSA}
-CONFIGURE_ARGS+=--enable-amidiplug --enable-amidiplug-alsa
-PLIST_SUB+=	AMIDIFPLUGIN="@comment "
-PLIST_SUB+=	AMIDIAPLUGIN=""
-.else
 LIB_DEPENDS+=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
-CONFIGURE_ARGS+=--enable-amidiplug --enable-amidiplug-flsyn
-PLIST_SUB+=	AMIDIFPLUGIN=""
-PLIST_SUB+=	AMIDIAPLUGIN="@comment "
-.endif
+CONFIGURE_ARGS+=--enable-amidiplug
 PLIST_SUB+=	AMIDIPLUGIN=""
 .else
 CONFIGURE_ARGS+=--disable-amidiplug
-PLIST_SUB+=	AMIDIFPLUGIN="@comment "
-PLIST_SUB+=	AMIDIAPLUGIN="@comment "
 PLIST_SUB+=	AMIDIPLUGIN="@comment "
 .endif
 
@@ -335,15 +323,6 @@ CONFIGURE_ARGS+=--disable-bs2b
 PLIST_SUB+=	BS2BPLUGIN="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MGIO}
-USE_GNOME+=	glib20
-CONFIGURE_ARGS+=--enable-gio
-PLIST_SUB+=	GIOPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-gio
-PLIST_SUB+=	GIOPLUGIN="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 CONFIGURE_ARGS+=--enable-nls
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index d24490f6f0b1..8aacb04118ba 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.4.3.tar.bz2) = bee67a8f8e84d855d4008367a61e662f1e6d15db5accda587c4025ed12462803
-SIZE (audacious-plugins-3.4.3.tar.bz2) = 1812774
+SHA256 (audacious-plugins-3.5.tar.bz2) = 11bc39e5e386b218db62122411de15363cd5795f2e86ea7989d10d640f2dd4d2
+SIZE (audacious-plugins-3.5.tar.bz2) = 1710000
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index d0fd936b6ba3..df4ec55ce906 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,4 +1,5 @@
 lib/audacious/Container/asx.so
+lib/audacious/Container/asx3.so
 lib/audacious/Container/audpl.so
 %%CUEPLUGIN%%lib/audacious/Container/cue.so
 lib/audacious/Container/m3u.so
@@ -19,6 +20,7 @@ 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
 %%DBUS%%lib/audacious/General/gnomeshortcuts.so
 lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
@@ -29,11 +31,10 @@ lib/audacious/General/search-tool.so
 lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 %%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
+%%AACPLUGIN%%lib/audacious/Input/aac-raw.so
 %%AACPLUGIN%%lib/audacious/Input/aac.so
 %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
 %%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
-%%AMIDIAPLUGIN%%lib/audacious/Input/amidi-plug/ap-alsa.so
-%%AMIDIFPLUGIN%%lib/audacious/Input/amidi-plug/ap-fluidsynth.so
 %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
 %%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so
@@ -55,10 +56,9 @@ lib/audacious/Output/filewriter.so
 %%OSS4PLUGIN%%lib/audacious/Output/oss4.so
 %%PULSE%%lib/audacious/Output/pulse_audio.so
 %%SDL%%lib/audacious/Output/sdlout.so
-%%GIOPLUGIN%%lib/audacious/Transport/gio.so
+lib/audacious/Transport/gio.so
 %%MMSPLUGIN%%lib/audacious/Transport/mms.so
 %%NEONPLUGIN%%lib/audacious/Transport/neon.so
-lib/audacious/Transport/unix-io.so
 lib/audacious/Visualization/blur_scope.so
 lib/audacious/Visualization/cairo-spectrum.so
 %%GLSPECTRUM%%lib/audacious/Visualization/gl-spectrum.so
@@ -181,10 +181,6 @@ 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/audacious/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%NLS%%share/locale/be/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
@@ -199,6 +195,7 @@ share/audacious/ui/playlist.ui
 %%NLS%%share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/audacious-plugins.mo
@@ -217,6 +214,7 @@ share/audacious/ui/playlist.ui
 %%NLS%%share/locale/ru/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/si/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/audacious-plugins.mo
@@ -237,8 +235,6 @@ share/audacious/ui/playlist.ui
 %%NLS%%@dirrmtry share/locale/es_AR
 %%NLS%%@dirrmtry share/locale/cmn/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cmn
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm share/audacious/ui
 @dirrm share/audacious/Skins/TinyPlayer
 @dirrm share/audacious/Skins/Refugee
 @dirrm share/audacious/Skins/Osmosis
@@ -251,7 +247,6 @@ share/audacious/ui/playlist.ui
 @dirrm lib/audacious/Visualization
 @dirrm lib/audacious/Transport
 @dirrm lib/audacious/Output
-%%AMIDIPLUGIN%%@dirrm lib/audacious/Input/amidi-plug
 @dirrm lib/audacious/Input
 @dirrm lib/audacious/General
 @dirrm lib/audacious/Effect