4 files changed, 56 insertions, 65 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index de270dc9f542..79252c84361e 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -2,82 +2,57 @@
 # $FreeBSD$
 
 PORTNAME=	audacious
-PORTVERSION=	3.6.2
+PORTVERSION=	3.7
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.audacious-media-player.org/
 
-MAINTAINER=	oliver@FreeBSD.org
+MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Media player based on BMP and XMMS
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libmcs.so:${PORTSDIR}/devel/libmcs \
-		libmowgli.so:${PORTSDIR}/devel/libmowgli
-
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake tar:bzip2 desktop-file-utils gettext-tools compiler:c++11-lib
+USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake \
+	pkgconfig tar:bzip2
 USE_XORG=	x11 sm
-USE_GNOME=	gtk30 libxml2
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--disable-chardet --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-
-OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO SSE2
-OPTIONS_DEFAULT=DBUS ICONV NLS EXECINFO SSE2
+INSTALLS_ICONS=	yes
+
+CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
+OPTIONS_MULTI=	TOOLKITS
+OPTIONS_MULTI_TOOLKITS=	GTK2 QT5
+OPTIONS_DEFINE=	DBUS ICONV NLS EXECINFO
+OPTIONS_DEFAULT=DBUS GTK2 ICONV NLS EXECINFO
+DBUS_LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+ICONV_USES=	iconv
+GTK2_USE=	gnome=gtk20
+GTK2_IMPLIES=	DBUS
+GTK2_CONFIGURE_ENABLE=	gtk
+QT5_USE=	qt5=core,gui,widgets
+QT5_CONFIGURE_ENABLE=	qt
+QT5_IMPLIES=	DBUS
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_OFF=	--disable-nls
+NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-Makefile
+EXECINFO_USES=	execinfo
+OPTIONS_SUB=	yes
 EXECINFO_DESC=	Build with libexecinfo support
-SSE2_DESC=	Build with SSE2 instruction set
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+=	WITH_DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	WITH_DBUS="@comment "
-.endif
-
-.if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
-LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
-.endif
-
-.if  ${PORT_OPTIONS:MICONV} || exists(${LOCALBASE}/lib/libiconv.so)
-USES+=		iconv
-.endif
-
-.if  ${PORT_OPTIONS:MNLS}
-USES+=		gettext-runtime
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if  empty(PORT_OPTIONS:MSSE2)
-CONFIGURE_ARGS+=--disable-sse2
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile
 .if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
-	@${REINPLACE_CMD} 's|$${REGEX_LIBS}|& -L${LOCALBASE}/lib -lexecinfo|' \
+	@${REINPLACE_CMD} 's|-lm |-lm -L${LOCALBASE}/lib -lexecinfo |' \
 		${WRKSRC}/src/audacious/Makefile
 	@${REINPLACE_CMD} 's|-laudcore|-laudcore -L${LOCALBASE}/lib -lexecinfo|' \
 		${WRKSRC}/audacious.pc.in
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audacious
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.3.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.3.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.2.0.0
-.if ${PORT_OPTIONS:MDBUS}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audtool
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aud*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*
 
 .include <bsd.port.mk>
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 8a19dabdee97..8fada7c9ab22 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.6.2.tar.bz2) = b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04
-SIZE (audacious-3.6.2.tar.bz2) = 539843
+SHA256 (audacious-3.7.tar.bz2) = 4e5a74394c85b1135fc5a89dcc3a03601cddc53af060f587e489352d1fc9cf67
+SIZE (audacious-3.7.tar.bz2) = 570484
diff --git a/multimedia/audacious/files/extra-patch-Makefile b/multimedia/audacious/files/extra-patch-Makefile
new file mode 100644
index 000000000000..256612067781
--- /dev/null
+++ b/multimedia/audacious/files/extra-patch-Makefile
@@ -0,0 +1,8 @@
+--- Makefile.orig	2015-11-08 04:44:35 UTC
++++ Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS = src man images po
++SUBDIRS = src man images
+ 
+ DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk
+ 
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 5c99046497f8..0332cc149369 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,5 +1,5 @@
 bin/audacious
-%%WITH_DBUS%%bin/audtool
+%%DBUS%%bin/audtool
 include/audacious/audtag.h
 include/libaudcore/audio.h
 include/libaudcore/audstrings.h
@@ -27,19 +27,27 @@ include/libaudcore/tuple.h
 include/libaudcore/vfs.h
 include/libaudcore/vfs_async.h
 include/libaudcore/visualizer.h
-include/libaudgui/libaudgui-gtk.h
-include/libaudgui/libaudgui.h
-include/libaudgui/list.h
-include/libaudgui/menu.h
+%%GTK2%%include/libaudgui/libaudgui-gtk.h
+%%GTK2%%include/libaudgui/libaudgui.h
+%%GTK2%%include/libaudgui/list.h
+%%GTK2%%include/libaudgui/menu.h
+%%QT5%%include/libaudqt/iface.h
+%%QT5%%include/libaudqt/info-widget.h
+%%QT5%%include/libaudqt/libaudqt.h
+%%QT5%%include/libaudqt/menu.h
+%%QT5%%include/libaudqt/volumebutton.h
 lib/libaudcore.so
 lib/libaudcore.so.3
-lib/libaudcore.so.3.0.0
-lib/libaudgui.so
-lib/libaudgui.so.3
-lib/libaudgui.so.3.0.0
+lib/libaudcore.so.3.1.0
+%%GTK2%%lib/libaudgui.so
+%%GTK2%%lib/libaudgui.so.3
+%%GTK2%%lib/libaudgui.so.3.1.0
+%%QT5%%lib/libaudqt.so
+%%QT5%%lib/libaudqt.so.0
+%%QT5%%lib/libaudqt.so.0.1.0
 lib/libaudtag.so
 lib/libaudtag.so.2
-lib/libaudtag.so.2.0.0
+lib/libaudtag.so.2.1.0
 libdata/pkgconfig/audacious.pc
 man/man1/audacious.1.gz
 man/man1/audtool.1.gz