5 files changed, 45 insertions, 20 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 3b38e96797ac..114eb5e4292a 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 MASTER_SITE_SUBDIR=oliver
@@ -85,8 +85,14 @@ post-patch:
 	@${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' \
+	@${REINPLACE_CMD} 's|WIDGET_COMBO_BOX,|WIDGET_COMBO_BOX|g; \
+		s|VALUE_NULL,|VALUE_NULL|g' \
 		${WRKSRC}/src/audacious/preferences.h
+	@${REINPLACE_CMD} 's|glib-2\.0/||g' \
+		${WRKSRC}/src/libaudtag/util.h \
+		${WRKSRC}/src/libaudtag/wma/guid.c \
+		${WRKSRC}/src/libaudtag/wma/wma.c \
+		${WRKSRC}/src/libaudtag/wma/wma_fmt.h
 .if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
 	@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
 		${WRKSRC}/src/audacious/Makefile
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index e3229ddfcf79..8c079b2afc35 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-2.0.1.tgz) = 241cd88440fb0c3257a9ba5482af4d7e
-SHA256 (audacious-2.0.1.tgz) = 92520b61536f3c67f448276b4b7d5cf3dd3ebd8b288aa9758fae6b8b6d8179bd
-SIZE (audacious-2.0.1.tgz) = 1871435
+MD5 (audacious-2.1.tgz) = 03ab6a062e5909214841f90f767f1147
+SHA256 (audacious-2.1.tgz) = 32e16412d446f32744cb477d5b8a066447c0c826f71347ec653e9a8cb5ce747c
+SIZE (audacious-2.1.tgz) = 1852176
diff --git a/multimedia/audacious/files/patch-buildsys.mk.in b/multimedia/audacious/files/patch-buildsys.mk.in
index 27ef17ad7202..7e42c0e1c765 100644
--- a/multimedia/audacious/files/patch-buildsys.mk.in
+++ b/multimedia/audacious/files/patch-buildsys.mk.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- buildsys.mk.in.orig	2009-07-07 00:39:11.000000000 +0200
++++ buildsys.mk.in	2009-07-18 09:45:43.000000000 +0200
+@@ -124,7 +124,7 @@
  	done; \
  	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
  		${DEPEND_STATUS}; \
@@ -9,3 +9,12 @@
  			rm -f $$deps; \
  			${DEPEND_OK}; \
  		else \
+@@ -144,7 +144,7 @@
+ 
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
+ 	${LINK_STATUS}
+-	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
++	if ${LD} -o $@ ${OBJS} ${LIBS} ${LDFLAGS} ; then \
+ 		${LINK_OK}; \
+ 	else \
+ 		${LINK_FAILED}; \
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
index 4991d9e30c18..3afc0b9c871d 100644
--- a/multimedia/audacious/files/patch-src-audacious-Makefile
+++ b/multimedia/audacious/files/patch-src-audacious-Makefile
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/audacious/Makefile.orig	2009-07-07 00:39:12.000000000 +0200
++++ src/audacious/Makefile	2009-07-18 09:41:46.000000000 +0200
+@@ -127,15 +127,8 @@
  
  include ../../buildsys.mk
  
@@ -18,7 +18,7 @@
  		${MOWGLI_CFLAGS}		\
  		${GLIB_CFLAGS}			\
  		${GTHREAD_CFLAGS}		\
-@@ -147,13 +140,12 @@
+@@ -149,13 +142,12 @@
  		${SIMD_CFLAGS}			\
  		-D_AUDACIOUS_CORE		\
  		${EGGSM_CFLAGS}			\
@@ -29,14 +29,18 @@
  		-I../libaudcore
  
 -LIBS += ${LDADD}						\
-+LIBS = ${LDADD}						\
++LIBS = 						\
+ 		-L../libaudcore -laudcore	\
  		${LIBINTL}						\
  		${SAMPLERATE_LIBS}				\
- 		../libguess/libguess.a			\
-@@ -168,6 +160,14 @@
- 		${REGEX_LIBS}					\
- 		-L../libaudcore -laudcore
- 
+@@ -168,7 +160,16 @@
+ 		${DBUS_LIBS}					\
+ 		${MOWGLI_LIBS}					\
+ 		${LIBMCS_LIBS}					\
+-		${REGEX_LIBS}
++		${REGEX_LIBS}					\
++		${LDADD}
++
 +ifeq ($(USE_DBUS),yes)
 +CPPFLAGS += -I../libaudclient
 +DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
@@ -44,7 +48,6 @@
 +endif
 +
 +pre-depend: ${DBUS_BINDINGS}
-+
+ 
  LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
  
- build_stamp.c:
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 2eef89f9d99b..031ccf5d3880 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -3,6 +3,7 @@ bin/audacious2
 %%WITH_DBUS%%include/audacious/audctrl.h
 include/audacious/audconfig.h
 include/audacious/auddrct.h
+include/audacious/audtag.h
 include/audacious/audutil.h
 include/audacious/configdb.h
 include/audacious/custom_uri.h
@@ -26,10 +27,12 @@ include/audacious/playlist_container.h
 include/audacious/plugin.h
 include/audacious/preferences.h
 include/audacious/rcfile.h
+include/audacious/scanner.h
 include/audacious/ui_fileinfopopup.h
 include/audacious/ui_plugin_menu.h
 include/audacious/ui_preferences.h
 include/audacious/util.h
+include/audacious/vis_runner.h
 include/libSAD/libSAD.h
 include/libSAD/common.h
 include/libSAD/dither.h
@@ -49,6 +52,9 @@ lib/libaudcore.so.1.0.0
 lib/libaudid3tag.so
 lib/libaudid3tag.so.2
 lib/libaudid3tag.so.2.0.0
+lib/libaudtag.so
+lib/libaudtag.so.1
+lib/libaudtag.so.1.0.0
 lib/libaudutil.so
 lib/libaudutil.so.1
 lib/libaudutil.so.1.0.0
@@ -314,6 +320,7 @@ share/applications/audacious2.desktop
 %%NLS%%share/locale/ka/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo