update audacious to 2.0.1

bump portrevision on dependant ports

17 files changed, 143 insertions, 98 deletions

diff --git a/audio/audacious-crossfade/Makefile b/audio/audacious-crossfade/Makefile
index 6c5af8ab76fb..f279b6f04622 100644
--- a/audio/audacious-crossfade/Makefile
+++ b/audio/audacious-crossfade/Makefile
@@ -6,7 +6,7 @@
 #
 
 APP=		audacious
-LIB_DEPENDS=	audclient.1:${PORTSDIR}/multimedia/audacious
+LIB_DEPENDS=	audclient.2:${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 \
diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index 3b9b75a9beb1..acd555b7e979 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	audacious-dumb
 PORTVERSION=	0.57
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.netswarm.net/misc/ \
 		CRITICAL
@@ -15,8 +15,8 @@ MASTER_SITES=	http://www.netswarm.net/misc/ \
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Audacious plugin that support the IT, XM, S3M or MOD formats
 
-RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious \
+RUN_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious \
 		${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb
 
 USE_GMAKE=	yes
diff --git a/audio/wmauda/Makefile b/audio/wmauda/Makefile
index 35c424f68448..5d7a62aa0d7f 100644
--- a/audio/wmauda/Makefile
+++ b/audio/wmauda/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmauda
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.netswarm.net/misc/ \
 		${MASTER_SITE_GENTOO}
@@ -16,8 +16,8 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A port of wmxmms to GTK 2.x and Audacious
 
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
-RUN_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious
+RUN_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious
 LIB_DEPENDS=	mowgli.2:${PORTSDIR}/devel/libmowgli
 
 USE_GMAKE=	yes
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 0db75d10952d..86a20f6e916f 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	crossfade
 PORTVERSION=	0.3.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.eisenlohr.org/xmms-crossfade/ CENKES
 PKGNAMEPREFIX=	${APP}-
@@ -39,7 +39,8 @@ CONFIGURE_ARGS+=--enable-samplerate
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|aout|elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/objformat=/s|aout|elf|; \
+		s|dummy audacious|&2|g' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/libcrossfade.so ${PREFIX}/${PLUGDIR}/
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index c18dd098f6e9..9c5c7460fa50 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious-plugins
-PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
@@ -15,8 +14,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Plugins needed for audacious
 
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
-		
+BUILD_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
@@ -55,7 +54,6 @@ OPTIONS=	DBUS		"Enable dbus support"			on  \
 		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  \
 		OSS4		"Enable OSS4 output plugin"		off \
@@ -68,13 +66,13 @@ OPTIONS=	DBUS		"Enable dbus support"			on  \
 		XSPF		"Enable XSPF support"			on  \
 		TTA		"Enable TrueAudio plugin"		on  \
 		GNOME		"Build with gnomevfs/gconf support"	off \
-		NLS		"Native Language Support"		on \
+		NLS		"Native Language Support"		on  \
 		CURL		"curl for lastfm/scrobbler support"	off
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_DBUS)
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus --enable-gnomeshortcuts
 PLIST_SUB+=	DBUS=""
 .else
@@ -98,10 +96,10 @@ PLIST_SUB+=	ESDPLUGIN="@comment "
 
 .if !defined(WITHOUT_MP3)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
-CONFIGURE_ARGS+=--enable-mad
+CONFIGURE_ARGS+=--enable-libmad
 PLIST_SUB+=	MP3PLUGIN=""
 .else
-CONFIGURE_ARGS+=--disable-mad
+CONFIGURE_ARGS+=--disable-libmad
 PLIST_SUB+=	MP3PLUGIN="@comment "
 .endif
 
@@ -248,15 +246,8 @@ CONFIGURE_ARGS+=--disable-jack
 PLIST_SUB+=	JACKPLUGIN="@comment "
 .endif
 
-.if defined(WITH_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
-
+#OSS4 only works with recent changed in HEAD
+.if ${OSVERSION} >= 800061
 .if !defined(WITHOUT_OSS)
 PLIST_SUB+=	OSSPLUGIN=""
 CONFIGURE_ARGS+=--enable-oss
@@ -272,6 +263,17 @@ CONFIGURE_ARGS+=--enable-oss4
 PLIST_SUB+=	OSS4PLUGIN="@comment "
 CONFIGURE_ARGS+=--disable-oss4
 .endif
+.else
+PLIST_SUB+=     OSS4PLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-oss4
+.if defined(WITH_OSS) || defined(WITH_OSS4)
+PLIST_SUB+=     OSSPLUGIN=""
+CONFIGURE_ARGS+=--enable-oss
+.else
+PLIST_SUB+=     OSSPLUGIN="@comment "
+CONFIGURE_ARGS+=--disable-oss
+.endif
+.endif
 
 .if defined(WITH_SID)
 LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
@@ -283,7 +285,7 @@ CONFIGURE_ARGS+=--disable-sid
 .endif
 
 .if !defined(WITHOUT_TIMIDITY)
-RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity 
+RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
 CONFIGURE_ARGS+=--enable-timidity
 PLIST_SUB+=	TIMIDITYPLUGIN=""
 .else
@@ -364,7 +366,7 @@ CONFIGURE_ARGS+=--enable-gnome-vfs --enable-gconf
 .endif
 
 .if !defined(WITHOUT_CURL) || exists(${LOCALBASE}/lib/libcurl.so)
-LIB_DEPENDS=	curl.5:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
 PLIST_SUB+=     CURLPLUGIN=""
 .else
 PLIST_SUB+=     CURLPLUGIN="@comment "
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index 43bb1fc8218d..757bcd392687 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-plugins-1.5.1.tgz) = 057b91f33aaf06bb4cde7260177c2f5f
-SHA256 (audacious-plugins-1.5.1.tgz) = aed33732c55566604a24cd2cd1751c24d159ff8eca510647c5c3c7889fd8ae15
-SIZE (audacious-plugins-1.5.1.tgz) = 2944448
+MD5 (audacious-plugins-2.0.1.tgz) = 5de2767d232e8f9f84fbd15d3b960f8b
+SHA256 (audacious-plugins-2.0.1.tgz) = 3279a2160d026c16828a850dd2d0b289bd69569c3a8ad6e060c6673b5d8cf648
+SIZE (audacious-plugins-2.0.1.tgz) = 3505273
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 32b5955448bc..2ccf131b528c 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -1,4 +1,3 @@
-%%ARTSPLUGIN%%bin/audacious-arts-helper
 lib/audacious/Container/m3u.so
 lib/audacious/Container/pls.so
 %%XSPFPLUGIN%%lib/audacious/Container/xspf.so
@@ -15,14 +14,17 @@ lib/audacious/General/alarm.so
 lib/audacious/General/hotkey.so
 %%LIRCPLUGIN%%lib/audacious/General/lirc.so
 %%CURLPLUGIN%%lib/audacious/General/scrobbler.so
+lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
-lib/audacious/General/statusicon.so
+%%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
+lib/audacious/General/streambrowser.so
+lib/audacious/General/vfstrace.so
 %%AACPLUGIN%%lib/audacious/Input/aac.so
 %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
 lib/audacious/Input/alac.so
 %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
+lib/audacious/Input/cuesheet_ng.so
 lib/audacious/Input/console.so
-lib/audacious/Input/cuesheet.so
 lib/audacious/Input/demac.so
 %%FLACPLUGIN%%lib/audacious/Input/flacng.so
 %%MP3PLUGIN%%lib/audacious/Input/madplug.so
@@ -30,8 +32,10 @@ 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/psf2.so
 lib/audacious/Input/sexypsf.so
 %%SIDPLUGIN%%lib/audacious/Input/sid.so
+%%SNDFILEPLUGIN%%lib/audacious/Input/sndfile.so
 %%TIMIDITYPLUGIN%%lib/audacious/Input/timidity.so
 lib/audacious/Input/tonegen.so
 %%TTAPLUGIN%%lib/audacious/Input/tta.so
@@ -39,16 +43,18 @@ lib/audacious/Input/tonegen.so
 lib/audacious/Input/vtx.so
 %%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
 %%WMAPLUGIN%%lib/audacious/Input/wma.so
+lib/audacious/Input/xsf.so
 %%OSSPLUGIN%%lib/audacious/Output/OSS.so
 %%OSS4PLUGIN%%lib/audacious/Output/OSS4.so
 %%ESDPLUGIN%%lib/audacious/Output/ESD.so
-%%ARTSPLUGIN%%lib/audacious/Output/arts.so
+lib/audacious/Output/crossfade.so
 lib/audacious/Output/filewriter.so
 %%JACKPLUGIN%%lib/audacious/Output/jackout.so
 lib/audacious/Output/null.so
+lib/audacious/Transport/gio.so
 %%CURLPLUGIN%%lib/audacious/Transport/lastfm.so
+%%MMSPLUGIN%%lib/audacious/Transport/mms.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
@@ -88,6 +94,13 @@ lib/audacious/Visualization/spectrum.so
 %%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/nenolod_-_worms.pnv
 %%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
 %%PARANORMALPLUGIN%%share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
+%%CURLPLUGIN%%share/audacious/images/audioscrobbler.png
+%%CURLPLUGIN%%share/audacious/images/audioscrobbler_badge.png
+share/audacious/images/bookmarks.png
+share/audacious/images/shoutcast.png
+share/audacious/images/streambrowser-16x16.png
+share/audacious/images/streambrowser-64x64.png
+share/audacious/images/xiph.png
 %%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
@@ -109,4 +122,5 @@ lib/audacious/Visualization/spectrum.so
 @dirrmtry lib/audacious
 %%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal/Presets
 %%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal
+@dirrmtry share/audacious/images
 @dirrmtry share/audacious
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 8e20309c66c1..3b38e96797ac 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	1.5.1
-PORTREVISION=	3
+PORTVERSION=	2.0.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
@@ -25,19 +24,19 @@ CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		audacious.1 audtool.1
+MAN1=		audacious2.1 audtool2.1
 
 LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs \
 		mowgli.2:${PORTSDIR}/devel/libmowgli
 
 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 \
-		EXECINFO "Build with libexecinfo support" off
+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  \
+		EXECINFO "Build with libexecinfo support"		on
 
 .include <bsd.port.pre.mk>
 
@@ -83,9 +82,13 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|+= $${LIB_CPPFLAGS} -I..|= -I.. $${LIB_CPPFLAGS}|' \
 		${WRKSRC}/src/libid3tag/Makefile
-	@${REINPLACE_CMD} 's|FMT_FIXED32,|FMT_FIXED32|' ${WRKSRC}/src/audacious/plugin.h
+	@${REINPLACE_CMD} 's|FMT_FIXED32,|FMT_FIXED32|g; \
+		s|OUTPUT_PLUGIN_INIT_FOUND_DEVICES,|OUTPUT_PLUGIN_INIT_FOUND_DEVICES|g' \
+		${WRKSRC}/src/audacious/plugin.h
+	@${REINPLACE_CMD} 's|WIDGET_FONT_BTN,|WIDGET_FONT_BTN|g' \
+		${WRKSRC}/src/audacious/preferences.h
 .if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
-	@${REINPLACE_CMD} 's|$${REGEX_LIBS}$$|& -L${LOCALBASE}/lib -lexecinfo|' \
+	@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
 		${WRKSRC}/src/audacious/Makefile
 .endif
 
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index ab099059885f..e3229ddfcf79 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-1.5.1.tgz) = 3c206a6d06d49d8a68f0edd9933d2219
-SHA256 (audacious-1.5.1.tgz) = ac5970c09ed25ac56dac15e035328592cace5321c7895229e682cac92201f1d7
-SIZE (audacious-1.5.1.tgz) = 1937747
+MD5 (audacious-2.0.1.tgz) = 241cd88440fb0c3257a9ba5482af4d7e
+SHA256 (audacious-2.0.1.tgz) = 92520b61536f3c67f448276b4b7d5cf3dd3ebd8b288aa9758fae6b8b6d8179bd
+SIZE (audacious-2.0.1.tgz) = 1871435
diff --git a/multimedia/audacious/files/patch-buildsys.mk.in b/multimedia/audacious/files/patch-buildsys.mk.in
index 9d5b0bf829e9..27ef17ad7202 100644
--- a/multimedia/audacious/files/patch-buildsys.mk.in
+++ b/multimedia/audacious/files/patch-buildsys.mk.in
@@ -1,11 +1,11 @@
---- buildsys.mk.in.orig	2008-03-16 15:37:56.000000000 +0100
-+++ buildsys.mk.in	2008-03-16 15:38:43.000000000 +0100
-@@ -100,7 +100,7 @@
+--- buildsys.mk.in.orig	2009-05-14 11:22:45.000000000 +0200
++++ buildsys.mk.in	2009-05-14 11:23:14.000000000 +0200
+@@ -123,7 +123,7 @@
+ 	done; \
+ 	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
  		${DEPEND_STATUS}; \
