- Update to 0.5.6

- Remove launcher script

PR:		ports/169293
Submitted by:	RyoTa SimaMoto <liangtai.s4@gmail.com> (maintainer)

multimedia/qmmp/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qmmp
-PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTVERSION=	0.5.6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 		${MASTER_SITE_GOOGLE_CODE}
@@ -23,58 +22,51 @@ USE_QT4=	corelib gui network xml dbus \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
-OPTIONS=	SKINNEDUI	"Skinned GUI" on \
-		APIDOC	"Doxygen generated class reference document" off \
-		PULSE	"Support the PulseAudio output" on \
-		ALSA	"Support the ALSA output" off \
-		OSS	"Support the OSS output" off \
-		OSS4	"Support the OSS4 output" on \
-		JACK	"Support the JACK output" on \
-		NULLOUT	"Support a null output" on \
-		FLAC	"Support to playback FLAC files" on \
-		MUSEPACK	"Support to playback MPC files" on \
-		FFMPEG	"Support to playback FFMPEG files" on \
-		MODPLUG	"Support to playback MOD files" on \
-		WILDMIDI	"Support to playback MIDI files" on \
-		GME	"Support video game music files" on \
-		MAD	"Support to playback MAD files" on \
-		VORBIS	"Support to playback Vorbis/OGG files" on \
-		SNDFILE	"Support to playback Sndfile files" on \
-		WAVPACK	"Support to playback WAVPack files" on \
-		CUE	"Support to CUE sheets" on \
-		CDIO	"Support to playback compact discs" on \
-		FAAD	"Support to playback through FAAD decoder" on \
-		LADSPA	"Support the LADSPA effect" on \
-		CROSSFADE	"Support cross-fade effect" on \
-		BS2B	"Support the Bauer stereophonic2binaural effect" on \
-		STEREO	"Support stereo effect" on \
-		SRCONV 	"Support the sample rate converter" on \
-		MPLAYER	"Support VIDEO playback through Mplayer" on \
-		CURL	"Support cURL streaming transport" on \
-		MMS	"Support MMS streaming transport" on \
-		PROJECTM	"Support the projectM music visualiser" on \
-		ANALYZER	"Supoort spectrum analyzer visualization" on \
-		ENCA	"Support automatic character set detection" on \
-		MPRIS	"Support the Media Player Remote" on \
-		SCROBBLER	"Support Libre.fm/Last.fm scrobbler feature" on \
-		STATICON	"Support to show status icon" on \
-		NOTIFIER	"Support to popup notifier" on \
-		LYRICS	"Support to show lyrics using lyrics.wikia.com" on \
-		HOTKEY	"Support to set shortcut keys" on \
-		FILEOPS	"Support file operation" on \
-		COVER	"Support to show cover images" on \
-		KDENOTIFY	"Support to popup notifier for KDE" on \
-		HAL	"Support removable disc detection using HAL" on \
-		UDISKS	"Support removable disc detection using UDisks" on \
-		QMMP_DIALOG	"An original dialog" on
+OPTIONS_DEFINE=	SKINNEDUI APIDOC PULSEAUDIO ALSA OSS OSS4 JACK NULLOUT \
+		FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD VORBIS SNDFILE \
+		WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B STEREO SRCONV \
+		MPLAYER CURL MMS PROJECTM ANALYZER ENCA MPRIS SCROBBLER \
+		STATICON NOTIFIER LYRICS HOTKEY FILEOPS COVER KDENOTIFY HAL \
+		UDISKS QMMP_DIALOG
+OPTIONS_DEFAULT=	SKINNEDUI PULSEAUDIO ALSA OSS4 JACK NULLOUT FLAC \
+		MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD VORBIS SNDFILE \
+		WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B STEREO SRCONV \
+		MPLAYER CURL MMS PROJECTM ANALYZER ENCA MPRIS SCROBBLER \
+		STATICON NOTIFIER LYRICS HOTKEY FILEOPS COVER KDENOTIFY HAL \
+		UDISKS QMMP_DIALOG
+SKINNEDUI_DESC=	Skinned GUI
+APIDOC_DESC=	Doxygen generated doc (libqmmp libqmmpui)
+OSS4_DESC=	Enable Open Sound System (ver4) support
+NULLOUT_DESC=	Support a null output
+WILDMIDI_DESC=	Support to playback MIDI files
+GME_DESC=	Support video game music files
+CDIO_DESC=	Support to playback compact discs
+CROSSFADE_DESC=	Support cross-fade effect
+BS2B_DESC=	Support the Bauer stereophonic2binaural effect
+STEREO_DESC=	Support stereo effect
+SRCONV_DESC=	Support the sample rate converter
+PROJECTM_DESC=	Support the projectM music visualiser
+ANALYZER_DESC=	Supoort spectrum analyzer visualization
+ENCA_DESC=	Support automatic character set detection
+MPRIS_DESC=	Support the Media Player Remote
+SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
+STATICON_DESC=	Support to show status icon
+NOTIFIER_DESC=	Support to popup notifier
+LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
+HOTKEY_DESC=	Support to set shortcut keys
+FILEOPS_DESC=	Support file operation
+COVER_DESC=	Support to show cover images
+KDENOTIFY_DESC=	Support to popup notifier for KDE
+UDISKS_DESC=	Support removable disc detection using UDisks
+QMMP_DIALOG_DESC=	An original dialog
 
 .include <bsd.port.options.mk>
 
