5 files changed, 112 insertions, 181 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 5bb491b1ce92..30f862405b03 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,33 +6,36 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	3.1.1
+PORTVERSION=	3.2.2
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://distfiles.atheme.org/
-MASTER_SITE_SUBDIR=oliver
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A media player based on BMP and XMMS
 
+LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs \
+		mowgli.2:${PORTSDIR}/devel/libmowgli \
+		xml2.5:${PORTSDIR}/textproc/libxml2
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 sm
+USE_BZIP2=	yes
 USE_GNOME=	gtk20 libglade2
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-gtk3
+
+CONFIGURE_ARGS=	--disable-gtk3 --disable-chardet
 
 MAN1=		audacious.1 audtool.1
 
-LIB_DEPENDS=	mcs.1:${PORTSDIR}/devel/libmcs \
-		mowgli.2:${PORTSDIR}/devel/libmowgli \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+PORTDOCS=	README AUTHORS
 
-PORTDOCS=	README AUTHORS NEWS
+# no ports for:
+#		CHARSET	"Build with automatic charset detection"	off \
 
-OPTIONS=	CHARSET	"Build with automatic charset detection"	off \
-		DBUS	"Build with dbus support"			on  \
+OPTIONS=	DBUS	"Build with dbus support"			on  \
 		GNOME	"Build with gconf support"			off \
 		ICONV	"Build with iconv support"			on \
 		NLS	"Native Language Support"			on  \
@@ -50,10 +53,6 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
-.if !defined(WITH_CHARSET)
-CONFIGURE_ARGS+=--disable-chardet
-.endif
-
 .if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
 LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
 .endif
@@ -83,20 +82,6 @@ CONFIGURE_ARGS+=--disable-sse2
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} 's|CPPFLAGS +=\(.*\)|CPPFLAGS =\1 -I${LOCALBASE}/include|g' \
-		${WRKSRC}/src/libaudgui/Makefile \
-		${WRKSRC}/src/libaudtag/Makefile \
-		${WRKSRC}/src/libaudcore/Makefile
-	@${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|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 8c7df0577d70..01836689c9b2 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.1.1.tar.gz) = a03e555466f8fa336474a0c72d9225a3fa974b5895626aabfc558a1b35ffa43e
-SIZE (audacious-3.1.1.tar.gz) = 1059836
+SHA256 (audacious-3.2.2.tar.bz2) = c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee
+SIZE (audacious-3.2.2.tar.bz2) = 675192
diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile
deleted file mode 100644
index 1cf90f3898ed..000000000000
--- a/multimedia/audacious/files/patch-src-audacious-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/audacious/Makefile.orig	2011-04-16 18:09:10.000000000 +0200
-+++ src/audacious/Makefile	2011-04-25 11:44:28.000000000 +0200
-@@ -93,15 +93,16 @@
- include ../../buildsys.mk
- 
- ifeq ($(USE_DBUS),yes)
--CPPFLAGS += -I../libaudclient
-+CPPFLAGS = -I../libaudclient
- DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
--LIBS += -L../libaudclient -laudclient
-+LIBS = -L../libaudclient -laudclient
- endif
- 
- pre-depend: ${DBUS_BINDINGS}
- 
- CPPFLAGS += -std=gnu99 \
-             -DHAVE_CONFIG_H \
-+		-I.. -I../..			\
- 		${MOWGLI_CFLAGS}		\
- 		${GLIB_CFLAGS}			\
- 		${GTHREAD_CFLAGS}		\
-@@ -118,7 +119,7 @@
- 		${LIBGUESS_CFLAGS}		\
- 		-I.. -I../..
- 
--LIBS += ${LDADD}						\
-+LIBS += 					\
-         -lm \
- 		-L../libaudcore -laudcore	\
- 		-L../libaudgui -laudgui \
-@@ -133,7 +134,8 @@
- 		${LIBMCS_LIBS}					\
- 		${REGEX_LIBS}					\
- 		${PTHREAD_LIBS}					\
--		${LIBGUESS_LIBS}
-+		${LIBGUESS_LIBS}				\
-+		${LDADD}
- 
- LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
- 
diff --git a/multimedia/audacious/files/patch-src-audtool-Makefile b/multimedia/audacious/files/patch-src-audtool-Makefile
deleted file mode 100644
index f3f4818ed9e4..000000000000
--- a/multimedia/audacious/files/patch-src-audtool-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/audtool/Makefile.orig	2011-11-08 17:37:12.000000000 +0100
-+++ src/audtool/Makefile	2011-11-23 20:51:01.000000000 +0100
-@@ -17,7 +17,7 @@
-             ${GTK_CFLAGS} \
-             ${MOWGLI_CFLAGS}
- 
--LIBS += ${DBUS_LIBS}				\
--	-L../libaudclient -laudclient	\
-+LIBS += -L../libaudclient -laudclient	\
-+	${DBUS_LIBS}				\
- 	${GTK_LIBS}						\
- 	${MOWGLI_LIBS}
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 6f27b2e57a96..2a31b208d67f 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,120 +1,118 @@
-bin/audacious
-%%WITH_DBUS%%bin/audtool
-%%WITH_DBUS%%include/audacious/audctrl.h
-include/audacious/api-alias-begin.h
-include/audacious/api-alias-end.h
-include/audacious/api-define-begin.h
-include/audacious/api-define-end.h
-include/audacious/api.h
-include/audacious/audtag.h
-include/audacious/dbus-service.h
-include/audacious/dbus.h
-include/audacious/debug.h
-include/audacious/drct-api.h
-include/audacious/drct.h
-include/audacious/gtk-compat.h
-include/audacious/i18n.h
-include/audacious/misc-api.h
-include/audacious/misc.h
-include/audacious/playlist-api.h
-include/audacious/playlist.h
-include/audacious/plugin.h
-include/audacious/plugins-api.h
-include/audacious/plugins.h
-include/audacious/preferences.h
-include/audacious/types.h
-include/libaudcore/audio.h
-include/libaudcore/audstrings.h
-include/libaudcore/eventqueue.h
-include/libaudcore/hook.h
-include/libaudcore/index.h
-include/libaudcore/md5.h
-include/libaudcore/stringpool.h
-include/libaudcore/tuple.h
-include/libaudcore/tuple_compiler.h
-include/libaudcore/tuple_formatter.h
-include/libaudcore/vfs.h
-include/libaudcore/vfs_async.h
-include/libaudcore/vfs_buffer.h
-include/libaudcore/vfs_buffered_file.h
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-%%WITH_DBUS%%lib/libaudclient.so
-%%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/libaudgui.so
-lib/libaudgui.so.1
-lib/libaudgui.so.1.0.0
-lib/libaudtag.so
-lib/libaudtag.so.1
-lib/libaudtag.so.1.0.0
-libdata/pkgconfig/audacious.pc
-libdata/pkgconfig/audclient.pc
-share/applications/audacious.desktop
-%%DATADIR%%/images/about-logo.png
-%%DATADIR%%/images/album.png
-%%DATADIR%%/images/audacious_eq.xpm
-%%DATADIR%%/images/audacious_playlist.xpm
 %%DATADIR%%/images/audacious_player.xpm
 %%DATADIR%%/images/audio.png