- 		rm -f .deps; \
- 		if ${MAKE} ${MFLAGS} ${DEPS}; then \
--			cat ${DEPS} >.deps; \
-+			sed 's|/[^ ]*/include/audacious/dbus.h||g' ${DEPS} >.deps; \
- 			rm -f ${DEPS}; \
+-		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
++		if ${MAKE} ${MFLAGS} $$deps && sed 's|/[^ ]*/include/audacious/dbus.h||g' $$deps >.deps; then \
+ 			rm -f $$deps; \
  			${DEPEND_OK}; \
  		else \
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
index 6113334b4767..4991d9e30c18 100644
--- a/multimedia/audacious/files/patch-src-audacious-Makefile
+++ b/multimedia/audacious/files/patch-src-audacious-Makefile
@@ -1,6 +1,6 @@
---- src/audacious/Makefile.orig	2008-05-24 00:00:34.000000000 +0200
-+++ src/audacious/Makefile	2008-05-28 19:12:10.000000000 +0200
-@@ -150,15 +150,8 @@
+--- src/audacious/Makefile.bak	2009-05-13 10:10:30.000000000 +0200
++++ src/audacious/Makefile	2009-05-14 11:12:49.000000000 +0200
+@@ -125,15 +125,8 @@
  
  include ../../buildsys.mk
  