-.ifndef(WITHOUT_APIDOC)
+.if ${PORT_OPTIONS:MAPIDOC}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
-.ifndef(WITHOUT_SKINNEDUI)
+.if ${PORT_OPTIONS:MSKINNEDUI}
 PLIST_SUB+=	SKINNEDUI=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=TRUE
 .else
@@ -82,9 +74,9 @@ PLIST_SUB+=	SKINNEDUI="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_JACK)
+.if ${PORT_OPTIONS:MJACK}
 PLIST_SUB+=	JACK=""
-#LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
 BUILD_DEPENDS+=	jackit>=0.121.2:${PORTSDIR}/audio/jack
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=TRUE
 .else
@@ -92,66 +84,66 @@ PLIST_SUB+=	JACK="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 PLIST_SUB+=	ALSA=""
-LIB_DEPENDS+=	asound.2:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=TRUE
 .else
 PLIST_SUB+=	ALSA="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_BS2B)
+.if ${PORT_OPTIONS:MBS2B}
 PLIST_SUB+=	BS2B=""
-LIB_DEPENDS+=	bs2b.0:${PORTSDIR}/audio/libbs2b
+LIB_DEPENDS+=	bs2b:${PORTSDIR}/audio/libbs2b
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=TRUE
 .else
 PLIST_SUB+=	BS2B="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_PULSE)
+.if ${PORT_OPTIONS:MPULSEAUDIO}
 PLIST_SUB+=	PULSE_AUDIO=""
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=TRUE
 .else
 PLIST_SUB+=	PULSE_AUDIO="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
 PLIST_SUB+=	FLAC=""
-LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=TRUE
 .else
 PLIST_SUB+=	FLAC="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MUSEPACK)
+.if ${PORT_OPTIONS:MMUSEPACK}
 PLIST_SUB+=	MUSEPACK=""
-LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=TRUE
 .else
 PLIST_SUB+=	MUSEPACK="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_GME)
+.if ${PORT_OPTIONS:MGME}
 PLIST_SUB+=	GME=""
-LIB_DEPENDS+=	gme.0:${PORTSDIR}/audio/libgme
+LIB_DEPENDS+=	gme:${PORTSDIR}/audio/libgme
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=TRUE
 .else
 PLIST_SUB+=	GME="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 PLIST_SUB+=	FFMPEG=""
 . if exists(${LOCALBASE}/include/libavcodec/vda.h)
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg-devel
 . else
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
 . endif
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=TRUE
 .else
@@ -159,43 +151,43 @@ PLIST_SUB+=	FFMPEG="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MODPLUG)
+.if ${PORT_OPTIONS:MMODPLUG}
 PLIST_SUB+=	MODPLUG=""
-LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug
+LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=TRUE
 .else
 PLIST_SUB+=	MODPLUG="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_FAAD)
+.if ${PORT_OPTIONS:MFAAD}
 PLIST_SUB+=	FAAD=""
-LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=TRUE
 .else
 PLIST_SUB+=	FAAD="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_CDIO)
+.if ${PORT_OPTIONS:MCDIO}
 PLIST_SUB+=	CDIO=""
-LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
+LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=TRUE
 .else
 PLIST_SUB+=	CDIO="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_ENCA)
+.if ${PORT_OPTIONS:MENCA}
 PLIST_SUB+=	ENCA=""
-LIB_DEPENDS+=	enca.5:${PORTSDIR}/converters/enca
+LIB_DEPENDS+=	enca:${PORTSDIR}/converters/enca
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=TRUE
 .else
 PLIST_SUB+=	ENCA="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MPLAYER)
+.if ${PORT_OPTIONS:MMPLAYER}
 PLIST_SUB+=	MPLAYER=""
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=TRUE
@@ -204,7 +196,7 @@ PLIST_SUB+=	MPLAYER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_PROJECTM)
+.if ${PORT_OPTIONS:MPROJECTM}
 PLIST_SUB+=	PROJECTM=""
 LIB_DEPENDS+=	projectM.2:${PORTSDIR}/graphics/libprojectm
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=TRUE
@@ -213,7 +205,7 @@ PLIST_SUB+=	PROJECTM="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_OSS)
+.if ${PORT_OPTIONS:MOSS}
 PLIST_SUB+=	OSS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=TRUE
 .else
@@ -221,7 +213,7 @@ PLIST_SUB+=	OSS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_OSS4)
+.if ${PORT_OPTIONS:MOSS4}
 PLIST_SUB+=	OSS4=""
 BUILD_DEPENDS+=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS4:BOOL=TRUE
@@ -230,7 +222,7 @@ PLIST_SUB+=	OSS4="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS4:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_LADSPA)
+.if ${PORT_OPTIONS:MLADSPA}
 PLIST_SUB+=	LADSPA=""
 RUN_DEPENDS+=	analyseplugin:${PORTSDIR}/audio/ladspa
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=TRUE
@@ -239,70 +231,70 @@ PLIST_SUB+=	LADSPA="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_WILDMIDI)
+.if ${PORT_OPTIONS:MWILDMIDI}
 PLIST_SUB+=	WILDMIDI=""
-LIB_DEPENDS+=	WildMidi.2:${PORTSDIR}/audio/wildmidi
+LIB_DEPENDS+=	WildMidi:${PORTSDIR}/audio/wildmidi
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=TRUE
 .else
 PLIST_SUB+=	WILDMIDI="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MAD)
+.if ${PORT_OPTIONS:MMAD}
 PLIST_SUB+=	MAD=""
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=TRUE
 .else
 PLIST_SUB+=	MAD="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_SNDFILE)
+.if ${PORT_OPTIONS:MSNDFILE}
 PLIST_SUB+=	SNDFILE=""
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=TRUE
 .else
 PLIST_SUB+=	SNDFILE="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
 PLIST_SUB+=	VORBIS=""
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=	vorbis:${PORTSDIR}/audio/libvorbis
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=TRUE
 .else
 PLIST_SUB+=	VORBIS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_WAVPACK)
+.if ${PORT_OPTIONS:MWAVPACK}
 PLIST_SUB+=	WAVPACK=""
-LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=TRUE
 .else
 PLIST_SUB+=	WAVPACK="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_CURL)
+.if ${PORT_OPTIONS:MCURL}
 PLIST_SUB+=	CURL=""
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=TRUE
 .else
 PLIST_SUB+=	CURL="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MMS)
+.if ${PORT_OPTIONS:MMMS}
 PLIST_SUB+=	MMS=""
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+LIB_DEPENDS+=	mms:${PORTSDIR}/net/libmms
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=TRUE
 .else
 PLIST_SUB+=	MMS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_CUE)
