7 files changed, 159 insertions, 149 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 2426d87f6918..6cf23851b519 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,44 +6,42 @@
 #
 
 PORTNAME=	audacious
-PORTVERSION=	3.2.4
+PORTVERSION=	3.3.3
 CATEGORIES=	multimedia audio
 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
+LIB_DEPENDS=	mcs:${PORTSDIR}/devel/libmcs \
+		mowgli:${PORTSDIR}/devel/libmowgli \
+		xml2:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 sm
 USE_BZIP2=	yes
-USE_GNOME=	gtk20 libglade2
+USE_GNOME=	gtk30
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS=	--disable-gtk3 --disable-chardet
+CONFIGURE_ARGS=	--disable-chardet
 
 MAN1=		audacious.1 audtool.1
 
-PORTDOCS=	AUTHORS
+PORTDOCS= AUTHORS
 
-OPTIONS=	DBUS	"Build with dbus support"			on  \
-		GNOME	"Build with gconf support"			off \
-		ICONV	"Build with iconv support"			on  \
-		NLS	"Native Language Support"			on  \
-		EXECINFO "Build with libexecinfo support"		on  \
-		SSE2	"Build with SSE2 instruction set"		on  \
-		CHARSET	"Build with automatic charset detection"	on
+OPTIONS_DEFINE=	DBUS GNOME ICONV NLS EXECINFO SSE2 CHARSET
+OPTIONS_DEFAULT= DBUS ICONV NLS EXECINFO SSE2 CHARSET
+CHARSET_DESC= Build with automatic charset detection
+EXECINFO_DESC= Build with libexecinfo support
+SSE2_DESC=Build with SSE2 instruction set
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.if ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS+=	dbus-glib:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	WITH_DBUS=""
 .else
@@ -51,20 +49,20 @@ CONFIGURE_ARGS+=--disable-dbus
 PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
-.if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
-LIB_DEPENDS+=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+.if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
+LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 .endif
 
-.if defined(WITH_GNOME)
+.if  ${PORT_OPTIONS:MGNOME}
 USE_GNOME+=	gconf2
 CONFIGURE_ARGS+=--enable-gconf
 .endif
 
-.if defined(WITH_ICONV) || exists(${LOCALBASE}/lib/libiconv.so)
+.if  ${PORT_OPTIONS:MICONV} || exists(${LOCALBASE}/lib/libiconv.so)
 USE_ICONV=	yes
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if  ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
@@ -73,12 +71,12 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITHOUT_SSE2)
+.if  empty(PORT_OPTIONS:MSSE2)
 CONFIGURE_ARGS+=--disable-sse2
 .endif
 
-.if defined(WITH_CHARSET)
-LIB_DEPENDS+=	guess.1:${PORTSDIR}/textproc/libguess
+.if  ${PORT_OPTIONS:MCHARSET}
+LIB_DEPENDS+=	guess:${PORTSDIR}/textproc/libguess
 CONFIGURE_ARGS+=--enable-chardet
 .else
 CONFIGURE_ARGS+=--disable-chardet
@@ -87,7 +85,7 @@ CONFIGURE_ARGS+=--disable-chardet
 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
-.if defined(WITH_EXECINFO) || exists(${LOCALBASE}/lib/libexecinfo.so)
+.if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
 	@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
 		${WRKSRC}/src/audacious/Makefile
 	@${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \
@@ -109,4 +107,4 @@ post-install:
 	@${ECHO_MSG} ""
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 9f88adae53eb..8ce065659639 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.2.4.tar.bz2) = 12a14542883407110d2b4367db38e8e0620d83a266388427f358a66689a4553a
-SIZE (audacious-3.2.4.tar.bz2) = 690943
+SHA256 (audacious-3.3.3.tar.bz2) = bda1074c98284471b8ded1caa5f640cdde6e8723fa8b3f4fd685de97228f7c94
+SIZE (audacious-3.3.3.tar.bz2) = 470286
diff --git a/multimedia/audacious/files/patch-buildsys.mk.in b/multimedia/audacious/files/patch-buildsys.mk.in
index 7e42c0e1c765..488ecd563446 100644
--- a/multimedia/audacious/files/patch-buildsys.mk.in
+++ b/multimedia/audacious/files/patch-buildsys.mk.in
@@ -1,20 +1,20 @@
---- 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 @@
+--- buildsys.mk.in.orig	2012-10-28 10:42:20.000000000 +0100
++++ buildsys.mk.in	2012-10-28 10:43:37.000000000 +0100
+@@ -132,7 +132,7 @@
  	done; \
