welcome audacious 1.4!

18 files changed, 513 insertions, 261 deletions

diff --git a/audio/audacious-crossfade/Makefile b/audio/audacious-crossfade/Makefile
index 531dff7bbc94..6c5af8ab76fb 100644
--- a/audio/audacious-crossfade/Makefile
+++ b/audio/audacious-crossfade/Makefile
@@ -6,8 +6,8 @@
 #
 
 APP=		audacious
-LIB_DEPENDS=	audacious.5:${PORTSDIR}/multimedia/audacious
-BUILD_DEPENDS=	${LOCALBASE}/lib/audacious/General/libalarm.so:${PORTSDIR}/multimedia/audacious-plugins
+LIB_DEPENDS=	audclient.1:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	${LOCALBASE}/lib/audacious/General/alarm.so:${PORTSDIR}/multimedia/audacious-plugins
 CPPFLAGS+=	-I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/include/gtk-2.0 \
 		-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/pango-1.0 \
 		-I${LOCALBASE}/include/atk-1.0
diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index 1a8c9f2f090a..8d0d3c88a40b 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	audacious-dumb
-PORTVERSION=	0.42
+PORTVERSION=	0.56
 CATEGORIES=	audio
 MASTER_SITES=	http://www.netswarm.net/misc/ \
 		http://critical.ch/distfiles/ \
diff --git a/audio/audacious-dumb/distinfo b/audio/audacious-dumb/distinfo
index 53f259dc4a71..bca93e30393f 100644
--- a/audio/audacious-dumb/distinfo
+++ b/audio/audacious-dumb/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-dumb-0.42.tar.gz) = 66adaf700fc6d01f2137ff2ff19297ff
-SHA256 (audacious-dumb-0.42.tar.gz) = 29e53a22a6c907e01a669a40be97f7cd39c8a0efa267e93b1defb45bb793ec53
-SIZE (audacious-dumb-0.42.tar.gz) = 21599
+MD5 (audacious-dumb-0.56.tar.gz) = cb8af12661523304c7e1d2455af42ca6
+SHA256 (audacious-dumb-0.56.tar.gz) = cb30bb991284b929e235f24fc41df9720522288e90c5735fd97c1d3f6ab27750
+SIZE (audacious-dumb-0.56.tar.gz) = 22633
diff --git a/audio/audacious-dumb/files/patch-Makefile b/audio/audacious-dumb/files/patch-Makefile
index da90b90183e3..98832e186b01 100644
--- a/audio/audacious-dumb/files/patch-Makefile
+++ b/audio/audacious-dumb/files/patch-Makefile
@@ -1,15 +1,15 @@
---- ./Makefile.orig	Wed Feb 28 13:01:40 2007
-+++ ./Makefile	Wed May 30 10:34:31 2007
+--- Makefile.orig	2007-10-28 19:36:45.000000000 +0100
++++ Makefile	2007-11-28 15:07:03.000000000 +0100
 @@ -7,7 +7,7 @@
  CC ?= gcc
  CFLAGS ?= -O2 -pipe
  
 -CFLAGS += -Wall -fPIC -DPIC -I/usr/local/include
 +CFLAGS += -Wall -fPIC -DPIC -I$(LOCALBASE)/include
- AUDACIOUSCFLAGS = $(shell pkg-config 'audacious >= 1.3' --cflags || echo "old")
+ AUDACIOUSCFLAGS = $(shell pkg-config 'audacious >= 1.4' --cflags || echo "old")
  
  ifeq ($(AUDACIOUSCFLAGS),old)
-@@ -16,6 +16,8 @@
+@@ -17,6 +17,8 @@
  CFLAGS += $(AUDACIOUSCFLAGS)
  endif
  
@@ -18,7 +18,7 @@
  DUMBLIBS := -ldumb -L/usr/local/lib
  AUDACIOUSLIBS := $(shell pkg-config audacious --libs) 
  
-@@ -24,13 +26,9 @@
+@@ -25,13 +27,9 @@
  OBJECTS := $(SOURCES:%.c=$(OBJDIR)/%.o)
  
  all:	$(PLUGIN_FILE)
diff --git a/audio/audacious-mac/Makefile b/audio/audacious-mac/Makefile
index 700e44de5079..ec5eb192966e 100644
--- a/audio/audacious-mac/Makefile
+++ b/audio/audacious-mac/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	audacious-mac
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.10
 CATEGORIES=	audio
 MASTER_SITES=	http://www.netswarm.net/misc/
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Audacious plugin that support the Monkey's Audio lossless formats
 
-LIB_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
+LIB_DEPENDS=	audclient.1:${PORTSDIR}/multimedia/audacious \
 		mac.2:${PORTSDIR}/audio/mac
 
 USE_GMAKE=	yes
@@ -22,6 +22,5 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include/"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CXXFLAGS = @CXXFLAGS@|CXXFLAGS = @CXXFLAGS@ -lmac|' ${WRKSRC}/src/Makefile.in
-	${CP} ${PATCHDIR}/url2filename.cpp ${WRKSRC}/src/
 
 .include <bsd.port.mk>
