- Add an optional modplug support [1]

- Pet portlint
- Don't explicitly remove share/applications dir

PR:		91521 (based on) [1]
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com> [1]
Approved by:	Stepan Zastupov (maintainer)

4 files changed, 50 insertions, 28 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 9da96c1..887f81b 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -42,6 +42,7 @@ VISUALIZATION_PLUGINS=	blur_scope
 
 OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		FLAC	"Enable flac input" on \
+		MODPLUG	"Enable modplug input" off \
 		ESOUND	"Enable Esound output"  off \
 		VISUAL  "Enable libvisual plugin" off \
 		ID3V2	"Enable id3v2 editing" off \
@@ -52,31 +53,40 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Plugins_Input_wma_iir.h
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Plugins_Input_wma_iir.h
 .endif
 
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
-PLIST_SUB+=	VORBISPLUGIN:=""
+PLIST_SUB+=	VORBISPLUGIN=""
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN:="@comment "
+PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_FLAC)
 INPUT_PLUGINS+=	flac
-PLIST_SUB+=	FLACPLUGIN:=""
+PLIST_SUB+=	FLACPLUGIN=""
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 .else
-PLIST_SUB+=	FLACPLUGIN:="@comment "
+PLIST_SUB+=	FLACPLUGIN="@comment "
 CONFIGURE_ARGS+=	--disable-flac
 .endif
 
+.if !defined(WITHOUT_MODPLUG)
+INPUT_PLUGINS+=	modplug
+PLIST_SUB+=	MODPLUG=""
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+.else
+PLIST_SUB+=	MODPLUG="@comment "
+CONFIGURE_ARGS+=	--disable-modplug
+.endif
+
 .if defined(WITH_ESOUND)
 USE_GNOME+=	esound
 OUTPUT_PLUGINS+=	esd
-PLIST_SUB+=	ESDPLUGIN:=""
+PLIST_SUB+=	ESDPLUGIN=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
 .else
@@ -84,15 +94,15 @@ PKGNAMESUFFIX=	-esound
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN:="@comment "
+PLIST_SUB+=	ESDPLUGIN="@comment "
 .endif
 
 .if defined(WITH_VISUAL)
-PLIST_SUB+=	LIBVISUAL:=""
+PLIST_SUB+=	LIBVISUAL=""
 VISUALIZATION_PLUGINS+=	libvisual-proxy
 LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
 .else
-PLIST_SUB+=	LIBVISUAL:="@comment "
+PLIST_SUB+=	LIBVISUAL="@comment "
 .endif
 
 .if defined(WITH_ID3V2)
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 1eeb991..609f0b6 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -16,18 +16,19 @@ lib/audacious/Input/libcdaudio.so
 lib/audacious/Input/libconsole.so
 lib/audacious/Input/libmpg123.so
 lib/audacious/Input/libtonegen.so
-%%VORBISPLUGIN:%%lib/audacious/Input/libvorbis.so
-%%FLACPLUGIN:%%lib/audacious/Input/libflac.so
+%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
+%%FLACPLUGIN%%lib/audacious/Input/libflac.so
+%%MODPLUG%%lib/audacious/Input/libmodplug.so
 lib/audacious/Input/libwav.so
 lib/audacious/Input/libwma.so
 lib/audacious/Output/libOSS.so
-%%ESDPLUGIN:%%lib/audacious/Output/libesdout.so
+%%ESDPLUGIN%%lib/audacious/Output/libesdout.so
 lib/audacious/Output/libcrossfade.a
 lib/audacious/Output/libcrossfade.so
 lib/audacious/Output/libcrossfade.so.0
 lib/audacious/Output/libdisk_writer.so
 lib/audacious/Visualization/libbscope.so
-%%LIBVISUAL:%%lib/audacious/Visualization/libvisual_proxy.so
+%%LIBVISUAL%%lib/audacious/Visualization/libvisual_proxy.so
 lib/libaudacious.a
 lib/libaudacious.so
 lib/libaudacious.so.2
@@ -87,7 +88,6 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm %%DATADIR%%/Skins/Default
 @dirrm %%DATADIR%%/Skins
 @dirrm %%DATADIR%%
-@dirrm share/applications
 @dirrm lib/audacious/Visualization
 @dirrm lib/audacious/Output
 @dirrm lib/audacious/Input
@@ -95,3 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious
 @dirrm include/audacious
+@unexec rmdir %D/share/applications 2>/dev/null || true
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 9da96c1..887f81b 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -42,6 +42,7 @@ VISUALIZATION_PLUGINS=	blur_scope
 
 OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 		FLAC	"Enable flac input" on \
