2 files changed, 37 insertions, 28 deletions

diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 6c6b1f0435dd..c83065bfe698 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -9,14 +9,15 @@ MASTER_SITES=	http://distfiles.audacious-media-player.org/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A media player based on BMP and XMMS
 
-LIB_DEPENDS=	mcs:${PORTSDIR}/devel/libmcs \
-		mowgli:${PORTSDIR}/devel/libmowgli \
-		xml2:${PORTSDIR}/textproc/libxml2
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libmcs.so:${PORTSDIR}/devel/libmcs \
+		libmowgli.so:${PORTSDIR}/devel/libmowgli \
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gmake
+USES=		pkgconfig gmake tar:bzip2 desktop-file-utils
 USE_XORG=	x11 sm
-USE_BZIP2=	yes
 USE_GNOME=	gtk30
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -24,17 +25,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--disable-chardet --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
-
 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
+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.options.mk>
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-glib:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	WITH_DBUS=""
 .else
@@ -43,7 +43,7 @@ PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
 .if  ${PORT_OPTIONS:MEXECINFO} || exists(${LOCALBASE}/lib/libexecinfo.so)
-LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 .endif
 
 .if  ${PORT_OPTIONS:MGNOME}
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-sse2
 .endif
 
 .if  ${PORT_OPTIONS:MCHARSET}
-LIB_DEPENDS+=	guess:${PORTSDIR}/textproc/libguess
+LIB_DEPENDS+=	libguess.so:${PORTSDIR}/textproc/libguess
 CONFIGURE_ARGS+=--enable-chardet
 .else
 CONFIGURE_ARGS+=--disable-chardet
@@ -86,11 +86,11 @@ post-patch:
 .endif
 
 post-install:
-.if defined(WITH_GNOME)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have installed audacious with gconf support."
-	@${ECHO_MSG} "ALL PRESETS will be stored in the gconf database."
-	@${ECHO_MSG} ""
-.endif
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audtool
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/audacious
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudclient.so.2.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudcore.so.1.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudgui.so.1.0.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaudtag.so.1.0.0
 
 .include <bsd.port.mk>
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 8e76720dc804..902ed8c3bf29 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -47,6 +47,8 @@ lib/libaudtag.so.1
 lib/libaudtag.so.1.0.0
 libdata/pkgconfig/audacious.pc
 libdata/pkgconfig/audclient.pc
+man/man1/audacious.1.gz
+man/man1/audtool.1.gz
 share/applications/audacious.desktop
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/COPYING
@@ -64,9 +66,10 @@ share/applications/audacious.desktop
 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/bg/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/audacious.mo
+%%NLS%%share/locale/cmn/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/da/LC_MESSAGES/audacious.mo
 %%NLS%%share/locale/de/LC_MESSAGES/audacious.mo
@@ -109,24 +112,30 @@ share/icons/hicolor/scalable/apps/audacious.svg
 %%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/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/ml_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ml_IN
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
 %%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/cmn/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cmn
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/ml_IN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ml_IN
-man/man1/audacious.1.gz
-man/man1/audtool.1.gz
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
 @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