@@ -13,26 +13,29 @@
 -pre-depend: ${DBUS_BINDINGS}
 -
 -CPPFLAGS += -DHAVE_CONFIG_H		\
-+CPPFLAGS = -I.. -I../..			\
-+		-DHAVE_CONFIG_H			\
++CPPFLAGS = -I.. -I../.. \
++		-DHAVE_CONFIG_H		\
  		${MOWGLI_CFLAGS}		\
  		${GLIB_CFLAGS}			\
  		${GTHREAD_CFLAGS}		\
-@@ -173,10 +166,9 @@
+@@ -147,13 +140,12 @@
+ 		${SIMD_CFLAGS}			\
  		-D_AUDACIOUS_CORE		\
- 		-I../libSAD				\
  		${EGGSM_CFLAGS}			\
 -		-I.. -I../..			\
- 		-I./intl
+ 		-I./intl			\
+ 		-I.				\
+ 		-I../libSAD			\
+ 		-I../libaudcore
  
 -LIBS += ${LDADD}						\
 +LIBS = ${LDADD}						\
  		${LIBINTL}						\
  		${SAMPLERATE_LIBS}				\
  		../libguess/libguess.a			\
-@@ -190,6 +182,14 @@
- 		${LIBMCS_LIBS}					\
- 		${REGEX_LIBS}
+@@ -168,6 +160,14 @@
+ 		${REGEX_LIBS}					\
+ 		-L../libaudcore -laudcore
  
 +ifeq ($(USE_DBUS),yes)
 +CPPFLAGS += -I../libaudclient