+		MODPLUG	"Enable modplug input" off \
 		ESOUND	"Enable Esound output"  off \
 		VISUAL  "Enable libvisual plugin" off \
 		ID3V2	"Enable id3v2 editing" off \
@@ -52,31 +53,40 @@ OPTIONS=	VORBIS	"Enable Ogg Vorbis input" on \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 503000
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Plugins_Input_wma_iir.h
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Plugins_Input_wma_iir.h
 .endif
 
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 INPUT_PLUGINS+=	vorbis
-PLIST_SUB+=	VORBISPLUGIN:=""
+PLIST_SUB+=	VORBISPLUGIN=""
 .else
 CONFIGURE_ARGS+=	--disable-vorbis
-PLIST_SUB+=	VORBISPLUGIN:="@comment "
+PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
 .if !defined(WITHOUT_FLAC)
 INPUT_PLUGINS+=	flac
-PLIST_SUB+=	FLACPLUGIN:=""
+PLIST_SUB+=	FLACPLUGIN=""
 LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 .else
-PLIST_SUB+=	FLACPLUGIN:="@comment "
+PLIST_SUB+=	FLACPLUGIN="@comment "
 CONFIGURE_ARGS+=	--disable-flac
 .endif
 
+.if !defined(WITHOUT_MODPLUG)
+INPUT_PLUGINS+=	modplug
+PLIST_SUB+=	MODPLUG=""
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+.else
+PLIST_SUB+=	MODPLUG="@comment "
+CONFIGURE_ARGS+=	--disable-modplug
+.endif
+
 .if defined(WITH_ESOUND)
 USE_GNOME+=	esound
 OUTPUT_PLUGINS+=	esd
-PLIST_SUB+=	ESDPLUGIN:=""
+PLIST_SUB+=	ESDPLUGIN=""
 .if defined(PKGNAMESUFFIX)
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
 .else
@@ -84,15 +94,15 @@ PKGNAMESUFFIX=	-esound
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-esd
-PLIST_SUB+=	ESDPLUGIN:="@comment "
+PLIST_SUB+=	ESDPLUGIN="@comment "
 .endif
 
 .if defined(WITH_VISUAL)
-PLIST_SUB+=	LIBVISUAL:=""
+PLIST_SUB+=	LIBVISUAL=""
 VISUALIZATION_PLUGINS+=	libvisual-proxy
 LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
 .else
-PLIST_SUB+=	LIBVISUAL:="@comment "
+PLIST_SUB+=	LIBVISUAL="@comment "
 .endif
 
 .if defined(WITH_ID3V2)
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 1eeb991..609f0b6 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -16,18 +16,19 @@ lib/audacious/Input/libcdaudio.so
 lib/audacious/Input/libconsole.so
 lib/audacious/Input/libmpg123.so
 lib/audacious/Input/libtonegen.so
-%%VORBISPLUGIN:%%lib/audacious/Input/libvorbis.so
-%%FLACPLUGIN:%%lib/audacious/Input/libflac.so
+%%VORBISPLUGIN%%lib/audacious/Input/libvorbis.so
+%%FLACPLUGIN%%lib/audacious/Input/libflac.so
+%%MODPLUG%%lib/audacious/Input/libmodplug.so
 lib/audacious/Input/libwav.so
 lib/audacious/Input/libwma.so
 lib/audacious/Output/libOSS.so
-%%ESDPLUGIN:%%lib/audacious/Output/libesdout.so
+%%ESDPLUGIN%%lib/audacious/Output/libesdout.so
 lib/audacious/Output/libcrossfade.a
 lib/audacious/Output/libcrossfade.so
 lib/audacious/Output/libcrossfade.so.0
 lib/audacious/Output/libdisk_writer.so
 lib/audacious/Visualization/libbscope.so
-%%LIBVISUAL:%%lib/audacious/Visualization/libvisual_proxy.so
+%%LIBVISUAL%%lib/audacious/Visualization/libvisual_proxy.so
 lib/libaudacious.a
 lib/libaudacious.so
 lib/libaudacious.so.2
@@ -87,7 +88,6 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm %%DATADIR%%/Skins/Default
 @dirrm %%DATADIR%%/Skins
 @dirrm %%DATADIR%%
-@dirrm share/applications
 @dirrm lib/audacious/Visualization
 @dirrm lib/audacious/Output
 @dirrm lib/audacious/Input
@@ -95,3 +95,4 @@ share/locale/zh_TW/LC_MESSAGES/audacious.mo
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious
 @dirrm include/audacious
+@unexec rmdir %D/share/applications 2>/dev/null || true