+%%DATADIR%%/images/audacious_eq.xpm
+%%DATADIR%%/images/menu_plugin.png
+%%DATADIR%%/images/plugins.png
+%%DATADIR%%/images/audacious_playlist.xpm
+%%DATADIR%%/images/about-logo.png
 %%DATADIR%%/images/connectivity.png
 %%DATADIR%%/images/menu_playlist.png
-%%DATADIR%%/images/menu_plugin.png
-%%DATADIR%%/images/menu_queue_toggle.png
 %%DATADIR%%/images/playlist.png
-%%DATADIR%%/images/plugins.png
-share/icons/hicolor/48x48/apps/audacious.png
-share/icons/hicolor/scalable/apps/audacious.svg
-%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
+%%DATADIR%%/images/menu_queue_toggle.png
+%%DATADIR%%/images/album.png
+%%NLS%%share/locale/et/LC_MESSAGES/audacious.mo
 %%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/hr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sr@Latn/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ast/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/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
-%%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
-%%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/br/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sv/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
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
-%%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/ro/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/it/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/sl/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/hi/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
+share/icons/hicolor/scalable/apps/audacious.svg
+share/icons/hicolor/48x48/apps/audacious.png
 share/pixmaps/audacious.png
 share/pixmaps/audacious.svg
-@dirrmtry %%DATADIR%%/images
-@dirrmtry %%DATADIR%%
+share/applications/audacious.desktop
+%%WITH_DBUS%%bin/audtool
+bin/audacious
+lib/libaudgui.so
+lib/libaudtag.so
+lib/libaudgui.so.1.0.0
+lib/libaudcore.so
+lib/libaudtag.so.1
+lib/libaudcore.so.1
+lib/libaudgui.so.1
+lib/libaudcore.so.1.0.0
+lib/libaudtag.so.1.0.0
+%%WITH_DBUS%%lib/libaudclient.so
+%%WITH_DBUS%%lib/libaudclient.so.2
+%%WITH_DBUS%%lib/libaudclient.so.2.0.0
+libdata/pkgconfig/audacious.pc
+libdata/pkgconfig/audclient.pc
+include/libaudcore/hook.h
+include/libaudcore/vfs_async.h
+include/libaudcore/audstrings.h
+include/libaudcore/tuple.h
+include/libaudcore/audio.h
+include/libaudcore/core.h
+include/libaudcore/vfs.h
+include/libaudcore/index.h
+include/audacious/api.h
+include/audacious/plugins-api.h
+include/audacious/gtk-compat.h
+include/audacious/dbus.h
+include/audacious/api-alias-end.h
+include/audacious/drct.h
+include/audacious/misc.h
+include/audacious/preferences.h
+include/audacious/i18n.h
+include/audacious/audtag.h
+include/audacious/audctrl.h
+include/audacious/playlist.h
+include/audacious/debug.h
+include/audacious/dbus-service.h
+include/audacious/api-alias-begin.h
+include/audacious/playlist-api.h
+include/audacious/misc-api.h
+include/audacious/drct-api.h
+include/audacious/api-define-end.h
+include/audacious/plugins.h
+include/audacious/api-define-begin.h
+include/audacious/plugin.h
+include/audacious/types.h
+include/libaudgui/libaudgui-gtk.h
+include/libaudgui/libaudgui.h
+include/libaudgui/list.h
+@dirrm include/libaudgui
 @dirrm include/audacious
 @dirrm include/libaudcore
-@dirrm include/libaudgui
-@dirrmtry lib/audacious
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
 @dirrmtry share/applications
+@dirrmtry lib/audacious
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%