+.if ${PORT_OPTIONS:MCUE}
 PLIST_SUB+=	CUE=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=TRUE
 .else
@@ -310,7 +302,7 @@ PLIST_SUB+=	CUE="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_NULLOUT)
+.if ${PORT_OPTIONS:MNULLOUT}
 PLIST_SUB+=	NULLOUT=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=TRUE
 .else
@@ -318,7 +310,7 @@ PLIST_SUB+=	NULLOUT="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_SRCONV)
+.if ${PORT_OPTIONS:MSRCONV}
 PLIST_SUB+=	SRCONV=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=TRUE
 .else
@@ -326,7 +318,7 @@ PLIST_SUB+=	SRCONV="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_CROSSFADE)
+.if ${PORT_OPTIONS:MCROSSFADE}
 PLIST_SUB+=	CROSSFADE=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=TRUE
 .else
@@ -334,7 +326,7 @@ PLIST_SUB+=	CROSSFADE="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_STEREO)
+.if ${PORT_OPTIONS:MSTEREO}
 PLIST_SUB+=	STEREO=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=TRUE
 .else
@@ -342,7 +334,7 @@ PLIST_SUB+=	STEREO="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_ANALYZER)
+.if ${PORT_OPTIONS:MANALYZER}
 PLIST_SUB+=	ANALYZER=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=TRUE
 .else
@@ -350,7 +342,7 @@ PLIST_SUB+=	ANALYZER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_MPRIS)
+.if ${PORT_OPTIONS:MMPRIS}
 PLIST_SUB+=	MPRIS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=TRUE
 .else
@@ -358,7 +350,7 @@ PLIST_SUB+=	MPRIS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_SCROBBLER)
+.if ${PORT_OPTIONS:MSCROBBLER}
 PLIST_SUB+=	SCROBBLER=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=TRUE
 .else
@@ -366,7 +358,7 @@ PLIST_SUB+=	SCROBBLER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_STATICON)
+.if ${PORT_OPTIONS:MSTATICON}
 PLIST_SUB+=	STATICON=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=TRUE
 .else
@@ -374,7 +366,7 @@ PLIST_SUB+=	STATICON="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_NOTIFIER)
+.if ${PORT_OPTIONS:MNOTIFIER}
 PLIST_SUB+=	NOTIFIER=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=TRUE
 .else
@@ -382,7 +374,7 @@ PLIST_SUB+=	NOTIFIER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_LYRICS)
+.if ${PORT_OPTIONS:MLYRICS}
 PLIST_SUB+=	LYRICS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=TRUE
 .else
@@ -390,7 +382,7 @@ PLIST_SUB+=	LYRICS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_HAL)
+.if ${PORT_OPTIONS:MHAL}
 PLIST_SUB+=	HAL=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=TRUE
 .else
@@ -398,7 +390,7 @@ PLIST_SUB+=	HAL="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_HOTKEY)
+.if ${PORT_OPTIONS:MHOTKEY}
 PLIST_SUB+=	HOTKEY=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=TRUE
 .else
@@ -406,7 +398,7 @@ PLIST_SUB+=	HOTKEY="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_FILEOPS)
+.if ${PORT_OPTIONS:MFILEOPS}
 PLIST_SUB+=	FILEOPS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=TRUE
 .else
@@ -414,7 +406,7 @@ PLIST_SUB+=	FILEOPS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_COVER)
+.if ${PORT_OPTIONS:MCOVER}
 PLIST_SUB+=	COVER=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=TRUE
 .else
@@ -422,7 +414,7 @@ PLIST_SUB+=	COVER="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_KDENOTIFY)
+.if ${PORT_OPTIONS:MKDENOTIFY}
 PLIST_SUB+=	KDENOTIFY=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=TRUE
 .else
@@ -430,7 +422,7 @@ PLIST_SUB+=	KDENOTIFY="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_UDISKS)
+.if ${PORT_OPTIONS:MUDISKS}
 PLIST_SUB+=	UDISKS=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=TRUE
 .else
