3 files changed, 221 insertions, 241 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 315e2c1d285b..eb538905f4b8 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.2.2
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://distfiles.atheme.org/
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Plugins needed for audacious
@@ -18,10 +17,11 @@ BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--disable-pulse --disable-coreaudio
+CONFIGURE_ARGS=	--disable-pulse --disable-mpris2
 WANT_GNOME=	yes
 WANT_EFL=	yes
 WANT_SDL=	yes
@@ -30,10 +30,10 @@ PORTDOCS=	AUTHORS
 
 # no ports for:
 #		PULSE		"Enable PulseAudio output plugin"	on \
-#		COREAUDIO	"Enable CoreAudio output plugin"	on \
+#		FFAUDIO         "Enable FFAUDIO input plugin"           off \
 
 OPTIONS=	DBUS		"Enable dbus support"			on  \
-		OSS		"Enable OSS output plugin"		on  \
+		OSS		"Enable OSS output plugin"		off  \
 		OSS4		"Enable OSS4 output plugin"		off \
 		SDLOUT		"Enable SDL output plugin"		off \
 		ALSA		"Enable ALSA output plugin"		off \
@@ -45,7 +45,6 @@ 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 \
 		WAVPACK 	"Enable WavPack input plugin"		off \
 		AAC		"Enable aac plugin"			on  \
 		SNDFILE 	"Enable sndfile extensions"		off \
@@ -60,10 +59,9 @@ OPTIONS=	DBUS		"Enable dbus support"			on  \
 		SMB		"Enable SMB transport plugin"		off \
 		MTP		"Enable MTP upload support"             off \
 		NLS		"Native Language Support"		on  \
-		RESAMPLE	"Enable resample support"		off\
+		RESAMPLE	"Enable resample support"		off \
 		AMIDI		"Enable amidi support"			off \
 		NOTIFY		"Enable libnotify support"		off \
-		OPENAL		"Enable OpenAL support"			off \
 		BS2B		"Enable Bauer stereophonic-to-binaural (bs2b) support" off
 
 .include <bsd.port.pre.mk>
@@ -80,14 +78,14 @@ CONFIGURE_ARGS+=--disable-sdlout
 .if defined(WITH_NOTIFY) || exists(${LOCALBASE}/lib/libnotify.so.1)
 LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--enable-notify
-PLIST_SUB+=     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
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-gnomeshortcuts
 PLIST_SUB+=	DBUS=""
 .else
@@ -167,14 +165,15 @@ CONFIGURE_ARGS+=--disable-flacng --disable-filewriter_flac
 PLIST_SUB+=	FLACPLUGIN="@comment "
 .endif
 
-.if defined(WITH_FFAUDIO)
-LIB_DEPENDS+=	avutil.1:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=--enable-ffaudio
-PLIST_SUB+=	FFAUDIOPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-ffaudio
-PLIST_SUB+=	FFAUDIOPLUGIN="@comment "
-.endif
+# Needs a newer version of ffmpeg
+#.if defined(WITH_FFAUDIO)
+#LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+#CONFIGURE_ARGS+=--enable-ffaudio
+#PLIST_SUB+=	FFAUDIOPLUGIN=""
+#.else
+#CONFIGURE_ARGS+=--disable-ffaudio
+#PLIST_SUB+=	FFAUDIOPLUGIN="@comment "
+#.endif
 
 .if defined(WITH_WAVPACK)
 LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
@@ -297,10 +296,10 @@ PLIST_SUB+=	MTPPLUGIN="@comment "
 .if !defined(WITHOUT_RESAMPLE)
 LIB_DEPENDS+=	samplerate.1:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=--enable-resample
-PLIST_SUB+=     RESAMPLEPLUGIN=""
+PLIST_SUB+=		RESAMPLEPLUGIN=""
 .else
 CONFIGURE_ARGS+=--disable-resample
-PLIST_SUB+=     RESAMPLEPLUGIN="@comment "
+PLIST_SUB+=		RESAMPLEPLUGIN="@comment "
 .endif
 
 .if defined(WITH_ALSA)
@@ -331,15 +330,6 @@ PLIST_SUB+=	AMIDIAPLUGIN="@comment "
 PLIST_SUB+=	AMIDIPLUGIN="@comment "
 .endif
 
-.if defined(WITH_OPENAL)
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
-CONFIGURE_ARGS+=--enable-openal
-PLIST_SUB+=	OPENALPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-openal
-PLIST_SUB+=	OPENALPLUGIN="@comment "
-.endif
-
 .if defined(WITH_BS2B)
 LIB_DEPENDS+=	bs2b.0:${PORTSDIR}/audio/libbs2b
 CONFIGURE_ARGS+=--enable-bs2b