@@ -42,6 +45,6 @@
 +
 +pre-depend: ${DBUS_BINDINGS}
 +
- LDFLAGS += ${PROG_IMPLIB_LDFLAGS}
+ LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
  
- build_stamp.c: 
+ build_stamp.c:
diff --git a/multimedia/audacious/files/patch-src-audtool-Makefile b/multimedia/audacious/files/patch-src-audtool-Makefile
index 22467f5d25b7..030f919c6c96 100644
--- a/multimedia/audacious/files/patch-src-audtool-Makefile
+++ b/multimedia/audacious/files/patch-src-audtool-Makefile
@@ -1,13 +1,16 @@
---- src/audtool/Makefile.orig	2008-05-24 00:00:34.000000000 +0200
-+++ src/audtool/Makefile	2008-05-28 19:15:01.000000000 +0200
-@@ -18,8 +18,8 @@
+--- src/audtool/Makefile.orig	2009-05-14 11:38:38.000000000 +0200
++++ src/audtool/Makefile	2009-05-14 11:38:49.000000000 +0200
+@@ -18,10 +18,10 @@
  		  ${ARCH_DEFINES}		\
  		  ${MOWGLI_CFLAGS}
  
+-LDFLAGS += ${AUDLDFLAGS}
++LDFLAGS = ${AUDLDFLAGS}
+ 
 -LIBS += ${DBUS_LIBS}				\
 -	-L../libaudclient -laudclient	\