- 	if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \
+ 	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
  		${DEPEND_STATUS}; \
 -		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 \
-@@ -144,7 +144,7 @@
+@@ -151,7 +151,7 @@
  
- ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
  	${LINK_STATUS}
--	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
-+	if ${LD} -o $@ ${OBJS} ${LIBS} ${LDFLAGS} ; then \
+-	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
++	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LIBS} ${LDFLAGS}; then \
  		${LINK_OK}; \
  	else \
  		${LINK_FAILED}; \
diff --git a/multimedia/audacious/files/patch-extra.mk.in b/multimedia/audacious/files/patch-extra.mk.in
index 68cb54e3683d..552b76589a17 100644
--- a/multimedia/audacious/files/patch-extra.mk.in
+++ b/multimedia/audacious/files/patch-extra.mk.in
@@ -1,8 +1,7 @@
---- extra.mk.in.orig        2012-05-07 10:02:17.638673570 +0300
-+++ extra.mk.in        2012-05-07 10:02:36.142671894 +0300
-@@ -35,3 +35,5 @@ REGEX_CFLAGS ?= @REGEX_CFLAGS@
+--- extra.mk.in.orig	2012-10-28 10:46:45.000000000 +0100
++++ extra.mk.in	2012-10-28 10:47:04.000000000 +0100
+@@ -31,3 +31,4 @@
+ LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
+ REGEX_CFLAGS ?= @REGEX_CFLAGS@
  REGEX_LIBS ?= @REGEX_LIBS@
- SM_CFLAGS ?= @SM_CFLAGS@
- SM_LIBS ?= @SM_LIBS@
-+
 +LIBINTL ?= @LIBINTL@
diff --git a/multimedia/audacious/files/patch-src-audacious-output.c b/multimedia/audacious/files/patch-src-audacious-output.c
new file mode 100644
index 000000000000..08096865febe
--- /dev/null
+++ b/multimedia/audacious/files/patch-src-audacious-output.c
@@ -0,0 +1,10 @@
+--- src/audacious/output.c.orig	2012-10-28 10:48:02.000000000 +0100
++++ src/audacious/output.c	2012-10-28 10:48:15.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ 
+ #include <libaudcore/hook.h>
++#include <libaudcore/audio.h>
+ 
+ #include "debug.h"
+ #include "effect.h"
diff --git a/multimedia/audacious/pkg-message b/multimedia/audacious/pkg-message
index 6554cd7cb32c..c387c58c1b4f 100644
--- a/multimedia/audacious/pkg-message
+++ b/multimedia/audacious/pkg-message
@@ -6,5 +6,3 @@ ATTENTION!
 
   You should now go and install multimedia/audacious-plugins. Without it,
   audacious is useless!
-
-
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 2a31b208d67f..0e23a845bda5 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,118 +1,123 @@
-%%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
+bin/audacious
+bin/audtool
+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/audctrl.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/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/core.h
+include/libaudcore/hook.h
+include/libaudcore/index.h
+include/libaudcore/tuple.h
+include/libaudcore/vfs.h
+include/libaudcore/vfs_async.h
+include/libaudgui/libaudgui-gtk.h
+include/libaudgui/libaudgui.h
+include/libaudgui/list.h
+lib/libaudclient.so
+lib/libaudclient.so.2
+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%%/AUTHORS
+%%DATADIR%%/COPYING
 %%DATADIR%%/images/about-logo.png
+%%DATADIR%%/images/album.png
+%%DATADIR%%/images/audacious.png
+%%DATADIR%%/images/audio.png
 %%DATADIR%%/images/connectivity.png
+%%DATADIR%%/images/info.png
 %%DATADIR%%/images/menu_playlist.png
-%%DATADIR%%/images/playlist.png
+%%DATADIR%%/images/menu_plugin.png
 %%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/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
+%%DATADIR%%/images/playlist.png
+%%DATADIR%%/images/plugins.png
+%%DOCSDIR%%/AUTHORS
+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
+%%NLS%%share/locale/ca/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/es_AR/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/et/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/eu/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/fa_IR/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/ru/LC_MESSAGES/audacious.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/he/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/id_ID/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/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/ja/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/ky/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/pt_PT/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/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
-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
-@dirrmtry share/locale/es_AR/LC_MESSAGES
-@dirrmtry share/locale/es_AR
-@dirrmtry share/applications
-@dirrmtry lib/audacious
+%%NLS%%share/locale/sr/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/sr@latin/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%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sr@latin
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
+%%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_AR
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm include/libaudgui
+@dirrm include/libaudcore
+@dirrm include/audacious
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true