diff --git a/audio/audacious-mac/distinfo b/audio/audacious-mac/distinfo
index d958f8ee49bd..f3418adcf85c 100644
--- a/audio/audacious-mac/distinfo
+++ b/audio/audacious-mac/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-mac-0.2.0.tar.gz) = ec997e0a3721717bf4b78d80e38dcb77
-SHA256 (audacious-mac-0.2.0.tar.gz) = e85f33bc50671d9e6a64563dbf4ec36b164a3d3db2130ad75b99195f67d5af84
-SIZE (audacious-mac-0.2.0.tar.gz) = 319835
+MD5 (audacious-mac-0.3.10.tar.gz) = 94cb1a1dd73ca9a90c2c2cf4cea95361
+SHA256 (audacious-mac-0.3.10.tar.gz) = 1ead27cae4126a03789a8891d1fbfa058a94e590d744d00ee34400ed1a9f9cf9
+SIZE (audacious-mac-0.3.10.tar.gz) = 323358
diff --git a/audio/audacious-mac/files/patch-src-common.h b/audio/audacious-mac/files/patch-src-common.h
deleted file mode 100644
index 62fac9317716..000000000000
--- a/audio/audacious-mac/files/patch-src-common.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/common.h	Sat Apr  9 20:06:20 2005
-+++ src/common.h	Sun Jun 24 06:03:13 2007
-@@ -3,3 +3,5 @@
- #include <libintl.h>
- 
- #define _(String) gettext (String)
-+
-+#include "url2filename.cpp"
diff --git a/audio/audacious-mac/files/patch-src-fileinfo.cpp b/audio/audacious-mac/files/patch-src-fileinfo.cpp
deleted file mode 100644
index a7849c28f477..000000000000
--- a/audio/audacious-mac/files/patch-src-fileinfo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/fileinfo.cpp	Fri Apr 15 16:56:44 2005
-+++ src/fileinfo.cpp	Sun Jun 24 06:02:55 2007
-@@ -778,7 +778,7 @@
- void mac_file_info_box(char *filename)
- {
-     char *title;
--
-+    url2filename(filename);
-     int nRetVal;
-     wchar_t *pUTF16Name;
- 
diff --git a/audio/audacious-mac/files/patch-src-mac.cpp b/audio/audacious-mac/files/patch-src-mac.cpp
deleted file mode 100644
index aa86059c575e..000000000000
--- a/audio/audacious-mac/files/patch-src-mac.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/mac.cpp	Thu Feb  1 02:46:26 2007
-+++ src/mac.cpp	Sun Jun 24 06:02:16 2007
-@@ -146,7 +146,7 @@
- 
- static int decompress_init(InputPlayback *playback)
- {
--    char *filename = playback->filename;
-+    char *filename = url2filename(playback->filename);
- 
-     int nRetVal;
- 
-@@ -386,6 +386,7 @@
- 
- void mac_get_song_info(char *filename, char **title, int *length)
- {
-+    url2filename(filename);
-     int nRetVal = 0;
- 
-     if (filename == NULL)
diff --git a/audio/audacious-mac/files/url2filename.cpp b/audio/audacious-mac/files/url2filename.cpp
deleted file mode 100644
index 060987481306..000000000000
--- a/audio/audacious-mac/files/url2filename.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Under Gnome, drag file into the playlist will pass a URL as filename (like file:///tmp/url%20encoded.ape)
-The plugin cannot cope with URL originally, and this is the patch.
-
--buganini@gmail.com
-*/
-
-#include "string.h"
-
-static char *url2filename(char *url){
-	unsigned char *rpt,*wpt;
-	char flag=0;
-	unsigned char table[128]={0};
-	
-	if(strncmp(url,"file://",7)!=0){
-		return url;
-	}
-	table[(unsigned char)'0']=0;
-	table[(unsigned char)'1']=1;
-	table[(unsigned char)'2']=2;
-	table[(unsigned char)'3']=3;
-	table[(unsigned char)'4']=4;
-	table[(unsigned char)'5']=5;
-	table[(unsigned char)'6']=6;
-	table[(unsigned char)'7']=7;
-	table[(unsigned char)'8']=8;
-	table[(unsigned char)'9']=9;
-	table[(unsigned char)'a']=table[(unsigned char)'A']=10;
-	table[(unsigned char)'b']=table[(unsigned char)'B']=11;
-	table[(unsigned char)'c']=table[(unsigned char)'C']=12;
-	table[(unsigned char)'d']=table[(unsigned char)'D']=13;
-	table[(unsigned char)'e']=table[(unsigned char)'E']=14;
-	table[(unsigned char)'f']=table[(unsigned char)'F']=15;
-
-	rpt=wpt=(unsigned char*)url;
-	rpt+=7;
-        while(*rpt!=0){
-                if(flag==0){
-                        if(*rpt=='%'){
-                                flag=1;
-                        }else{
-                                *wpt=*rpt;
-                                ++wpt;
-                        }
-                }else if(flag==1){
-                        *wpt=table[*rpt]<<4;
-                        flag=2;
-                }else if(flag==2){
-                        *wpt|=table[*rpt];
-                        ++wpt;
-                        flag=0;
-                }
-                ++rpt;
-        }
-        *wpt=0;
-        return url;
-}
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index d01b5e8a4f02..af158cac371d 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTVERSION=	1.4.5
 CATEGORIES=	multimedia audio
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://static.audacious-media-player.org/release/
-MASTER_SITE_SUBDIR=oliver
+MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Plugins needed for audacious
 
 BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
-LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl
 		
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -27,8 +23,9 @@ CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include" \
 		CPP=${CPP}
 CONFIGURE_ARGS=	--disable-evdevplug --disable-alsa --disable-amidiplug \
-		--disable-pulse --disable-projectm
+		--disable-pulse --disable-projectm --disable-projectm-1.0
 WANT_GNOME=	yes
+WANT_EFL=	yes
 WANT_SDL=	yes
 
 PORTDOCS=	AUTHORS ChangeLog NEWS
@@ -38,12 +35,15 @@ PORTDOCS=	AUTHORS ChangeLog NEWS
 #		COREAUDIO	"Enable CoreAudio output plugin"	off \
 #		PROJECTM	"Enable projectM vis plugin"		off \
 
-OPTIONS=	ESOUND		"Enable Esound output output"		off \
+OPTIONS=	AUDIOCD		"Enable audiocd plugin"			off \
+		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  \
+		AOSDXCOMP	"Enable X11 Audacious OSD X Composite Support" on  \
+		ROOTVIS		"Enable X11 RootWindow vis plugin"      on  \
 		ADPLUG		"Enable AdPlug plugin"			off \
 		VORBIS		"Enable Ogg Vorbis input plugin"	off \
 		WAVPACK 	"Enable WavPack input plugin"		off \
@@ -56,17 +56,28 @@ OPTIONS=	ESOUND		"Enable Esound output output"		off \
 		ARTS		"Enable arts output plugin"		off \
 		SID		"Enable sid input plugin"		off \
 		OSS		"Enable OSS output plugin"		on  \
-		TIMIDITY	"Enable timidity plugin"		on  \
+		TIMIDITY	"Enable timidity plugin"		off \
+		CDAUDIO		"Enable cdaudio-ng input plugin"        on  \
+		NEON		"Enable neon support (experimental)"    on  \
 		MMS		"Enable mms support"			off \
+		MTP		"Enable MTP upload support"             off \
 		PARANORMAL	"Enable paranormal vis plugin"		on  \
 		XSPF		"Enable XSPF support"			on  \
 		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_AUDIOCD)
+LIB_DEPENDS+=   cdio.7:${PORTSDIR}/sysutils/libcdio
+CONFIGURE_ARGS+=--enable-cdaudio
+PLIST_SUB+=     AUDIOCDPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-cdaudio
+PLIST_SUB+=     AUDIOCDPLUGIN="@comment "
+.endif
+
 .if defined(WITH_ESOUND)
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-esd
@@ -98,6 +109,15 @@ CONFIGURE_ARGS+=--disable-rocklight
 PLIST_SUB+=	ROCKLIGHTPLUGIN="@comment "
 .endif
 
+.if !defined(WITHOUT_ROOTVIS)
+USE_EFL=	imlib2
+CONFIGURE_ARGS+=--enable-rootvis
+PLIST_SUB+=	ROOTPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-rootvis
+PLIST_SUB+=	ROOTPLUGIN="@comment "
+.endif
+
 .if defined(WITH_LIRC)
 LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
 CONFIGURE_ARGS+=--enable-lirc
@@ -125,6 +145,15 @@ CONFIGURE_ARGS+=--disable-aosd
 PLIST_SUB+=	AOSDPLUGIN="@comment "
 .endif
 
+.if !defined(WITHOUT_AOSDXCOMP)
+LIB_DEPENDS+=	Xcomposite.1:${PORTSDIR}/x11/libXcomposite
+CONFIGURE_ARGS+=--enable-aosd-xcomp
+PLIST_SUB+=	AOSDXCOMPPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-aosd-xcomp
+PLIST_SUB+=	AOSDXCOMPPLUGIN="@comment "
+.endif
+
 .if defined(WITH_ADPLUG)
 LIB_DEPENDS+=	binio.1:${PORTSDIR}/devel/libbinio
 CONFIGURE_ARGS+=--enable-adplug
@@ -136,14 +165,22 @@ PLIST_SUB+=	ADPLUGPLUGIN="@comment "
 
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=--enable-vorbis --enable-flac	# it uses an internal flac-lib copy
+CONFIGURE_ARGS+=--enable-vorbis
 PLIST_SUB+=	VORBISPLUGIN=""
-CFLAGS+=	-I. -I../libflac -Ilibflac	# to not use system flac if it is installed
 .else
-CONFIGURE_ARGS+=--disable-vorbis --disable-flac
+CONFIGURE_ARGS+=--disable-vorbis
 PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
+.if defined(WITH_FLAC)
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=--enable-flacng --enable-filewriter_flac
+PLIST_SUB+=	FLACPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-flacng --disable-filewriter_flac
+PLIST_SUB+=	FLACPLUGIN="@comment "
+.endif
+
 .if defined(WITH_WAVPACK)
 LIB_DEPENDS+=	wavpack.1:${PORTSDIR}/audio/wavpack
 CONFIGURE_ARGS+=--enable-wavpack
@@ -198,7 +235,8 @@ PLIST_SUB+=	WMAPLUGIN="@comment "
 .endif
 
 .if defined(WITH_JACK)
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack \
+		samplerate.1:${PORTSDIR}/audio/libsamplerate
 CONFIGURE_ARGS+=--enable-jack
 PLIST_SUB+=	JACKPLUGIN=""
 .else
@@ -240,13 +278,34 @@ CONFIGURE_ARGS+=--disable-timidity
 PLIST_SUB+=	TIMIDITYPLUGIN="@comment "
 .endif
 
-.if !defined(WITHOUT_PARANORMAL)
-CONFIGURE_ARGS+=--enable-paranormal --disable-mms
-PLIST_SUB+=	PARANORMALPLUGIN="" MMSPLUGIN="@comment "
-USE_SDL=	sdl
+.if defined(WITH_CDAUDIO)
+LIB_DEPENDS+=	cdio.7:${PORTSDIR}/sysutils/libcdio \
+		cddb.4:${PORTSDIR}/audio/libcddb
+CONFIGURE_ARGS+=--enable-cdaudio
+PLIST_SUB+=	CDAUDIOPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-cdaudio
+PLIST_SUB+=	CDAUDIOPLUGIN="@comment "
+.endif
+
+.if defined(WITH_PARANORMAL)
+CONFIGURE_ARGS+=--enable-paranormal
+PLIST_SUB+=	PARANORMALPLUGIN=""
+USE_SDL+=	sdl
 .else
 CONFIGURE_ARGS+=--disable-paranormal
 PLIST_SUB+=	PARANORMALPLUGIN="@comment "
+.endif
+
+.if !defined(WITHOUT_NEON)
+LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon
+CONFIGURE_ARGS+=--enable-neon
+PLIST_SUB+=	NEONPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-neon
+PLIST_SUB+=	NEONPLUGIN="@comment "
+.endif
+
 .if defined(WITH_MMS)
 LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
 CONFIGURE_ARGS+=--enable-mms
@@ -255,6 +314,14 @@ PLIST_SUB+=	MMSPLUGIN=""
 CONFIGURE_ARGS+=--disable-mms
 PLIST_SUB+=	MMSPLUGIN="@comment "
 .endif
+
+.if defined(WITH_MTP)
+LIB_DEPENDS+=	mtp.6:${PORTSDIR}/audio/libmtp
+CONFIGURE_ARGS+=--enable-mtp_up
+PLIST_SUB+=	MTPPLUGIN=""
+.else
+CONFIGURE_ARGS+=--disable-mtp_up
+PLIST_SUB+=	MTPPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_XSPF)
@@ -274,15 +341,6 @@ CONFIGURE_ARGS+=--disable-tta
 PLIST_SUB+=	TTAPLUGIN="@comment "
 .endif
 
-.if defined(WITH_LAME)
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-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
@@ -297,8 +355,30 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+pre-everything::
+.if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Make sure you select the PARANOIA option when installing libcdio!"
+	@${ECHO_CMD} ""
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|$$EGREP|egrep|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$EGREP|egrep|g; \
+		s| -ldl||g' ${WRKSRC}/configure
+##cpp complains about to many input files otherwise:
+#.for i in console sexypsf alac vtx madplug adplug vorbis flacng wavpack aac modplug wma sid timidity tta esd jack OSS filewriter audiocompress cdaudio-ng
+#		@${ECHO} ' ' > ${WRKSRC}/src/${i}/.deps
+#.endfor
+
+pre-configure:
+.if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "sysutils/libcdio got not installed with PARANOIA enabled!"
+	@${ECHO_CMD} "To use the audiocd option you have to install libcdio with"
+	@${ECHO_CMD} "PARANOIA support! So please reinstall it properly."
+	@${ECHO_CMD} ""
+	@exit 1
+.endif
 
 post-install:
 .if defined(WITH_GNOME)
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index b713f3d97173..fd29611853d3 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-plugins-1.3.5.tgz) = ff6b5901367337f8149e15c8fb1fdf95
-SHA256 (audacious-plugins-1.3.5.tgz) = aae72d89135e7989b2149d51a1ed3fba2d2b8293c4852e2d6bf8eacb79113f70
-SIZE (audacious-plugins-1.3.5.tgz) = 2983930
+MD5 (audacious-plugins-1.4.5.tgz) = ecb7802c1800ed2b10b44e7e9fea46aa
+SHA256 (audacious-plugins-1.4.5.tgz) = 5ffe377f6df0b701c8a7de7bb63c1ba1951b0a1b0f95a8841765b39204e64d07
+SIZE (audacious-plugins-1.4.5.tgz) = 3176785
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 30b93743d804..3a0c7bf1d98f 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,105 +1,106 @@
 %%ARTSPLUGIN%%bin/audacious-arts-helper
-lib/audacious/Container/libm3u.so
-lib/audacious/Container/libpls.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/libsndstretch.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/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/libcuesheet.so
-%%VORBISPLUGIN%%lib/audacious/Input/libflac.so
-%%MP3PLUGIN%%lib/audacious/Input/libmadplug.so
-lib/audacious/Input/libmetronom.so
-%%MODPLUG%%lib/audacious/Input/libmodplug.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
-%%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
-%%PARANORMALPLUGIN%%share/audacious-plugins/paranormal/Presets/aerdan_-_bloody_vortex.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape2.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_dancing_snow.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_portal_to_hell.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_telestatic.pnv
-share/audacious-plugins/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_3d_wave.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_beatscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_branchscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_bumblebees.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_cubism.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_interlaced.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_kaliedoscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_phosphor_flame.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_purple_flower.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_quakingscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_quasar.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_retroscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_rush.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_scopefun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_smoke.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_swarm.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_transform_fun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_trapped.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_tunnel_vision.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_value_replace_fun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_worms.pnv
-share/audacious-plugins/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+lib/audacious/Container/m3u.so
+lib/audacious/Container/pls.so
+%%XSPFPLUGIN%%lib/audacious/Container/xspf.so
+lib/audacious/Effect/audiocompress.so
+lib/audacious/Effect/ladspa.so
+lib/audacious/Effect/echo.so
+lib/audacious/Effect/sndstretch.so
+lib/audacious/Effect/stereo.so
+lib/audacious/Effect/voice_removal.so
+lib/audacious/General/alarm.so
+%%AOSDPLUGIN%%lib/audacious/General/aosd.so
+lib/audacious/General/gnomeshortcuts.so
+lib/audacious/General/hotkey.so
+%%LIRCPLUGIN%%lib/audacious/General/lirc.so
+lib/audacious/General/song_change.so
+lib/audacious/General/statusicon.so
+%%AACPLUGIN%%lib/audacious/Input/aac.so
+%%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
+lib/audacious/Input/alac.so
+%%AUDIOCDPLUGIN%%lib/audacious/Input/cdaudio-ng.so
+lib/audacious/Input/console.so
+lib/audacious/Input/cuesheet.so
+%%VORBISPLUGIN%%lib/audacious/Input/flacng.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
+%%MPCPLUGIN%%lib/audacious/Input/musepack.so
+lib/audacious/Input/sexypsf.so
+%%SIDPLUGIN%%lib/audacious/Input/sid.so
+%%TIMIDITYPLUGIN%%lib/audacious/Input/timidity.so
+lib/audacious/Input/tonegen.so
+%%TTAPLUGIN%%lib/audacious/Input/tta.so
+%%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
+lib/audacious/Input/vtx.so
+lib/audacious/Input/wav.so
+%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
+%%WMAPLUGIN%%lib/audacious/Input/wma.so
+%%OSSPLUGIN%%lib/audacious/Output/OSS.so
+%%ESDPLUGIN%%lib/audacious/Output/ESD.so
+%%ARTSPLUGIN%%lib/audacious/Output/arts.so
+lib/audacious/Output/filewriter.so
+lib/audacious/Output/null.so
+%%NEONPLUGIN%%lib/audacious/Transport/neon.so
+lib/audacious/Transport/stdio.so
+lib/audacious/Visualization/blur_scope.so
+%%PARANORMALPLUGIN%%lib/audacious/Visualization/paranormal.so
+%%ROCKLIGHTPLUGIN%%lib/audacious/Visualization/rocklight.so
+%%ROOTPLUGIN%%lib/audacious/Visualization/rootvis.so
+lib/audacious/Visualization/spectrum.so
+share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv
+share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv
+share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv
+share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv
+share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv
+share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
+share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv
+share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
+share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv
+share/audacious/paranormal/Presets/nenolod_-_cubism.pnv
+share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
+share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv
+share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv
+share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
+share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv
+share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_quasar.pnv
+share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_rush.pnv
+share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv
+share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
+share/audacious/paranormal/Presets/nenolod_-_smoke.pnv
+share/audacious/paranormal/Presets/nenolod_-_swarm.pnv
+share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
+share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv
+share/audacious/paranormal/Presets/nenolod_-_trapped.pnv
+share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
+share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
+share/audacious/paranormal/Presets/nenolod_-_worms.pnv
+share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+%%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
 %%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/fr/LC_MESSAGES/audacious-plugins.mo
 %%NLS%%share/locale/ja/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/tr/LC_MESSAGES/audacious-plugins.mo
-share/audacious/images/audioscrobbler.png
-share/audacious/images/audioscrobbler_badge.png
-@dirrm include/audacious-plugins
+@dirrm lib/audacious/Effect
 @dirrm lib/audacious/Container
-@dirrm lib/audacious/Visualization
-@dirrm lib/audacious/Output
-@dirrm lib/audacious/Input
 @dirrm lib/audacious/General
-@dirrm lib/audacious/Effect
+@dirrm lib/audacious/Input
+@dirrm lib/audacious/Output
+@dirrm lib/audacious/Transport
+@dirrm lib/audacious/Visualization
 @dirrmtry lib/audacious
-%%PARANORMALPLUGIN%%@dirrm share/audacious-plugins/paranormal/Presets
-%%PARANORMALPLUGIN%%@dirrm share/audacious-plugins/paranormal
-%%PARANORMALPLUGIN%%@dirrm share/audacious-plugins
+%%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal/Presets
+%%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal
+@dirrmtry share/audacious
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index a0e62a79b180..dc7c61dbbb35 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	multimedia audio
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://static.audacious-media-player.org/release/
+MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
-EXTRACT_SUFX=.tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A media player based on BMP and XMMS
@@ -27,21 +25,37 @@ CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 
 MAN1=		audacious.1 audtool.1
 
-LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs
+LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs \
+		mowgli.1:${PORTSDIR}/devel/libmowgli
 
-PORTDOCS=	README AUTHORS ChangeLog NEWS
+PORTDOCS=	README AUTHORS NEWS
 
 OPTIONS=	CHARSET	"Build with automatic charset detection" off \
+		DBUS	"Build with dbus support" on \
 		GNOME	"Build with gconf support" off \
 		NLS	"Native Language Support" on \
-		XML	"Build with xml support" on
+		XML	"Build with xml support" on \
+		EXECINFO "Build with libexecinfo support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CHARSET_DETECTION)
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+PLIST_SUB+=	WITH_DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	WITH_DBUS="@comment "
+.endif
+
+.if defined(WITH_CHARSET)
 CONFIGURE_ARGS+=--enable-chardet
 .endif
 
+.if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
+LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+.endif
+
 .if defined(WITH_GNOME)
 USE_GNOME+=	gconf2
 CONFIGURE_ARGS+=--enable-gconf
@@ -63,12 +77,20 @@ CONFIGURE_ARGS+=--with-xml-prefix=/
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(LIBDIR)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|datarootdir}/man|prefix}/man|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-c |--check-format --check-domain |g' \
-		${WRKSRC}/po/Makefile.in.in
+# otherwise LIBDIR gets overwritten in tinderbox with /usr/lib from bsd.own.mk
+	@${REINPLACE_CMD} 's|LIBDIR|_LIBDIR|g' \
+		${WRKSRC}/buildsys.mk.in \
+		${WRKSRC}/configure \
+		${WRKSRC}/m4/buildsys.m4 \
+		${WRKSRC}/src/libid3tag/Makefile
+	@${REINPLACE_CMD} 's|+= $${LIB_CPPFLAGS} -I..|= -I.. $${LIB_CPPFLAGS}|' \
+		${WRKSRC}/src/libid3tag/Makefile
+.if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
+	@${REINPLACE_CMD} 's|-laudclient$$|& -L${LOCALBASE}/lib -lexecinfo|' \
+		${WRKSRC}/src/audacious/Makefile
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 19bd87b17570..0aa69bf3dc31 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.3.2.tgz) = b784a30604a2f9d84e9da310069f43f9
-SHA256 (audacious-1.3.2.tgz) = ccc8a190d6e9b5f603bae55fc642ddb26fab285b5e76704592b7e95d82feeeef
-SIZE (audacious-1.3.2.tgz) = 1730554
+MD5 (audacious-1.4.6.tgz) = 51c828b34300b592c363e6f441312898
+SHA256 (audacious-1.4.6.tgz) = 5d88d509beb7d5ca7fcf226cf89a3d9ff4efff2095810631106398926f0f67b2
+SIZE (audacious-1.4.6.tgz) = 1836978
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
new file mode 100644
index 000000000000..18c265547949
--- /dev/null
+++ b/multimedia/audacious/files/patch-src-audacious-Makefile
@@ -0,0 +1,49 @@
+--- src/audacious/Makefile.orig	2007-11-19 03:02:02.000000000 +0100
++++ src/audacious/Makefile	2007-11-26 19:04:28.000000000 +0100
+@@ -157,15 +157,8 @@
+ 
+ include ../../buildsys.mk
+ 
+-ifdef USE_DBUS
+-CPPFLAGS += -I../libaudclient
+-DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
+-LIBS += -L../libaudclient -laudclient
+-endif
+-
+-pre-depend: ${DBUS_BINDINGS}
+-
+-CPPFLAGS += -DHAVE_CONFIG_H		\
++CPPFLAGS =  -I.. -I../..		\
++	    -DHAVE_CONFIG_H		\
+ 	    ${MOWGLI_CFLAGS}		\
+ 	    ${GTK_CFLAGS}		\
+ 	    ${LIBGLADE_CFLAGS}		\
+@@ -176,10 +169,11 @@
+ 	    ${REGEX_CFLAGS}		\
+ 	    ${LIBMCS_CFLAGS}		\
+ 	    -D_AUDACIOUS_CORE		\
+-	    -I.. -I../..		\
+ 	    -I./intl
+ 
+-LIBS += ${LDADD}		\
++
++
++LIBS = ${LDADD}		\
+ 	${LIBINTL}		\
+ 	${samplerate_LIBS}	\
+ 	../libguess/libguess.a	\
+@@ -190,6 +184,14 @@
+ 	${LIBGLADE_LIBS}	\
+ 	${REGEX_LIBS}
+ 
++ifdef USE_DBUS
++CPPFLAGS += -I../libaudclient
++DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
++LIBS += -L../libaudclient -laudclient
++endif
++
++pre-depend: ${DBUS_BINDINGS}
++
+ LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
+ 
+ build_stamp.c: 
diff --git a/multimedia/audacious/files/patch-src-audtool-Makefile b/multimedia/audacious/files/patch-src-audtool-Makefile
new file mode 100644
index 000000000000..92bb359fd866
--- /dev/null
+++ b/multimedia/audacious/files/patch-src-audtool-Makefile
@@ -0,0 +1,13 @@
+--- src/audtool/Makefile.orig	2007-11-26 17:58:26.000000000 +0100
++++ src/audtool/Makefile	2007-11-26 17:57:34.000000000 +0100
+@@ -18,8 +18,8 @@
+ 	  ${BEEP_DEFINES}	\
+ 	  ${ARCH_DEFINES}	\
+ 	  ${MOWGLI_CFLAGS}
+-LIBS += ${DBUS_LIBS}			\
+-	-L../libaudclient -laudclient	\
++LIBS += -L../libaudclient -laudclient	\
++	${DBUS_LIBS}			\
+ 	${GTK_LIBS}			\
+ 	${MOWGLI_LIBS}			\
+ 	${LIBGLADE_LIBS}
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 73ea6af0d656..13d33e5758d6 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,32 +1,47 @@
 bin/audacious