-+LIBS += -L../libaudclient -laudclient	\
-+	${DBUS_LIBS}			\
++LIBS = -L../libaudclient -laudclient   \
++	${DBUS_LIBS}				\
  	${GTK_LIBS}						\
  	${MOWGLI_LIBS}					\
  	${LIBMCS_LIBS}
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index d1016f9f0dd9..2eef89f9d99b 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,19 +1,22 @@
-bin/audacious
-%%WITH_DBUS%%bin/audtool
+bin/audacious2
+%%WITH_DBUS%%bin/audtool2
 %%WITH_DBUS%%include/audacious/audctrl.h
 include/audacious/audconfig.h
 include/audacious/auddrct.h
+include/audacious/audutil.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/equalizer_preset.h
 include/audacious/eventqueue.h
 include/audacious/flow.h
 include/audacious/hook.h
 include/audacious/i18n.h
 include/audacious/id3tag.h
 include/audacious/input.h
+include/audacious/interface.h
 include/audacious/main.h
 include/audacious/mime.h
 include/audacious/output.h
@@ -21,30 +24,40 @@ include/audacious/playback.h
 include/audacious/playlist.h
 include/audacious/playlist_container.h
 include/audacious/plugin.h
+include/audacious/preferences.h
 include/audacious/rcfile.h
-include/audacious/strings.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/libSAD/libSAD.h
 include/libSAD/common.h
 include/libSAD/dither.h
+include/libaudcore/audstrings.h
+include/libaudcore/tuple.h
+include/libaudcore/tuple_compiler.h
+include/libaudcore/tuple_formatter.h
+include/libaudcore/vfs.h
+include/libaudcore/vfs_buffer.h
+include/libaudcore/vfs_buffered_file.h
 %%WITH_DBUS%%lib/libaudclient.so
-%%WITH_DBUS%%lib/libaudclient.so.1
-%%WITH_DBUS%%lib/libaudclient.so.1.0.0
+%%WITH_DBUS%%lib/libaudclient.so.2
+%%WITH_DBUS%%lib/libaudclient.so.2.0.0
+lib/libaudcore.so
+lib/libaudcore.so.1
+lib/libaudcore.so.1.0.0
 lib/libaudid3tag.so
-lib/libaudid3tag.so.1
-lib/libaudid3tag.so.1.0.0
+lib/libaudid3tag.so.2
+lib/libaudid3tag.so.2.0.0
+lib/libaudutil.so
+lib/libaudutil.so.1
+lib/libaudutil.so.1.0.0
+lib/libSAD.so
+lib/libSAD.so.2
+lib/libSAD.so.2.0.0
 libdata/pkgconfig/audacious.pc
 libdata/pkgconfig/audclient.pc