@@ -438,7 +430,7 @@ PLIST_SUB+=	UDISKS="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=FALSE
 .endif
 
-.ifndef(WITHOUT_QMMP_DIALOG)
+.if ${PORT_OPTIONS:MQMMP_DIALOG}
 PLIST_SUB+=	QMMP_DIALOG=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=TRUE
 .else
@@ -446,16 +438,15 @@ PLIST_SUB+=	QMMP_DIALOG="@comment "
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=FALSE
 .endif
 
-.if !defined(WITHOUT_FAAD) || !defined(WITHOUT_MAD) \
-	|| !defined(WITHOUT_MUSEPACK) || !defined(WITHOUT_FLAC) \
-	|| !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
+.if ${PORT_OPTIONS:MFAAD} || ${PORT_OPTIONS:MMAD} \
+	|| ${PORT_OPTIONS:MMUSEPACK} || ${PORT_OPTIONS:MFLAC} \
+	|| ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
 .endif
 
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 
 PORTDOCS=	README README.RUS AUTHORS
-SUB_FILES=	qmmp
 INSTALLS_ICONS=	yes
 
 CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} \
@@ -465,28 +456,23 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|g' \
+	${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|DESTINATION bin|DESTINATION libexec|' \
-		${WRKSRC}/src/ui/CMakeLists.txt
 
 pre-configure:
 	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build:
-.ifndef(WITHOUT_APIDOC)
+.if ${PORT_OPTIONS:MAPIDOC}
 	cd ${WRKSRC}/doc && doxygen Doxyfile
 .endif
 
 post-install:
-.ifndef(WITHOUT_SKINNEDUI)
-	${INSTALL_SCRIPT} ${WRKDIR}/qmmp ${PREFIX}/bin
-.endif
 .ifndef(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}; \
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${DOCSDIR}
 .endif
-.ifndef(WITHOUT_APIDOC)
+.if ${PORT_OPTIONS:MAPIDOC}
 	${MKDIR} ${DOCSDIR}/html/search ; \
 	cd ${WRKSRC}/doc/html && ${INSTALL_MAN} *.html *.png *.css ${DOCSDIR}/html ; \
 	cd ${WRKSRC}/doc/html/search && \

multimedia/qmmp/distinfo

@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.5.5.tar.bz2) = 525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6
-SIZE (qmmp-0.5.5.tar.bz2) = 709008
+SHA256 (qmmp-0.5.6.tar.bz2) = 3ca6b1ebe0c985a153bc82db757de3032d3593fe9eb73397c51cf0954b66a889
+SIZE (qmmp-0.5.6.tar.bz2) = 708987

multimedia/qmmp/files/qmmp.in

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-LOCALDIR=%%PREFIX%%
-QT_LIB_DIR=${LOCALDIR}/lib/qt4
-QMMP_LIB_DIRS=${LOCALDIR}/lib:${LOCALDIR}/lib/qmmp
-
-if [ -z ${LD_LIBRARY_PATH} ]; then
-    LD_LIBRARY_PATH=${QMMP_LIB_DIRS}:${QT_LIB_DIR}
-else
-    LD_LIBRARY_PATH=${QMMP_LIB_DIRS}:${QT_LIB_DIR}:${LD_LIBRARY_PATH}
-fi
-
-echo 'Setting LD_LIBRARY_PATH to'
-echo "$LD_LIBRARY_PATH" | awk -F: '{ for(i = 1; i <= NF; i++) printf "%d) %s\n", i, $i; }'
-export LD_LIBRARY_PATH
-echo
-
-cd ${LOCALDIR}/lib/qmmp
-exec ${LOCALDIR}/libexec/qmmp "$@"

multimedia/qmmp/pkg-plist

@@ -1,5 +1,4 @@
 %%SKINNEDUI%%bin/qmmp
-%%SKINNEDUI%%libexec/qmmp
 include/qmmp/abstractengine.h
 include/qmmp/audioparameters.h
 include/qmmp/buffer.h