-bin/audtool
-include/audacious/beepctrl.h
+%%WITH_DBUS%%bin/audtool
+%%WITH_DBUS%%include/audacious/audctrl.h
+include/audacious/auddrct.h
 include/audacious/configdb.h
+include/audacious/custom_uri.h
+include/audacious/dbus.h
+include/audacious/dbus-service.h
+include/audacious/discovery.h
+include/audacious/eventqueue.h
+include/audacious/flow.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/mime.h
 include/audacious/output.h
+include/audacious/playback.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/tuple.h
+include/audacious/tuple_compiler.h
+include/audacious/tuple_formatter.h
 include/audacious/ui_fileinfopopup.h
+include/audacious/ui_plugin_menu.h
 include/audacious/ui_preferences.h
 include/audacious/util.h
 include/audacious/vfs.h
 include/audacious/vfs_buffer.h
 include/audacious/vfs_buffered_file.h
 include/audacious/xconvert.h
-lib/audacious/libaudid3tag.so
-lib/libaudacious.so
-lib/libaudacious.so.5
-lib/libaudacious.so.5.0.0
+lib/audacious/libaudid3tag.so.1.0.0
+lib/audacious/libaudid3tag.so.1
+lib/audacious/libaudid3tag.so 
+%%WITH_DBUS%%lib/libaudclient.so
+%%WITH_DBUS%%lib/libaudclient.so.1
+%%WITH_DBUS%%lib/libaudclient.so.1.0.0
 libdata/pkgconfig/audacious.pc