@@ -368,7 +358,6 @@ CONFIGURE_ARGS+=--disable-smb
 PLIST_SUB+=	SMBPLUGIN="@comment "
 .endif
 
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
@@ -385,19 +374,6 @@ pre-everything::
 	@${ECHO_CMD} ""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$EGREP|egrep|g; \
-		s| -ldl||g ; \
-		s|1.9.7|0.120.1|g ; \
-		s|OSS_LIBS="-lossaudio"|OSS_LIBS=""|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \
-		${WRKSRC}/src/neon/cert_verification.c \
-		${WRKSRC}/src/usf/memory.c
-	@${REINPLACE_CMD} -e 's|-ldl||g' \
-		${WRKSRC}/src/ladspa/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/lib/|${LOCALBASE}/lib/|g' \
-		${WRKSRC}/src/oss4/Makefile
-
 pre-configure:
 .if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so)
 	@${ECHO_CMD} ""
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 6b73329d382c..c5cad590bdc2 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.1.1.tar.gz) = b9297d64834d1a011eaf7cde70dbf30b13d78694071b201715bfb6c4a358c038
-SIZE (audacious-plugins-3.1.1.tar.gz) = 2809711
+SHA256 (audacious-plugins-3.2.2.tar.bz2) = c637e6770ed41ec0e885f210944234326090d9cecf0547e2545fff09bc25b7fc
+SIZE (audacious-plugins-3.2.2.tar.bz2) = 1898457
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 3a213109bce9..08cacee866cf 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,228 +1,232 @@
-%%CUEPLUGIN%%lib/audacious/Container/cue.so
-lib/audacious/Container/asx.so
-lib/audacious/Container/m3u.so
-lib/audacious/Container/pls.so
-lib/audacious/Container/xspf.so
-%%BS2BPLUGIN%%lib/audacious/Effect/bs2b.so
-lib/audacious/Effect/compressor.so
-lib/audacious/Effect/crossfade.so
-lib/audacious/Effect/crystalizer.so
-lib/audacious/Effect/ladspa.so
-lib/audacious/Effect/echo.so
-lib/audacious/Effect/mixer.so
-%%RESAMPLEPLUGIN%%lib/audacious/Effect/resample.so
-lib/audacious/Effect/sndstretch.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
-%%DBUS%%lib/audacious/General/gnomeshortcuts.so
-lib/audacious/General/gtkui.so
-lib/audacious/General/hotkey.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
-%%AACPLUGIN%%lib/audacious/Input/aac.so
-%%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
-%%AMIDIAPLUGIN%%lib/audacious/Input/amidi-plug/ap-alsa.so
-%%AMIDIFPLUGIN%%lib/audacious/Input/amidi-plug/ap-fluidsynth.so
-%%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug.so
-%%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
-lib/audacious/Input/console.so
-%%FLACPLUGIN%%lib/audacious/Input/flacng.so
-%%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so
-%%MP3PLUGIN%%lib/audacious/Input/madplug.so
-lib/audacious/Input/metronom.so
-%%MODPLUG%%lib/audacious/Input/modplug.so
-%%MTPPLUGIN%%lib/audacious/General/mtp_up.so
-lib/audacious/Input/psf2.so
-%%SIDPLUGIN%%lib/audacious/Input/sid.so
-%%SNDFILEPLUGIN%%lib/audacious/Input/sndfile.so
-lib/audacious/Input/tonegen.so
-%%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
-lib/audacious/Input/vtx.so
-%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
-lib/audacious/Input/xsf.so
-%%OSSPLUGIN%%lib/audacious/Output/OSS.so
-%%OSS4PLUGIN%%lib/audacious/Output/oss4.so
-lib/audacious/Output/filewriter.so
-%%ALSAPLUGIN%%lib/audacious/Output/alsa.so
-%%JACKPLUGIN%%lib/audacious/Output/jackout.so
-lib/audacious/Output/null.so
-%%OPENALPLUGIN%%lib/audacious/Output/openal.so
-%%SDL%%lib/audacious/Output/sdlout.so
-%%GIOPLUGIN%%lib/audacious/Transport/gio.so
-%%MMSPLUGIN%%lib/audacious/Transport/mms.so
-%%NEONPLUGIN%%lib/audacious/Transport/neon.so
-%%SMBPLUGIN%%lib/audacious/Transport/smb.so
-lib/audacious/Transport/unix-io.so
-lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/cairo-spectrum.so
-share/audacious/Skins/Classic/balance.png
-share/audacious/Skins/Classic/cbuttons.png
-share/audacious/Skins/Classic/eq_ex.png
-share/audacious/Skins/Classic/eqmain.png
-share/audacious/Skins/Classic/main.png
-share/audacious/Skins/Classic/monoster.png
-share/audacious/Skins/Classic/nums_ex.png
-share/audacious/Skins/Classic/playpaus.png
-share/audacious/Skins/Classic/pledit.png
-share/audacious/Skins/Classic/pledit.txt
-share/audacious/Skins/Classic/posbar.png
-share/audacious/Skins/Classic/shufrep.png
-share/audacious/Skins/Classic/skin.hints
-share/audacious/Skins/Classic/skin-classic.hints
-share/audacious/Skins/Classic/text.png
-share/audacious/Skins/Classic/titlebar.png
-share/audacious/Skins/Classic/viscolor.txt
-share/audacious/Skins/Classic/volume.png
-share/audacious/Skins/Classic1.3/balance.png
-share/audacious/Skins/Classic1.3/cbuttons.png
-share/audacious/Skins/Classic1.3/eq_ex.png
+%%NLS%%share/locale/et/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/es/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/de/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/it/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/audacious-plugins.mo
+share/audacious/ui/mainwin.ui
+share/audacious/ui/playlist.ui
+share/audacious/ui/equalizer.ui
 share/audacious/Skins/Classic1.3/eqmain.png