-share/applications/audacious.desktop
+share/applications/audacious2.desktop
 %%DATADIR%%/Skins/Classic/balance.png
 %%DATADIR%%/Skins/Classic/cbuttons.png
 %%DATADIR%%/Skins/Classic/eq_ex.png
@@ -265,6 +278,7 @@ share/applications/audacious.desktop
 %%DATADIR%%/images/appearance.png
 %%DATADIR%%/images/audacious_player.xpm
 %%DATADIR%%/images/audio.png
+%%DATADIR%%/images/blue.png
 %%DATADIR%%/images/connectivity.png
 %%DATADIR%%/images/menu_playlist.png
 %%DATADIR%%/images/menu_plugin.png
@@ -278,6 +292,7 @@ share/applications/audacious.desktop
 %%DATADIR%%/ui/carbon-menubar.ui
 %%DATADIR%%/ui/equalizer.ui
 %%DATADIR%%/ui/mainwin.ui
+%%DATADIR%%/ui/player.ui
 %%DATADIR%%/ui/playlist.ui
 %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/br/LC_MESSAGES/audacious.mo
@@ -288,6 +303,7 @@ share/applications/audacious.desktop
 %%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/eu/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
@@ -312,7 +328,7 @@ share/applications/audacious.desktop
 %%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
-share/pixmaps/audacious.png
+share/pixmaps/audacious2.png
 @dirrm %%DATADIR%%/Skins/Classic
 @dirrm %%DATADIR%%/Skins/Classic1.3
 @dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Arrows
@@ -344,5 +360,6 @@ share/pixmaps/audacious.png
 @dirrmtry %%DATADIR%%
 @dirrm include/audacious
 @dirrm include/libSAD
+@dirrm include/libaudcore
 @dirrmtry lib/audacious
 @dirrmtry share/applications
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 54a5ae636337..09456fa7ecac 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tunapie
 PORTVERSION=	2.1.14
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,.r,rc,}
@@ -71,7 +71,7 @@ RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 # default AUDIOPLAYER
 .if defined(WITH_AUDACIOUS)
-RUN_DEPENDS+=	${PREFIX}/lib/audacious/Container/libpls.so:${PORTSDIR}/multimedia/audacious-plugins
+RUN_DEPENDS+=	${PREFIX}/lib/audacious/Container/pls.so:${PORTSDIR}/multimedia/audacious-plugins
 .elifdef(WITH_BEEP_MEDIA_PLAYER)
 RUN_DEPENDS+=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 .else
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 783ae2990472..a9711aa7bd3b 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-xmms-plugin
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
@@ -37,7 +37,7 @@ RUN_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
 .endif
 
 .if defined(WITH_AUDACIOUS)
-RUN_DEPENDS+=	audacious:${PORTSDIR}/multimedia/audacious
+RUN_DEPENDS+=	audacious2:${PORTSDIR}/multimedia/audacious
 .endif
 
 post-patch:
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 90aae67525be..689f3e7d84e2 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +35,7 @@ PORTDOCS=	README AUTHORS ChangeLog TODO NEWS \
 		docs.html variables.html config_settings.html
 
 .if defined(WITH_AUDACIOUS)
-LIB_DEPENDS+=		audclient.1:${PORTSDIR}/multimedia/audacious
+LIB_DEPENDS+=		audclient.2:${PORTSDIR}/multimedia/audacious
 CONFIGURE_ARGS+=	--enable-audacious
 .else
 CONFIGURE_ARGS+=	--disable-audacious
diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile
index f985ba7253e3..92de17ad8646 100644
--- a/x11-themes/audacious-skins/Makefile
+++ b/x11-themes/audacious-skins/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	audacious-skins
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	CRITICAL
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A collection of audacious skins
 
-BUILD_DEPENDS=	audacious:${PORTSDIR}/multimedia/audacious
+BUILD_DEPENDS=	audacious2:${PORTSDIR}/multimedia/audacious
 
 NO_BUILD=	yes