+libdata/pkgconfig/audclient.pc
 share/applications/audacious.desktop
 %%DATADIR%%/Skins/Classic/balance.png
 %%DATADIR%%/Skins/Classic/cbuttons.png
@@ -41,11 +56,29 @@ share/applications/audacious.desktop
 %%DATADIR%%/Skins/Classic/posbar.png
 %%DATADIR%%/Skins/Classic/shufrep.png
 %%DATADIR%%/Skins/Classic/skin.hints
+%%DATADIR%%/Skins/Classic/skin-classic.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/Classic1.3/balance.png
+%%DATADIR%%/Skins/Classic1.3/cbuttons.png
+%%DATADIR%%/Skins/Classic1.3/eq_ex.png
+%%DATADIR%%/Skins/Classic1.3/eqmain.png
+%%DATADIR%%/Skins/Classic1.3/main.png
+%%DATADIR%%/Skins/Classic1.3/monoster.png
+%%DATADIR%%/Skins/Classic1.3/nums_ex.png
+%%DATADIR%%/Skins/Classic1.3/playpaus.png
+%%DATADIR%%/Skins/Classic1.3/pledit.png
+%%DATADIR%%/Skins/Classic1.3/pledit.txt
+%%DATADIR%%/Skins/Classic1.3/posbar.png
+%%DATADIR%%/Skins/Classic1.3/shufrep.png
+%%DATADIR%%/Skins/Classic1.3/skin-classic.hints
+%%DATADIR%%/Skins/Classic1.3/skin.hints
+%%DATADIR%%/Skins/Classic1.3/text.png
+%%DATADIR%%/Skins/Classic1.3/titlebar.png
+%%DATADIR%%/Skins/Classic1.3/viscolor.txt
+%%DATADIR%%/Skins/Classic1.3/volume.png
 %%DATADIR%%/Skins/Default/cbuttons.png
 %%DATADIR%%/Skins/Default/eq_ex.png
 %%DATADIR%%/Skins/Default/eqmain.png