-share/audacious/Skins/Classic1.3/main.png
-share/audacious/Skins/Classic1.3/monoster.png
-share/audacious/Skins/Classic1.3/nums_ex.png
-share/audacious/Skins/Classic1.3/playpaus.png
-share/audacious/Skins/Classic1.3/pledit.png
-share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/volume.png
 share/audacious/Skins/Classic1.3/posbar.png
 share/audacious/Skins/Classic1.3/shufrep.png
 share/audacious/Skins/Classic1.3/skin-classic.hints
-share/audacious/Skins/Classic1.3/skin.hints
-share/audacious/Skins/Classic1.3/text.png
-share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
 share/audacious/Skins/Classic1.3/viscolor.txt
-share/audacious/Skins/Classic1.3/volume.png
-share/audacious/Skins/Default/cbuttons.png
-share/audacious/Skins/Default/eq_ex.png
-share/audacious/Skins/Default/eqmain.png
-share/audacious/Skins/Default/main.png
-share/audacious/Skins/Default/monoster.png
-share/audacious/Skins/Default/nums_ex.png
-share/audacious/Skins/Default/playpaus.png
-share/audacious/Skins/Default/pledit.png
-share/audacious/Skins/Default/pledit.txt
-share/audacious/Skins/Default/posbar.png
-share/audacious/Skins/Default/shufrep.png
-share/audacious/Skins/Default/skin.hints
-share/audacious/Skins/Default/text.png
-share/audacious/Skins/Default/titlebar.png
-share/audacious/Skins/Default/viscolor.txt
-share/audacious/Skins/Default/volume.png
-share/audacious/Skins/Ivory/balance.png
-share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/titlebar.png
+share/audacious/Skins/Classic/eq_ex.png
+share/audacious/Skins/Classic/pledit.png
+share/audacious/Skins/Classic/skin.hints
+share/audacious/Skins/Classic/cbuttons.png
+share/audacious/Skins/Classic/playpaus.png
+share/audacious/Skins/Classic/viscolor.txt
+share/audacious/Skins/Classic/monoster.png
+share/audacious/Skins/Classic/main.png
+share/audacious/Skins/Classic/balance.png
+share/audacious/Skins/Classic/text.png
+share/audacious/Skins/Classic/pledit.txt
+share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic/skin-classic.hints
+share/audacious/Skins/Classic/nums_ex.png
+share/audacious/Skins/Classic/eqmain.png
+share/audacious/Skins/Classic/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/volume.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/skin.hints
 share/audacious/Skins/Ivory/eq_ex.png
-share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/pledit.png
+share/audacious/Skins/Ivory/text.png
 share/audacious/Skins/Ivory/main.png
-share/audacious/Skins/Ivory/monoster.png
-share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/volume.png
+share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/viscolor.txt
 share/audacious/Skins/Ivory/playpaus.png
-share/audacious/Skins/Ivory/pledit.png
-share/audacious/Skins/Ivory/pledit.txt
+share/audacious/Skins/Ivory/balance.png
 share/audacious/Skins/Ivory/posbar.png
-share/audacious/Skins/Ivory/shufrep.png
-share/audacious/Skins/Ivory/skin.hints
-share/audacious/Skins/Ivory/text.png
+share/audacious/Skins/Ivory/monoster.png
+share/audacious/Skins/Ivory/pledit.txt
 share/audacious/Skins/Ivory/titlebar.png
-share/audacious/Skins/Ivory/viscolor.txt
-share/audacious/Skins/Ivory/volume.png
-share/audacious/Skins/Osmosis/balance.png
-share/audacious/Skins/Osmosis/cbuttons.png
-share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Ivory/shufrep.png
 share/audacious/Skins/Osmosis/eqmain.png
-share/audacious/Skins/Osmosis/main.png
-share/audacious/Skins/Osmosis/monoster.png
+share/audacious/Skins/Osmosis/titlebar.png
+share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Osmosis/posbar.png
 share/audacious/Skins/Osmosis/nums_ex.png
+share/audacious/Skins/Osmosis/viscolor.txt
 share/audacious/Skins/Osmosis/playpaus.png
-share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/cbuttons.png
 share/audacious/Skins/Osmosis/pledit.txt
-share/audacious/Skins/Osmosis/posbar.png
-share/audacious/Skins/Osmosis/shufrep.png
-share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/monoster.png
 share/audacious/Skins/Osmosis/text.png
-share/audacious/Skins/Osmosis/titlebar.png
-share/audacious/Skins/Osmosis/viscolor.txt
-share/audacious/Skins/Osmosis/volume.png
-share/audacious/Skins/Refugee/cbuttons.png
-share/audacious/Skins/Refugee/eq_ex.png
-share/audacious/Skins/Refugee/eqmain.png
-share/audacious/Skins/Refugee/main.png
-share/audacious/Skins/Refugee/monoster.png
-share/audacious/Skins/Refugee/nums_ex.png
-share/audacious/Skins/Refugee/playpaus.png
-share/audacious/Skins/Refugee/pledit.png
-share/audacious/Skins/Refugee/pledit.txt
-share/audacious/Skins/Refugee/posbar.png
-share/audacious/Skins/Refugee/shufrep.png
-share/audacious/Skins/Refugee/skin.hints
-share/audacious/Skins/Refugee/text.png
-share/audacious/Skins/Refugee/titlebar.png
-share/audacious/Skins/Refugee/viscolor.txt
-share/audacious/Skins/Refugee/volume.png
-share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/balance.png
+share/audacious/Skins/Osmosis/main.png
+share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/shufrep.png
 share/audacious/Skins/TinyPlayer/cbuttons.png
-share/audacious/Skins/TinyPlayer/eq_ex.png
-share/audacious/Skins/TinyPlayer/eqmain.png
-share/audacious/Skins/TinyPlayer/main.png
-share/audacious/Skins/TinyPlayer/monoster.png
-share/audacious/Skins/TinyPlayer/nums_ex.png
 share/audacious/Skins/TinyPlayer/playpaus.png
+share/audacious/Skins/TinyPlayer/viscolor.txt
 share/audacious/Skins/TinyPlayer/pledit.png
-share/audacious/Skins/TinyPlayer/pledit.txt
-share/audacious/Skins/TinyPlayer/posbar.png
-share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/monoster.png
+share/audacious/Skins/TinyPlayer/main.png
+share/audacious/Skins/TinyPlayer/titlebar.png
 share/audacious/Skins/TinyPlayer/skin.hints
 share/audacious/Skins/TinyPlayer/text.png
-share/audacious/Skins/TinyPlayer/titlebar.png
-share/audacious/Skins/TinyPlayer/viscolor.txt
+share/audacious/Skins/TinyPlayer/nums_ex.png
+share/audacious/Skins/TinyPlayer/pledit.txt
+share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/TinyPlayer/eqmain.png
+share/audacious/Skins/TinyPlayer/eq_ex.png
 share/audacious/Skins/TinyPlayer/volume.png
