6 files changed, 81 insertions, 55 deletions

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