@@ -62,6 +95,101 @@ share/applications/audacious.desktop
 %%DATADIR%%/Skins/Default/titlebar.png
 %%DATADIR%%/Skins/Default/viscolor.txt
 %%DATADIR%%/Skins/Default/volume.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-down.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-left.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-right.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-up.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-normal.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check1.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check2.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check3.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check4.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check5.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check6.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option1.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option2.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option3.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option4.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option5.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option6.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Handles/handle-h.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Handles/handle-v.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Lines/line-h.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Lines/line-v.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Others/null.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Others/ruler.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Panel/panel-bg.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-vert.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/trough-horizontal.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Range/trough-vertical.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/shadow-in.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/shadow-out.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/text-.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/text-entry.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/notebook.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-left.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-right.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-top.png
+%%DATADIR%%/Skins/Default/gtk-2.0/Toolbar/toolbar.png
+%%DATADIR%%/Skins/Default/gtk-2.0/gtkrc
+%%DATADIR%%/Skins/Default/gtk-2.0/panel.rc
 %%DATADIR%%/Skins/Ivory/balance.png
 %%DATADIR%%/Skins/Ivory/cbuttons.png
 %%DATADIR%%/Skins/Ivory/eq_ex.png
@@ -96,6 +224,22 @@ share/applications/audacious.desktop
 %%DATADIR%%/Skins/Osmosis/titlebar.png
 %%DATADIR%%/Skins/Osmosis/viscolor.txt
 %%DATADIR%%/Skins/Osmosis/volume.png