-share/audacious/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
-%%NLS%%share/locale/es/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/de/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/fr/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/ru/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/tr/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/audacious-plugins.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo
-@dirrm lib/audacious/Effect
+share/audacious/Skins/TinyPlayer/posbar.png
+share/audacious/Skins/Default/pledit.txt
+share/audacious/Skins/Default/posbar.png
+share/audacious/Skins/Default/volume.png
+share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/nums_ex.png
+share/audacious/Skins/Default/cbuttons.png
+share/audacious/Skins/Default/viscolor.txt
+share/audacious/Skins/Default/playpaus.png
+share/audacious/Skins/Default/shufrep.png
+share/audacious/Skins/Default/pledit.png
+share/audacious/Skins/Default/eq_ex.png
+share/audacious/Skins/Default/monoster.png
+share/audacious/Skins/Default/titlebar.png
+share/audacious/Skins/Default/main.png
+share/audacious/Skins/Default/skin.hints
+share/audacious/Skins/Default/text.png
+%%MMSPLUGIN%%lib/audacious/Transport/mms.so
+%%NEONPLUGIN%%lib/audacious/Transport/neon.so
+lib/audacious/Transport/unix-io.so
+%%SMBPLUGIN%%lib/audacious/Transport/smb.so
+%%GIOPLUGIN%%lib/audacious/Transport/gio.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
+%%AACPLUGIN%%lib/audacious/Input/aac.so
+%%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
+%%MODPLUG%%lib/audacious/Input/modplug.so
+lib/audacious/Input/tonegen.so
+lib/audacious/Input/vtx.so
+%%FLACPLUGIN%%lib/audacious/Input/flacng.so
+lib/audacious/Input/xsf.so
+%%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
+lib/audacious/Input/metronom.so
+%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
+%%SIDPLUGIN%%lib/audacious/Input/sid.so
+lib/audacious/Input/console.so
+lib/audacious/Input/psf2.so
+lib/audacious/Input/madplug.so
+%%SNDFILEPLUGIN%%lib/audacious/Input/sndfile.so
+%%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
+lib/audacious/Effect/stereo.so
+lib/audacious/Effect/crystalizer.so
+%%RESAMPLEPLUGIN%%lib/audacious/Effect/resample.so
+lib/audacious/Effect/crossfade.so
+lib/audacious/Effect/compressor.so
+lib/audacious/Effect/ladspa.so
+lib/audacious/Effect/mixer.so
+lib/audacious/Effect/sndstretch.so
+lib/audacious/Effect/echo.so
+lib/audacious/Effect/voice_removal.so
+%%BS2BPLUGIN%%lib/audacious/Effect/bs2b.so
+lib/audacious/Visualization/blur_scope.so
+lib/audacious/Visualization/cairo-spectrum.so
+%%MTPPLUGIN%%lib/audacious/General/mtp_up.so
+%%DBUS%%lib/audacious/General/gnomeshortcuts.so
+lib/audacious/General/lyricwiki.so
+%%SCROBBLERPLUGIN%%lib/audacious/General/scrobbler.so
+lib/audacious/General/alarm.so
+%%NOTIFY%%lib/audacious/General/notify.so
+lib/audacious/General/hotkey.so
+lib/audacious/General/search-tool.so
+lib/audacious/General/gtkui.so
+lib/audacious/General/albumart.so
+%%AOSDPLUGIN%%lib/audacious/General/aosd.so
+lib/audacious/General/skins.so
+lib/audacious/General/song_change.so
+%%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
+lib/audacious/General/cd-menu-items.so
+%%OSSPLUGIN%%lib/audacious/Output/OSS.so
+%%OSS4PLUGIN%%lib/audacious/Output/oss4.so
+%%ALSAPLUGIN%%lib/audacious/Output/alsa.so
+lib/audacious/Output/null.so
+lib/audacious/Output/filewriter.so
+%%JACKPLUGIN%%lib/audacious/Output/jackout.so
+%%SDL%%lib/audacious/Output/sdlout.so
+lib/audacious/Container/xspf.so
+lib/audacious/Container/audpl.so
+lib/audacious/Container/m3u.so
+%%CUEPLUGIN%%lib/audacious/Container/cue.so
+lib/audacious/Container/asx.so
+lib/audacious/Container/pls.so
 @dirrm lib/audacious/Container
+@dirrm lib/audacious/Output
 @dirrm lib/audacious/General
+@dirrm lib/audacious/Visualization
+@dirrm lib/audacious/Effect
 %%AMIDIPLUGIN%%@dirrm lib/audacious/Input/amidi-plug
 @dirrm lib/audacious/Input
-@dirrm lib/audacious/Output
 @dirrm lib/audacious/Transport
-@dirrm lib/audacious/Visualization
 @dirrmtry lib/audacious
-@dirrm share/audacious/Skins/Classic
-@dirrm share/audacious/Skins/Classic1.3
 @dirrm share/audacious/Skins/Default
-@dirrm share/audacious/Skins/Ivory
+@dirrm share/audacious/Skins/TinyPlayer
 @dirrm share/audacious/Skins/Osmosis
+@dirrm share/audacious/Skins/Ivory
 @dirrm share/audacious/Skins/Refugee
-@dirrm share/audacious/Skins/TinyPlayer
+@dirrm share/audacious/Skins/Classic
+@dirrm share/audacious/Skins/Classic1.3
 @dirrm share/audacious/Skins
-@dirrmtry share/audacious/images
 @dirrm share/audacious/ui
 @dirrmtry share/audacious