6 files changed, 111 insertions, 270 deletions

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