+%%DATADIR%%/Skins/Refugee/cbuttons.png
+%%DATADIR%%/Skins/Refugee/eq_ex.png
+%%DATADIR%%/Skins/Refugee/eqmain.png
+%%DATADIR%%/Skins/Refugee/main.png
+%%DATADIR%%/Skins/Refugee/monoster.png
+%%DATADIR%%/Skins/Refugee/nums_ex.png
+%%DATADIR%%/Skins/Refugee/playpaus.png
+%%DATADIR%%/Skins/Refugee/pledit.png
+%%DATADIR%%/Skins/Refugee/pledit.txt
+%%DATADIR%%/Skins/Refugee/posbar.png
+%%DATADIR%%/Skins/Refugee/shufrep.png
+%%DATADIR%%/Skins/Refugee/skin.hints
+%%DATADIR%%/Skins/Refugee/text.png
+%%DATADIR%%/Skins/Refugee/titlebar.png
+%%DATADIR%%/Skins/Refugee/viscolor.txt
+%%DATADIR%%/Skins/Refugee/volume.png
 %%DATADIR%%/Skins/TinyPlayer/balance.png
 %%DATADIR%%/Skins/TinyPlayer/cbuttons.png
 %%DATADIR%%/Skins/TinyPlayer/eq_ex.png
