update to 1.3.0

11 files changed, 412 insertions, 345 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index adc83ab47e84..8c96f6b2a033 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTVERSION=	1.3.0
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://audacious-media-player.org/release/
-EXTRACT_SUFX=.tgz
+MASTER_SITES=	http://static.audacious-media-player.org/release/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Plugins needed for audacious
@@ -20,96 +19,292 @@ LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile  \
 		curl.4:${PORTSDIR}/ftp/curl \
 		tag.5:${PORTSDIR}/audio/taglib
 
-USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--disable-jack --disable-adplug --disable-lirc \
-		--disable-alsa --disable-amidiplug --disable-arts --disable-wma
+CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa --disable-amidiplug \
+		--disable-pulse --disable-coreaudio --disable-projectm \
+		--disable-flac
+WANT_GNOME=	yes
+WANT_SDL=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS
 
-OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
-		MODPLUG	"Enable modplug input" off \
-		FLAC	"Enable FLAC input" off \
-		SID	"Enable sid input" off \
-		MPC	"Enable mpc input" off \
-		ESOUND	"Enable Esound output"  off \
-		GNOME   "Build with gnomevfs/gconf support" off
+# no ports for:
+#		PULSE		"Enable PulseAudio output plugin"	off \
+#		COREAUDIO	"Enable CoreAudio output plugin"	off \
+#		PROJECTM	"Enable projectM vis plugin"		off \
+# to old ports:
+#		FLAC		"Enable flac input plugin"		off \
+
+OPTIONS=	ESOUND		"Enable Esound output output"		off \
+		MP3		"Enable mp3 plugin"			on  \
+		ROCKLIGHT	"Enable Rocklight vis plugin"		on  \
+		LIRC		"Enable LIRC plugin"			off \
+		STATUSICON	"Enable X11 Status Icon plugin"		on  \
+		AOSD		"Enable X11 Audacious OSD plugin"	on  \
+		ADPLUG		"Enable AdPlug plugin"			off \
+		VORBIS		"Enable Ogg Vorbis input plugin"	off \
+		WAVPACK 	"Enable WavPack input plugin"		off \
+		AAC		"Enable aac plugin"			on  \
+		SNDFILE 	"Enable sndfile extensions"		off \
+		MODPLUG 	"Enable ModPlug plugin"			off \
+		MPC		"Enable musepack input plugin"		off \
+		WMA		"Enable wma plugin"			on  \
+		JACK		"Enable jack output plugin"		off \
+		ARTS		"Enable arts output plugin"		off \
+		SID		"Enable sid input plugin"		off \
+		OSS		"Enable OSS output plugin"		on  \
+		TIMIDITY	"Enable timidity plugin"		on  \
+		MMS		"Enable mms support"			off \
+		PARANORMAL	"Enable paranormal vis plugin"		on \
+		XSPF		"Enable XSPF support"			off \
+		TTA		"Enable TrueAudio plugin"		on  \
+		LAME		"Enable liblame plugin"			off \
+		GNOME		"Build with gnomevfs/gconf support"	off \
+		NLS		"Native Language Support"		on
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_ESOUND)
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=--enable-esd
+PLIST_SUB+=	ESDPLUGIN=""
+.if defined(PKGNAMESUFFIX)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
+.else
+PKGNAMESUFFIX=	-esound
+.endif
+.else
+CONFIGURE_ARGS+=--disable-esd
+PLIST_SUB+=	ESDPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_MP3)
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+CONFIGURE_ARGS+=--enable-mad
+PLIST_SUB+=	MP3PLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-mad
+PLIST_SUB+=	MP3PLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_ROCKLIGHT)
+PLIST_SUB+=	ROCKLIGHTPLUGIN=""
+CONFIGURE_ARGS+=--enable-rocklight
+.else
+CONFIGURE_ARGS+=--disable-rocklight
+PLIST_SUB+=	ROCKLIGHTPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_LIRC)
+LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
+CONFIGURE_ARGS+=--enable-lirc
+PLIST_SUB+=	LIRCPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-lirc
+PLIST_SUB+=	LIRCPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_STATUSICON)
+USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=--enable-statusicon
+PLIST_SUB+=	STATUSICONPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-statusicon
+PLIST_SUB+=	STATUSICONPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_AOSD)
+USE_GNOME+=	pango
+CONFIGURE_ARGS+=--enable-aosd
+PLIST_SUB+=	AOSDPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-aosd
+PLIST_SUB+=	AOSDPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_ADPLUG)
+LIB_DEPENDS+=	binio.1:${PORTSDIR}/devel/libbinio
+CONFIGURE_ARGS+=--enable-adplug
+PLIST_SUB+=	ADPLUGPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-adplug
+PLIST_SUB+=	ADPLUGPLUGIN="@comment "
+.endif
+
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 PLIST_SUB+=	VORBISPLUGIN=""
+#.if !defined(WITHOUT_FLAC)
+#LIB_DEPENDS+=   FLAC.7:${PORTSDIR}/audio/flac
+#CONFIGURE_ARGS+=--enable-flac
+#PLIST_SUB+=	FLACPLUGIN=""
+#.else
+#CONFIGURE_ARGS+=--disable-flac
+#PLIST_SUB+=	FLACPLUGIN="@comment "
+#.endif
 .else
-CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-vorbis #--disable-flac
+PLIST_SUB+=	VORBISPLUGIN="@comment " #FLACPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_WAVPACK)
+LIB_DEPENDS+=	wavpack.1:${PORTSDIR}/audio/wavpack
+CONFIGURE_ARGS+=--enable-wavpack
+PLIST_SUB+=	WAVPACKPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-wavpack
+PLIST_SUB+=	WAVPACKPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_AAC)
+CONFIGURE_ARGS+=--enable-aac
+PLIST_SUB+=	AACPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-aac
+PLIST_SUB+=	AACPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_SNDFILE)
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+CONFIGURE_ARGS+=--enable-sndfile
+PLIST_SUB+=	SNDFILEPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-sndfile
+PLIST_SUB+=	SNDFILEPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_MODPLUG)
-PLIST_SUB+=	MODPLUG=""
 LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+PLIST_SUB+=	MODPLUG=""
+CONFIGURE_ARGS+=--enable-modplug
 .else
 PLIST_SUB+=	MODPLUG="@comment "
-CONFIGURE_ARGS+=	--disable-modplug
+CONFIGURE_ARGS+=--disable-modplug
 .endif
 
-.if defined(WITH_FLAC)
-PLIST_SUB+=	FLACPLUGIN=""
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+.if !defined(WITHOUT_MPC)
+LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec \
+		tag.5:${PORTSDIR}/audio/taglib
+PLIST_SUB+=	MPCPLUGIN=""
+CONFIGURE_ARGS+=--enable-musepack
+.else
+PLIST_SUB+=	MPCPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-musepack
+.endif
+
+.if !defined(WITHOUT_WMA)
+CONFIGURE_ARGS+=--enable-wma
+PLIST_SUB+=	WMAPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-wma
+PLIST_SUB+=	WMAPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=--enable-jack
+PLIST_SUB+=	JACKPLUGIN=""
 .else
-PLIST_SUB+=	FLACPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-flac
+CONFIGURE_ARGS+=--disable-jack
+PLIST_SUB+=	JACKPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_ARTS)
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+=--enable-arts
+PLIST_SUB+=	ARTSPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-arts
+PLIST_SUB+=	ARTSPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_OSS)
+PLIST_SUB+=	OSSPLUGIN=""
+CONFIGURE_ARGS+=--enable-oss
+.else
+PLIST_SUB+=	OSSPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-oss
 .endif
 
 .if !defined(WITHOUT_SID)
-PLIST_SUB+=	SIDPLUGIN=""
 LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+PLIST_SUB+=	SIDPLUGIN=""
+CONFIGURE_ARGS+=--enable-sid
 .else
 PLIST_SUB+=	SIDPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-sid
+CONFIGURE_ARGS+=--disable-sid
 .endif
 
-.if !defined(WITHOUT_MPC)
-PLIST_SUB+=	MPCPLUGIN=""
-LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec \
-	tag.5:${PORTSDIR}/audio/taglib
+.if !defined(WITHOUT_TIMIDITY)
+CONFIGURE_ARGS+=--enable-timidity
+PLIST_SUB+=	TIMIDITYPLUGIN=""
 .else
-PLIST_SUB+=	MPCPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-musepack
+CONFIGURE_ARGS+=--disable-timidity
+PLIST_SUB+=	TIMIDITYPLUGIN="@comment "
 .endif
 
-.if defined(WITH_ESOUND)
-USE_GNOME+=	esound
-PLIST_SUB+=	ESDPLUGIN=""
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
+.if !defined(WITHOUT_PARANORMAL)
+CONFIGURE_ARGS+=--enable-paranormal --disable-mms
+PLIST_SUB+=	PARANORMALPLUGIN="" MMSPLUGIN="@comment "
+USE_SDL=	sdl
 .else
-PKGNAMESUFFIX=	-esound
+CONFIGURE_ARGS+=--disable-paranormal
+PLIST_SUB+=	PARANORMALPLUGIN="@comment "
+.if !defined(WITHOUT_MMS)
+LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+CONFIGURE_ARGS+=--enable-mms
+PLIST_SUB+=	MMSPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-mms
+PLIST_SUB+=	MMSPLUGIN="@comment "
+.endif
 .endif
+
+.if !defined(WITHOUT_XSPF)
+USE_GNOME+=	libxml2
+CONFIGURE_ARGS+=--enable-xspf
+PLIST_SUB+=	XSPFPLUGIN=""
 .else
-CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-xspf
+PLIST_SUB+=	XSPFPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_TTA)
+CONFIGURE_ARGS+=--enable-tta
+PLIST_SUB+=	TTAPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-tta
+PLIST_SUB+=	TTAPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_LAME)
+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/liblame
+CONFIGURE_ARGS+=--enable-lame
+PLIST_SUB+=	LAMEPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-lame
+PLIST_SUB+=	LAMEPLUGIN="@comment "
 .endif
 
 .if defined(WITH_GNOME)
 USE_GNOME+=	gnomevfs2 gconf2
-CONFIGURE_ARGS+=	--enable-gnome-vfs --enable-gconf
+CONFIGURE_ARGS+=--enable-gnome-vfs --enable-gconf
 .endif
 
-.if ${OSVERSION} < 500000
-post-patch:
-	@${REINPLACE_CMD} -e 's|-Wno-nonnull ||g' ${WRKSRC}/src/sexypsf/Makefile
-	@${REINPLACE_CMD} -e 's|stdint\.h|inttypes\.h|g' \
-		${WRKSRC}/src/alac/plugin.c ${WRKSRC}/src/alac/alac.c \
-		${WRKSRC}/src/alac/stream.h ${WRKSRC}/src/alac/demux.c \
-		${WRKSRC}/src/alac/demux.h ${WRKSRC}/src/alac/stream.c \
-		${WRKSRC}/src/aac/mp4ff/mp4ff_int_types.h
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
+
 post-install:
 .if defined(WITH_GNOME)
 	@${ECHO_MSG} ""
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 0516ac6cbced..a4e6d7a38c69 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-plugins-1.2.5.tgz) = 21d75a35024e81f7c5811baf5c8212e0
-SHA256 (audacious-plugins-1.2.5.tgz) = 29d812db9a17ef50dc38db9ac354ab2ba31047829a0c1316a549177328ffb6c3
-SIZE (audacious-plugins-1.2.5.tgz) = 2339867
+MD5 (audacious-plugins-1.3.0.tgz) = b36b91f89a223a127ff67589d7497db8
+SHA256 (audacious-plugins-1.3.0.tgz) = 03af577608aac62d66b5d12d116826e571ea9cf5e018209ed0acbb3f855efba6
+SIZE (audacious-plugins-1.3.0.tgz) = 2902694
diff --git a/multimedia/audacious-plugins/files/patch-configure b/multimedia/audacious-plugins/files/patch-configure
new file mode 100644
index 000000000000..74142cb9c072
--- /dev/null
+++ b/multimedia/audacious-plugins/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Fri Mar  2 17:35:33 2007
++++ configure	Sat Mar  3 17:23:32 2007
+@@ -8397,7 +8397,7 @@
+ else
+     { echo "$as_me:$LINENO: result: *** Audacious OSD plugin disabled per user request ***" >&5
+ echo "${ECHO_T}*** Audacious OSD plugin disabled per user request ***" >&6; }
+-    have_aosd="yes"
++    have_aosd="no"
+ fi
+ 
+ if test "x$have_aosd" = "xyes"; then
+@@ -15220,7 +15220,7 @@
+ fi
+ 
+ 
+-if test "x$ap_disable_paranormal" = "xyes"; then
++if test "x$ap_disable_paranormal" = "xyes" || test "x$have_paranormal" = "xno" ; then
+     have_paranormal=no
+     { echo "$as_me:$LINENO: result: *** paranormal plugin disabled by request ***" >&5
+ echo "${ECHO_T}*** paranormal plugin disabled by request ***" >&6; }
diff --git a/multimedia/audacious-plugins/files/patch-src-scrobbler-xmms_scrobbler.c b/multimedia/audacious-plugins/files/patch-src-scrobbler-xmms_scrobbler.c
deleted file mode 100644
index b6bfa605386e..000000000000
--- a/multimedia/audacious-plugins/files/patch-src-scrobbler-xmms_scrobbler.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/scrobbler/xmms_scrobbler.c.orig	Mon Dec  4 16:14:52 2006
-+++ src/scrobbler/xmms_scrobbler.c	Tue Dec  5 06:21:00 2006
-@@ -60,8 +60,9 @@
- {
- 	char *username = NULL, *password = NULL;
- 	ConfigDb *cfgfile;
--	going = 1;
- 	GError **moo = NULL;
-+
-+	going = 1;
- 	cfgdlg = create_cfgdlg();
- 
-         prefswin_page_new(cfgdlg, "Last.FM", DATA_DIR "/images/audioscrobbler.png");
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index f021f9ac4d8d..e02be2e852a3 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,35 +1,59 @@
+%%ARTSPLUGIN%%bin/audacious-arts-helper
 lib/audacious/Container/libm3u.so
 lib/audacious/Container/libpls.so
-lib/audacious/Container/libxspf.so
+lib/audacious/Container/libstdio.so
+%%XSPFPLUGIN%%lib/audacious/Container/libxspf.so
 lib/audacious/Effect/libaudiocompress.so
 lib/audacious/Effect/libladspa.so
 lib/audacious/Effect/libecho.so
 lib/audacious/Effect/libstereo.so
 lib/audacious/Effect/libvoice_removal.so
 lib/audacious/General/libalarm.so
+%%AOSDPLUGIN%%lib/audacious/General/libaosd.so
+lib/audacious/General/libcurl.so
+%%LIRCPLUGIN%%lib/audacious/General/liblirc.so
 lib/audacious/General/libsong_change.so
 lib/audacious/General/libscrobbler.so
-lib/audacious/Input/libcuesheet.so
+lib/audacious/General/libstatusicon.so
+%%AACPLUGIN%%lib/audacious/Input/libaac.so
+%%ADPLUGPLUGIN%%lib/audacious/Input/libadplug.so
 lib/audacious/Input/libalac.so
 lib/audacious/Input/libcdaudio.so
 lib/audacious/Input/libconsole.so
-lib/audacious/Input/libmpg123.so
-lib/audacious/Input/libsexypsf.so
-lib/audacious/Input/libtonegen.so
-lib/audacious/Input/libaac.so
-lib/audacious/Input/libtimidity.so
-%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
+lib/audacious/Input/libcuesheet.so
+@comment %%FLACPLUGIN%%lib/audacious/Input/libflac.so
+%%MP3PLUGIN%%lib/audacious/Input/libmadplug.so
+lib/audacious/Input/libmetronom.so
 %%MODPLUG%%lib/audacious/Input/libmodplug.so
-%%FLACPLUGIN%%lib/audacious/Input/libflac.so
 %%MPCPLUGIN%%lib/audacious/Input/libmpc.so
+lib/audacious/Input/libsexypsf.so
 %%SIDPLUGIN%%lib/audacious/Input/libsid.so
+%%TIMIDITYPLUGIN%%lib/audacious/Input/libtimidity.so
+lib/audacious/Input/libtonegen.so
+%%TTAPLUGIN%%lib/audacious/Input/libtta.so
+%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
+lib/audacious/Input/libvtx.so
 lib/audacious/Input/libwav.so
-lib/audacious/Output/libOSS.so
+%%WAVPACKPLUGIN%%lib/audacious/Input/libwavpack.so
+%%WMAPLUGIN%%lib/audacious/Input/libwma.so
+%%OSSPLUGIN%%lib/audacious/Output/libOSS.so
 %%ESDPLUGIN%%lib/audacious/Output/libESD.so
+%%ARTSPLUGIN%%lib/audacious/Output/libarts.so
 lib/audacious/Output/libdisk_writer.so
+%%LAMEPLUGIN%%lib/audacious/Output/liblame.so
 lib/audacious/Output/libnull.so
 lib/audacious/Visualization/libbscope.so
+%%PARANORMALPLUGIN%%lib/audacious/Visualization/libparanormal.so
+%%ROCKLIGHTPLUGIN%%lib/audacious/Visualization/librocklight.so
+%%PARANORMALPLUGIN%%lib/audacious/Visualization/librovascope.so
 lib/audacious/Visualization/libspectrum.so
+%%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/ja/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/audacious-plugins.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/audacious-plugins.mo
 share/audacious/images/audioscrobbler.png
 share/audacious/images/audioscrobbler_badge.png
 @dirrm include/audacious-plugins
@@ -39,4 +63,4 @@ share/audacious/images/audioscrobbler_badge.png
 @dirrm lib/audacious/Input
 @dirrm lib/audacious/General
 @dirrm lib/audacious/Effect
-@dirrm lib/audacious
+@dirrmtry lib/audacious
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index d6d87d0dbaae..9a133f730359 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.0
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://audacious-media-player.org/release/
+MASTER_SITES=	http://static.audacious-media-player.org/release/
 EXTRACT_SUFX=.tgz
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -20,14 +20,18 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
 USE_XLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 
 MAN1=		audacious.1 audtool.1
 
+LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs
+
 PORTDOCS=	README AUTHORS ChangeLog NEWS
 
 OPTIONS=	CHARSET	"Build with automatic charset detection" off \
 		GNOME	"Build with gconf support" off \
-		NLS	"Native Language Support" on
+		NLS	"Native Language Support" on \
+		XML	"Build with xml support" on
 
 .include <bsd.port.pre.mk>
 
@@ -49,13 +53,17 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-.if ${OSVERSION} < 500000
-	@${REINPLACE_CMD} -e 's|intl \\|intl|; /-Wno-strict-aliasing/d' \
-		${WRKSRC}/audacious/widgets/Makefile
+.if !defined(WITHOUT_XML)
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+.else
+CONFIGURE_ARGS+=--with-xml-prefix=/
 .endif
+
+post-patch:
 	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|datarootdir}/man|prefix}/man|g' \
+		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index e823ccbaae83..eb33a038d8fe 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.2.2.tgz) = e774afbda04220e6e1b0a9bff350522e
-SHA256 (audacious-1.2.2.tgz) = 31ab516444279f5022764bea57c017fb140a5ba3c69b2ec8df64542917d36b0f
-SIZE (audacious-1.2.2.tgz) = 1708499
+MD5 (audacious-1.3.0.tgz) = 8f0245cdf12258c0ff3ac63503473241
+SHA256 (audacious-1.3.0.tgz) = 64cb7cd74224b34ccd0acffe20236ef4df970f3b8c8fe788e5ea8811cc197979
+SIZE (audacious-1.3.0.tgz) = 1745980
diff --git a/multimedia/audacious/files/patch-audacious-ui_fileinfo.c b/multimedia/audacious/files/patch-audacious-ui_fileinfo.c
deleted file mode 100644
index 21ca442eefca..000000000000
--- a/multimedia/audacious/files/patch-audacious-ui_fileinfo.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- audacious/ui_fileinfo.c.orig	Fri Dec  1 10:30:29 2006
-+++ audacious/ui_fileinfo.c	Fri Dec  1 11:14:37 2006
-@@ -101,6 +101,7 @@
- 	GdkPixbuf *pixbuf;
- 	int width, height;
- 	double aspect;
-+	GdkPixbuf *pixbuf2;
- 
- 	if (xml == NULL || widget == NULL)
- 		return;
-@@ -125,7 +126,7 @@
- 			height = cfg.filepopup_pixelsize;
- 			width = (int)(cfg.filepopup_pixelsize / aspect);
- 		}
--		GdkPixbuf *pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
-+		pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
- 		g_object_unref(G_OBJECT(pixbuf));
- 		pixbuf = pixbuf2;
- 	}
-@@ -154,6 +155,7 @@
- 	GdkPixbuf *pixbuf;
- 	int width, height;
- 	double aspect;
-+	GdkPixbuf *pixbuf2;
- 
- 	if (xml == NULL || widget == NULL)
- 		return;
-@@ -178,7 +180,7 @@
- 			height = cfg.filepopup_pixelsize;
- 			width = (int)(cfg.filepopup_pixelsize / aspect);
- 		}
--		GdkPixbuf *pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
-+		pixbuf2 = gdk_pixbuf_scale_simple(GDK_PIXBUF(pixbuf), width, height, GDK_INTERP_BILINEAR);
- 		g_object_unref(G_OBJECT(pixbuf));
- 		pixbuf = pixbuf2;
- 	}
diff --git a/multimedia/audacious/files/patch-audacious-ui_playlist.c b/multimedia/audacious/files/patch-audacious-ui_playlist.c
deleted file mode 100644
index bcc6fc5a2029..000000000000
--- a/multimedia/audacious/files/patch-audacious-ui_playlist.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- audacious/ui_playlist.c.orig	Fri Dec  1 14:28:04 2006
-+++ audacious/ui_playlist.c	Fri Dec  1 14:28:24 2006
-@@ -300,9 +300,10 @@
- gint
- playlistwin_get_height_unshaded(void)
- {
-+    gint height;
-     cfg.playlist_height /= PLAYLISTWIN_HEIGHT_SNAP;
-     cfg.playlist_height *= PLAYLISTWIN_HEIGHT_SNAP;
--    gint height = cfg.playlist_height;
-+    height = cfg.playlist_height;
-     return height;
- }
- 
diff --git a/multimedia/audacious/files/patch-audtool-audtool.c b/multimedia/audacious/files/patch-audtool-audtool.c
deleted file mode 100644
index 2d6714ce1f70..000000000000
--- a/multimedia/audacious/files/patch-audtool-audtool.c
+++ /dev/null
@@ -1,131 +0,0 @@
---- audtool/audtool.c.orig	Fri Dec  1 15:24:24 2006
-+++ audtool/audtool.c	Fri Dec  1 15:40:57 2006
-@@ -377,6 +377,8 @@
- 
- void playlist_delete(gint session, gint argc, gchar **argv)
- {
-+	gint playpos;
-+
- 	if (argc < 3)
- 	{
- 		g_print("%s: invalid parameters for playlist-delete.\n", argv[0]);
-@@ -384,7 +386,7 @@
- 		return;
- 	}
- 
--	gint playpos = atoi(argv[2]);
-+	playpos = atoi(argv[2]);
- 
- 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
- 	{
-@@ -406,6 +408,9 @@
- 
- void playlist_song(gint session, gint argc, gchar **argv)
- {
-+	gint playpos;
-+	gchar *song;
-+
- 	if (argc < 3)
- 	{
- 		g_print("%s: invalid parameters for playlist-song-title.\n", argv[0]);
-@@ -413,7 +418,7 @@
- 		return;
- 	}
- 
--	gint playpos = atoi(argv[2]);
-+	playpos = atoi(argv[2]);
- 
- 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
- 	{
-@@ -421,7 +426,7 @@
- 		return;
- 	}
- 
--	gchar *song = xmms_remote_get_playlist_title(session, playpos - 1);
-+	song = xmms_remote_get_playlist_title(session, playpos - 1);
- 
- 	g_print("%s\n", song);
- }
-@@ -429,6 +434,8 @@
- 
- void playlist_song_length(gint session, gint argc, gchar **argv)
- {
-+	gint playpos, frames, length;
-+
- 	if (argc < 3)
- 	{
- 		g_print("%s: invalid parameters for playlist-song-length.\n", argv[0]);
-@@ -436,7 +443,7 @@
- 		return;
- 	}
- 
--	gint playpos = atoi(argv[2]);
-+	playpos = atoi(argv[2]);
- 
- 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
- 	{
-@@ -444,14 +451,16 @@
- 		return;
- 	}
- 
--	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
--	gint length = frames / 1000;
-+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
-+	length = frames / 1000;
- 
- 	g_print("%d:%.2d\n", length / 60, length % 60);
- }
- 
- void playlist_song_length_seconds(gint session, gint argc, gchar **argv)
- {
-+	gint playpos, frames, length;
-+
- 	if (argc < 3)
- 	{
- 		g_print("%s: invalid parameters for playlist-song-length-seconds.\n", argv[0]);
-@@ -459,7 +468,7 @@
- 		return;
- 	}
- 
--	gint playpos = atoi(argv[2]);
-+	playpos = atoi(argv[2]);
- 
- 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
- 	{
-@@ -467,14 +476,16 @@
- 		return;
- 	}
- 
--	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
--	gint length = frames / 1000;
-+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
-+	length = frames / 1000;
- 
- 	g_print("%d\n", length);
- }
- 
- void playlist_song_length_frames(gint session, gint argc, gchar **argv)
- {
-+	gint playpos, frames;
-+
- 	if (argc < 3)
- 	{
- 		g_print("%s: invalid parameters for playlist-song-length-frames.\n", argv[0]);
-@@ -482,7 +493,7 @@
- 		return;
- 	}
- 
--	gint playpos = atoi(argv[2]);
-+	playpos = atoi(argv[2]);
- 
- 	if (playpos < 1 || playpos > xmms_remote_get_playlist_length(session))
- 	{
-@@ -490,7 +501,7 @@
- 		return;
- 	}
- 
--	gint frames = xmms_remote_get_playlist_time(session, playpos - 1);
-+	frames = xmms_remote_get_playlist_time(session, playpos - 1);
- 
- 	g_print("%d\n", frames);
- }
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 0d8c9348204c..7ec2e6ed67e7 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -2,28 +2,49 @@ bin/audacious
 bin/audtool
 include/audacious/beepctrl.h
 include/audacious/configdb.h
-include/audacious/dirbrowser.h
 include/audacious/formatter.h
+include/audacious/hook.h
+include/audacious/i18n.h
+include/audacious/id3tag.h
+include/audacious/input.h
+include/audacious/main.h
+include/audacious/output.h
+include/audacious/playlist.h
+include/audacious/playlist_container.h
 include/audacious/plugin.h
 include/audacious/rcfile.h
+include/audacious/strings.h
 include/audacious/titlestring.h
+include/audacious/ui_fileinfopopup.h
+include/audacious/ui_preferences.h
 include/audacious/util.h
 include/audacious/vfs.h
-include/audacious/input.h
-include/audacious/output.h
-include/audacious/xml_document.h
-include/audacious/prefswin.h
-include/audacious/xentry.h
+include/audacious/vfs_buffer.h
+include/audacious/vfs_buffered_file.h
 include/audacious/xconvert.h
-include/audacious/main.h
-include/audacious/playlist.h
-include/audacious/playlist_container.h
+lib/audacious/libaudid3tag.so
 lib/libaudacious.so
-lib/libaudacious.so.4
-lib/libaudacious.so.4.0.0
+lib/libaudacious.so.5
+lib/libaudacious.so.5.0.0
 libdata/pkgconfig/audacious.pc
 share/applications/audacious.desktop
-share/pixmaps/audacious.png
+%%DATADIR%%/Skins/Classic/balance.png
+%%DATADIR%%/Skins/Classic/cbuttons.png
+%%DATADIR%%/Skins/Classic/eq_ex.png
+%%DATADIR%%/Skins/Classic/eqmain.png
+%%DATADIR%%/Skins/Classic/main.png
+%%DATADIR%%/Skins/Classic/monoster.png
+%%DATADIR%%/Skins/Classic/nums_ex.png
+%%DATADIR%%/Skins/Classic/playpaus.png
+%%DATADIR%%/Skins/Classic/pledit.png
+%%DATADIR%%/Skins/Classic/pledit.txt
+%%DATADIR%%/Skins/Classic/posbar.png
+%%DATADIR%%/Skins/Classic/shufrep.png
+%%DATADIR%%/Skins/Classic/skin.hints
+%%DATADIR%%/Skins/Classic/text.png
+%%DATADIR%%/Skins/Classic/titlebar.png
+%%DATADIR%%/Skins/Classic/viscolor.txt
+%%DATADIR%%/Skins/Classic/volume.png
 %%DATADIR%%/Skins/Default/balance.png
 %%DATADIR%%/Skins/Default/cbuttons.png
 %%DATADIR%%/Skins/Default/eq_ex.png
@@ -41,57 +62,6 @@ share/pixmaps/audacious.png
 %%DATADIR%%/Skins/Default/titlebar.png
 %%DATADIR%%/Skins/Default/viscolor.txt
 %%DATADIR%%/Skins/Default/volume.png
-%%DATADIR%%/Skins/Classic/balance.png
-%%DATADIR%%/Skins/Classic/cbuttons.png
-%%DATADIR%%/Skins/Classic/eq_ex.png
-%%DATADIR%%/Skins/Classic/eqmain.png
-%%DATADIR%%/Skins/Classic/main.png
-%%DATADIR%%/Skins/Classic/monoster.png
-%%DATADIR%%/Skins/Classic/nums_ex.png
-%%DATADIR%%/Skins/Classic/playpaus.png
-%%DATADIR%%/Skins/Classic/pledit.png
-%%DATADIR%%/Skins/Classic/posbar.png
-%%DATADIR%%/Skins/Classic/shufrep.png
-%%DATADIR%%/Skins/Classic/text.png
-%%DATADIR%%/Skins/Classic/titlebar.png
-%%DATADIR%%/Skins/Classic/volume.png
-%%DATADIR%%/Skins/Classic/pledit.txt
-%%DATADIR%%/Skins/Classic/viscolor.txt
-%%DATADIR%%/Skins/Classic/skin.hints
-%%DATADIR%%/Skins/TinyPlayer/balance.png
-%%DATADIR%%/Skins/TinyPlayer/cbuttons.png
-%%DATADIR%%/Skins/TinyPlayer/eq_ex.png
-%%DATADIR%%/Skins/TinyPlayer/eqmain.png
-%%DATADIR%%/Skins/TinyPlayer/main.png
-%%DATADIR%%/Skins/TinyPlayer/monoster.png
-%%DATADIR%%/Skins/TinyPlayer/nums_ex.png
-%%DATADIR%%/Skins/TinyPlayer/playpaus.png
-%%DATADIR%%/Skins/TinyPlayer/pledit.png
-%%DATADIR%%/Skins/TinyPlayer/posbar.png
-%%DATADIR%%/Skins/TinyPlayer/shufrep.png
-%%DATADIR%%/Skins/TinyPlayer/text.png
-%%DATADIR%%/Skins/TinyPlayer/titlebar.png
-%%DATADIR%%/Skins/TinyPlayer/volume.png
-%%DATADIR%%/Skins/TinyPlayer/pledit.txt
-%%DATADIR%%/Skins/TinyPlayer/viscolor.txt
-%%DATADIR%%/Skins/TinyPlayer/skin.hints
-%%DATADIR%%/Skins/Osmosis/balance.png
-%%DATADIR%%/Skins/Osmosis/cbuttons.png
-%%DATADIR%%/Skins/Osmosis/eq_ex.png
-%%DATADIR%%/Skins/Osmosis/eqmain.png
-%%DATADIR%%/Skins/Osmosis/main.png
-%%DATADIR%%/Skins/Osmosis/monoster.png
-%%DATADIR%%/Skins/Osmosis/nums_ex.png
-%%DATADIR%%/Skins/Osmosis/playpaus.png
-%%DATADIR%%/Skins/Osmosis/pledit.png
-%%DATADIR%%/Skins/Osmosis/posbar.png
-%%DATADIR%%/Skins/Osmosis/shufrep.png
-%%DATADIR%%/Skins/Osmosis/text.png
-%%DATADIR%%/Skins/Osmosis/titlebar.png
-%%DATADIR%%/Skins/Osmosis/volume.png
-%%DATADIR%%/Skins/Osmosis/pledit.txt
-%%DATADIR%%/Skins/Osmosis/viscolor.txt
-%%DATADIR%%/Skins/Osmosis/skin.hints
 %%DATADIR%%/Skins/Ivory/balance.png
 %%DATADIR%%/Skins/Ivory/cbuttons.png
 %%DATADIR%%/Skins/Ivory/eq_ex.png
@@ -101,28 +71,65 @@ share/pixmaps/audacious.png
 %%DATADIR%%/Skins/Ivory/nums_ex.png
 %%DATADIR%%/Skins/Ivory/playpaus.png
 %%DATADIR%%/Skins/Ivory/pledit.png
+%%DATADIR%%/Skins/Ivory/pledit.txt
 %%DATADIR%%/Skins/Ivory/posbar.png
 %%DATADIR%%/Skins/Ivory/shufrep.png
+%%DATADIR%%/Skins/Ivory/skin.hints
 %%DATADIR%%/Skins/Ivory/text.png
 %%DATADIR%%/Skins/Ivory/titlebar.png
-%%DATADIR%%/Skins/Ivory/volume.png
-%%DATADIR%%/Skins/Ivory/pledit.txt
 %%DATADIR%%/Skins/Ivory/viscolor.txt
-%%DATADIR%%/Skins/Ivory/skin.hints
-%%DATADIR%%/glade/addfiles.glade
-%%DATADIR%%/glade/prefswin.glade
+%%DATADIR%%/Skins/Ivory/volume.png
+%%DATADIR%%/Skins/Osmosis/balance.png
+%%DATADIR%%/Skins/Osmosis/cbuttons.png
+%%DATADIR%%/Skins/Osmosis/eq_ex.png
+%%DATADIR%%/Skins/Osmosis/eqmain.png
+%%DATADIR%%/Skins/Osmosis/main.png
+%%DATADIR%%/Skins/Osmosis/monoster.png
+%%DATADIR%%/Skins/Osmosis/nums_ex.png
+%%DATADIR%%/Skins/Osmosis/playpaus.png
+%%DATADIR%%/Skins/Osmosis/pledit.png
+%%DATADIR%%/Skins/Osmosis/pledit.txt
+%%DATADIR%%/Skins/Osmosis/posbar.png
+%%DATADIR%%/Skins/Osmosis/shufrep.png
+%%DATADIR%%/Skins/Osmosis/skin.hints
+%%DATADIR%%/Skins/Osmosis/text.png
+%%DATADIR%%/Skins/Osmosis/titlebar.png
+%%DATADIR%%/Skins/Osmosis/viscolor.txt
+%%DATADIR%%/Skins/Osmosis/volume.png
+%%DATADIR%%/Skins/TinyPlayer/balance.png
+%%DATADIR%%/Skins/TinyPlayer/cbuttons.png
+%%DATADIR%%/Skins/TinyPlayer/eq_ex.png
+%%DATADIR%%/Skins/TinyPlayer/eqmain.png
+%%DATADIR%%/Skins/TinyPlayer/main.png
+%%DATADIR%%/Skins/TinyPlayer/monoster.png
+%%DATADIR%%/Skins/TinyPlayer/nums_ex.png
+%%DATADIR%%/Skins/TinyPlayer/playpaus.png
+%%DATADIR%%/Skins/TinyPlayer/pledit.png
+%%DATADIR%%/Skins/TinyPlayer/pledit.txt
+%%DATADIR%%/Skins/TinyPlayer/posbar.png
+%%DATADIR%%/Skins/TinyPlayer/shufrep.png
+%%DATADIR%%/Skins/TinyPlayer/skin.hints
+%%DATADIR%%/Skins/TinyPlayer/text.png
+%%DATADIR%%/Skins/TinyPlayer/titlebar.png
+%%DATADIR%%/Skins/TinyPlayer/viscolor.txt
+%%DATADIR%%/Skins/TinyPlayer/volume.png
 %%DATADIR%%/glade/fileinfo.glade
-%%DATADIR%%/glade/fileinfo_popup.glade
+%%DATADIR%%/glade/prefswin.glade
 %%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/appearance.png
+%%DATADIR%%/images/audacious_player.xpm
+%%DATADIR%%/images/audio.png
+%%DATADIR%%/images/connectivity.png
 %%DATADIR%%/images/eq.png
 %%DATADIR%%/images/mouse.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
-%%DATADIR%%/images/audio.png
-%%DATADIR%%/images/connectivity.png
-%%DATADIR%%/images/audacious_player.xpm
+%%DATADIR%%/ui/equalizer.ui
+%%DATADIR%%/ui/mainwin.ui
+%%DATADIR%%/ui/playlist.ui
+%%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
@@ -131,6 +138,7 @@ share/pixmaps/audacious.png
 %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/hi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
@@ -144,21 +152,27 @@ share/pixmaps/audacious.png
 %%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sr@Latn/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/glade
+share/pixmaps/audacious.png
 @dirrm %%DATADIR%%/Skins/Classic
 @dirrm %%DATADIR%%/Skins/Default
-@dirrm %%DATADIR%%/Skins/TinyPlayer
-@dirrm %%DATADIR%%/Skins/Osmosis
 @dirrm %%DATADIR%%/Skins/Ivory
+@dirrm %%DATADIR%%/Skins/Osmosis
+@dirrm %%DATADIR%%/Skins/TinyPlayer
 @dirrm %%DATADIR%%/Skins
-@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%/glade
+@dirrmtry %%DATADIR%%/images
+@dirrm %%DATADIR%%/ui
+@dirrmtry %%DATADIR%%
 @dirrm include/audacious
+@dirrmtry lib/audacious
 @dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/br/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/br
+%%NLS%%@dirrmtry share/locale/sr@Latn/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@Latn
 @dirrmtry share/pixmaps