@@ -116,14 +260,32 @@ share/applications/audacious.desktop
 %%DATADIR%%/glade/fileinfo.glade
 %%DATADIR%%/glade/prefswin.glade
 %%DATADIR%%/images/about-logo.png
+%%DATADIR%%/images/audacious_eq.xpm
+%%DATADIR%%/images/audacious_playlist.xpm
 %%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/audacious_player.xpm
 %%DATADIR%%/images/audio.png
 %%DATADIR%%/images/connectivity.png
 %%DATADIR%%/images/eq.png
+%%DATADIR%%/images/info.png
+%%DATADIR%%/images/menu_invert_playlist.png
+%%DATADIR%%/images/menu_queue_toggle.png
+%%DATADIR%%/images/menu_randomize_playlist.png
+%%DATADIR%%/images/menu_remove_dups.png
+%%DATADIR%%/images/menu_remove_unavail.png
+%%DATADIR%%/images/menu_select_all.png
+%%DATADIR%%/images/menu_select_invert.png
+%%DATADIR%%/images/menu_select_none.png
+%%DATADIR%%/images/menu_sort_artist.png
+%%DATADIR%%/images/menu_sort_filename.png
+%%DATADIR%%/images/menu_sort_pathfile.png
+%%DATADIR%%/images/menu_sort_title.png
 %%DATADIR%%/images/mouse.png
+%%DATADIR%%/images/pl.png
+%%DATADIR%%/images/play.png
 %%DATADIR%%/images/playlist.png
 %%DATADIR%%/images/plugins.png
+%%DATADIR%%/ui/carbon-menubar.ui
 %%DATADIR%%/ui/equalizer.ui
 %%DATADIR%%/ui/mainwin.ui
 %%DATADIR%%/ui/playlist.ui
@@ -135,6 +297,7 @@ share/applications/audacious.desktop
 %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/el/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/et/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/hi/LC_MESSAGES/audacious.mo
@@ -161,9 +324,29 @@ share/applications/audacious.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
 share/pixmaps/audacious.png
 @dirrm %%DATADIR%%/Skins/Classic
+@dirrm %%DATADIR%%/Skins/Classic1.3
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Arrows
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Buttons
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Handles
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Lines
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Others
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Panel
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Range
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Shadows
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Spin
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Tabs
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Toolbar
+@dirrm %%DATADIR%%/Skins/Default/gtk-2.0
 @dirrm %%DATADIR%%/Skins/Default
 @dirrm %%DATADIR%%/Skins/Ivory
 @dirrm %%DATADIR%%/Skins/Osmosis
+@dirrm %%DATADIR%%/Skins/Refugee
 @dirrm %%DATADIR%%/Skins/TinyPlayer
 @dirrm %%DATADIR%%/Skins
 @dirrm %%DATADIR%%/glade