Bug 183919 - Update: multimedia/qmmp, multimedia/qmmp-plugin-pack
Summary: Update: multimedia/qmmp, multimedia/qmmp-plugin-pack
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-13 10:20 UTC by SimaMoto,RyōTa
Modified: 2013-11-13 14:55 UTC (History)
0 users

See Also:


Attachments
qmmp.port.upgrade.diff (27.08 KB, patch)
2013-11-13 10:48 UTC, SimaMoto,RyōTa
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description SimaMoto,RyōTa 2013-11-13 10:20:00 UTC
* Update qmmp-plugin-pack to version 0.7.3
* Adopt the latest options framework on multimedia/qmmp-plugin-pack
  and multimedia/qmmp
* At qmmp, use general terms for option knobs from Mk/bsd.option.desc.mk:
  - Replace option knob APIDOC with DOXYGEN
  - Replace option knob PULSE_AUDIO with PULSEAUDIO
  

http://github.com/liangtai/FreeBSD-ports/
Comment 1 SimaMoto,RyōTa 2013-11-13 10:48:12 UTC
// Sorry, I made mistake while submission error occurs.
Comment 2 William Grzybowski freebsd_committer 2013-11-13 11:46:44 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 3 dfilter service freebsd_committer 2013-11-13 13:11:11 UTC
Author: wg
Date: Wed Nov 13 13:11:02 2013
New Revision: 333682
URL: http://svnweb.freebsd.org/changeset/ports/333682

Log:
  multimedia/qmmp: use options helpers
  
  PR:		ports/183919
  Submitted by:	maintainer

Modified:
  head/multimedia/qmmp/Makefile
  head/multimedia/qmmp/pkg-plist

Modified: head/multimedia/qmmp/Makefile
==============================================================================
--- head/multimedia/qmmp/Makefile	Wed Nov 13 13:02:56 2013	(r333681)
+++ head/multimedia/qmmp/Makefile	Wed Nov 13 13:11:02 2013	(r333682)
@@ -7,7 +7,7 @@ MASTER_SITES=	http://qmmp.ylsoftware.com
 		${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	liangtai.s16@gmail.com
-COMMENT=	A Qt4-based multimedia player
+COMMENT=	Qt4-based multimedia player
 
 LICENSE=	GPLv2
 
@@ -17,10 +17,11 @@ USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
+OPTIONS_SUB=	yes
 OPTIONS_SINGLE=	MPLAYER
 OPTIONS_SINGLE_MPLAYER=	MPLAYER1 MPLAYER2
-OPTIONS_DEFINE=	ALSA ANALYZER APIDOC BS2B CDIO CONVERTER COPYPASTE \
-		COVER CROSSFADE CUE CURL DIR_ASSOC DOCS ENCA FAAD \
+OPTIONS_DEFINE=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE \
+		COVER CROSSFADE CUE CURL DIR_ASSOC DOCS DOXYGEN ENCA FAAD \
 		FFMPEG FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \
 		LADSPA LYRICS MAD MMS MODPLUG MPLAYER MPRIS MUSEPACK \
 		NOTIFIER NULLOUT OSS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \
@@ -33,496 +34,240 @@ OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDIO
 		NOTIFIER NULLOUT OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \
 		SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
-SKINNEDUI_DESC=	Skinned GUI
-DIR_ASSOC_DESC=	inode/directory mime type association
-APIDOC_DESC=	Doxygen generated doc (libqmmp libqmmpui)
-OSS4_DESC=		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
-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
-COPYPASTE_DESC=	Enable copy/paste track infos between playlists
-ENCA_DESC=		Support automatic character set detection
-#OPUS_DESC=		Enable reading opusfile tags
-CONVERTER_DESC=	Support file type converter
-MPRIS_DESC=	Support the Media Player Remote
-SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
-STATICON_DESC=	Support to show status icon
-SB_DESC=	Browser for IceCast stream directory
-TRACKCHANGE_DESC=	Enable to run external command each track switching
-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 (obsolete)
-UDISKS2_DESC=	Support removable disc detection using UDisks
-QMMP_DIALOG_DESC=	An original dialog
-MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
-MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAPIDOC}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
-.if ${PORT_OPTIONS:MSKINNEDUI}
-PLIST_SUB+=	SKINNEDUI=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=TRUE
-.else
-PLIST_SUB+=	SKINNEDUI="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SKINNED:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MDIR_ASSOC}
-PLIST_SUB+=	DIR_ASSOC=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_DIR_ASSOC:BOOL=TRUE
-.else
-PLIST_SUB+=	DIR_ASSOC="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_DIR_ASSOC:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MJACK}
-PLIST_SUB+=	JACK=""
-LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
-BUILD_DEPENDS+=	jackit>=0.121.2:${PORTSDIR}/audio/jack
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=TRUE
-.else
-PLIST_SUB+=	JACK="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_JACK:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-PLIST_SUB+=	ALSA=""
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=TRUE
-.else
-PLIST_SUB+=	ALSA="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ALSA:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MBS2B}
-PLIST_SUB+=	BS2B=""
-LIB_DEPENDS+=	libbs2b.so:${PORTSDIR}/audio/libbs2b
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=TRUE
-.else
-PLIST_SUB+=	BS2B="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_BS2B:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-PLIST_SUB+=	PULSE_AUDIO=""
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=TRUE
-.else
-PLIST_SUB+=	PULSE_AUDIO="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_PULSE:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-PLIST_SUB+=	FLAC=""
-LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=TRUE
-.else
-PLIST_SUB+=	FLAC="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FLAC:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MMUSEPACK}
-PLIST_SUB+=	MUSEPACK=""
-LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=TRUE
-.else
-PLIST_SUB+=	MUSEPACK="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPC:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MGME}
-PLIST_SUB+=	GME=""
-LIB_DEPENDS+=	libgme.so:${PORTSDIR}/audio/libgme
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=TRUE
-.else
-PLIST_SUB+=	GME="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_GME:BOOL=FALSE
-.endif
-
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=	FFMPEG=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=TRUE
-.else
-PLIST_SUB+=	FFMPEG="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MMODPLUG}
-PLIST_SUB+=	MODPLUG=""
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=TRUE
-.else
-PLIST_SUB+=	MODPLUG="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MODPLUG:BOOL=FALSE
-.endif
+SKINNEDUI_DESC=	Skinned GUI
+SKINNEDUI_CMAKE_ON=	-DUSE_SKINNED:BOOL=TRUE
+SKINNEDUI_CMAKE_OFF=	-DUSE_SKINNED:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MFAAD}
-PLIST_SUB+=	FAAD=""
-LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=TRUE
-.else
-PLIST_SUB+=	FAAD="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_AAC:BOOL=FALSE
-.endif
+DIR_ASSOC_DESC=	inode/directory mime type association
+DIR_ASSOC_CMAKE_ON=	-DUSE_DIR_ASSOC:BOOL=TRUE
+DIR_ASSOC_CMAKE_OFF=	-DUSE_DIR_ASSOC:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCDIO}
-PLIST_SUB+=	CDIO=""
-LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=TRUE
-.else
-PLIST_SUB+=	CDIO="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CDA:BOOL=FALSE
-.endif
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_BUILD_DEPENDS=	jackit>=0.121.2:${PORTSDIR}/audio/jack
+JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
+JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
+
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=TRUE
+ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MENCA} || \
-	(exists(${LOCALBASE}/include/enca.h) && ${PORT_OPTIONS:MCUE})
-PLIST_SUB+=	ENCA=""
-LIB_DEPENDS+=	libenca.so:${PORTSDIR}/converters/enca
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=TRUE
-.else
-PLIST_SUB+=	ENCA="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ENCA:BOOL=FALSE
-.endif
+BS2B_DESC=		Support the Bauer stereophonic2binaural effect
+BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CMAKE_ON=	-DUSE_BS2B:BOOL=TRUE
+BS2B_CMAKE_OFF=	-DUSE_BS2B:BOOL=FALSE
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CMAKE_ON=	-DUSE_PULSE:BOOL=TRUE
+PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSE:BOOL=FALSE
+
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libtag.so:${PORTSDIR}/audio/taglib
+FLAC_CMAKE_ON=	-DUSE_FLAC:BOOL=TRUE
+FLAC_CMAKE_OFF=	-DUSE_FLAC:BOOL=FALSE
+
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
+		libtag.so:${PORTSDIR}/audio/taglib
+MUSEPACK_CMAKE_ON=	-DUSE_MPC:BOOL=TRUE
+MUSEPACK_CMAKE_OFF=	-DUSE_MPC:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MMPLAYER}
-. if ${PORT_OPTIONS:MMPLAYER2}
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer2
-. else
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-. endif
-PLIST_SUB+=	MPLAYER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=TRUE
-.else
-PLIST_SUB+=	MPLAYER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=FALSE
-.endif
+GME_DESC=		Support video game music files
+GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_CMAKE_ON=	-DUSE_GME:BOOL=TRUE
+GME_CMAKE_OFF=	-DUSE_GME:BOOL=FALSE
+
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=TRUE
+FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=FALSE
+
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CMAKE_ON=	-DUSE_MODPLUG:BOOL=TRUE
+MODPLUG_CMAKE_OFF=	-DUSE_MODPLUG:BOOL=FALSE
+
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
+		libtag.so:${PORTSDIR}/audio/taglib
+FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
+FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
+
+CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
+CDIO_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
+CDIO_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MPROJECTM}
-PLIST_SUB+=	PROJECTM=""
-LIB_DEPENDS+=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
-USE_QT4+=	opengl
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=TRUE
-.else
-PLIST_SUB+=	PROJECTM="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_PROJECTM:BOOL=FALSE
-.endif
+ENCA_DESC=		Support automatic character set detection
+ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
+ENCA_CMAKE_ON=	-DUSE_ENCA:BOOL=TRUE
+ENCA_CMAKE_OFF=	-DUSE_ENCA:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MOSS}
-PLIST_SUB+=	OSS=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=TRUE
-.else
-PLIST_SUB+=	OSS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS:BOOL=FALSE
-.endif
+MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
+MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
+MPLAYER1_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
+MPLAYER2_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer2
+MPLAYER_CMAKE_ON=	-DUSE_MPLAYER:BOOL=TRUE
+MPLAYER_CMAKE_OFF=	-DUSE_MPLAYER:BOOL=FALSE
 
-.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
-.else
-PLIST_SUB+=	OSS4="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_OSS4:BOOL=FALSE
-.endif
+PROJECTM_DESC=	Support the projectM music visualiser
+PROJECTM_LIB_DEPENDS=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
+PROJECTM_USE=	QT4=opengl
+PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
+PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MLADSPA}
-PLIST_SUB+=	LADSPA=""
-RUN_DEPENDS+=	analyseplugin:${PORTSDIR}/audio/ladspa
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=TRUE
-.else
-PLIST_SUB+=	LADSPA="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_LADSPA:BOOL=FALSE
-.endif
+OSS_CMAKE_ON=	-DUSE_OSS:BOOL=TRUE
+OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MWILDMIDI}
-PLIST_SUB+=	WILDMIDI=""
-LIB_DEPENDS+=	libWildMidi.so:${PORTSDIR}/audio/wildmidi
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=TRUE
-.else
-PLIST_SUB+=	WILDMIDI="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MIDI:BOOL=FALSE
-.endif
+OSS4_DESC=		Open Sound System (ver4) support
+OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
+OSS4_CMAKE_ON=	-DUSE_OSS4:BOOL=TRUE
+OSS4_CMAKE_OFF=	-DUSE_OSS4:BOOL=FALSE
+
+LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_CMAKE_ON=	-DUSE_LADSPA:BOOL=TRUE
+LADSPA_CMAKE_OFF=	-DUSE_LADSPA:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MMAD}
-PLIST_SUB+=	MAD=""
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=TRUE
-.else
-PLIST_SUB+=	MAD="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MAD:BOOL=FALSE
-.endif
+WILDMIDI_DESC=	Support to playback MIDI files
+WILDMIDI_LIB_DEPENDS=	libWildMidi.so:${PORTSDIR}/audio/wildmidi
+WILDMIDI_CMAKE_ON=	-DUSE_MIDI:BOOL=TRUE
+WILDMIDI_CMAKE_OFF=	-DUSE_MIDI:BOOL=FALSE
+
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libtag.so:${PORTSDIR}/audio/taglib
+MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
+MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
 
-#.if ${PORT_OPTIONS:MOPUS}
-#PLIST_SUB+=	OPUS=""
-#LIB_DEPENDS+=	libopusfile.so:${PORTSDIR}/audio/opusfile
-#PLUGIN_OPTIONS_CMAKE+=	-DUSE_OPUS:BOOL=TRUE
-#.else
+#OPUS_DESC=		Enable reading opusfile tags
+#OPUS_LIB_DEPENDS=	libopusfile.so:${PORTSDIR}/audio/opusfile \
+#		libtag.so:${PORTSDIR}/audio/taglib
+#OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
+#OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
+CMAKE_ARGS+=	-DUSE_OPUS:BOOL=FALSE
 PLIST_SUB+=	OPUS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_OPUS:BOOL=FALSE
-#.endif
-
-.if ${PORT_OPTIONS:MSNDFILE}
-PLIST_SUB+=	SNDFILE=""
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=TRUE
-.else
-PLIST_SUB+=	SNDFILE="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SNDFILE:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-PLIST_SUB+=	VORBIS=""
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=TRUE
-.else
-PLIST_SUB+=	VORBIS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_VORBIS:BOOL=FALSE
-.endif
 
-.if ${PORT_OPTIONS:MWAVPACK}
-PLIST_SUB+=	WAVPACK=""
-LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=TRUE
-.else
-PLIST_SUB+=	WAVPACK="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_WAVPACK:BOOL=FALSE
-.endif
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
+SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
+
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libtag.so:${PORTSDIR}/audio/taglib
+VORBIS_CMAKE_ON=	-DUSE_VORBIS:BOOL=TRUE
+VORBIS_CMAKE_OFF=	-DUSE_VORBIS:BOOL=FALSE
+
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CMAKE_ON=	-DUSE_WAVPACK:BOOL=TRUE
+WAVPACK_CMAKE_OFF=	-DUSE_WAVPACK:BOOL=FALSE
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CMAKE_ON=	-DUSE_CURL:BOOL=TRUE
+CURL_CMAKE_OFF=	-DUSE_CURL:BOOL=FALSE
+
+MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_CMAKE_ON=	-DUSE_MMS:BOOL=TRUE
+MMS_CMAKE_OFF=	-DUSE_MMS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCURL}
-PLIST_SUB+=	CURL=""
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=TRUE
-.else
-PLIST_SUB+=	CURL="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CURL:BOOL=FALSE
-.endif
+CUE_CMAKE_ON=	-DUSE_CUE:BOOL=TRUE
+CUE_CMAKE_OFF=	-DUSE_CUE:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MMMS}
-PLIST_SUB+=	MMS=""
-LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=TRUE
-.else
-PLIST_SUB+=	MMS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MMS:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MCUE}
-PLIST_SUB+=	CUE=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=TRUE
-.else
-PLIST_SUB+=	CUE="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CUE:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MNULLOUT}
-PLIST_SUB+=	NULLOUT=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=TRUE
-.else
-PLIST_SUB+=	NULLOUT="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_NULL:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MSRCONV}
-PLIST_SUB+=	SRCONV=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=TRUE
-.else
-PLIST_SUB+=	SRCONV="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SRC:BOOL=FALSE
-.endif
+NULLOUT_DESC=	Support a null output
+NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
+NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCROSSFADE}
-PLIST_SUB+=	CROSSFADE=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=TRUE
-.else
-PLIST_SUB+=	CROSSFADE="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CROSSFADE:BOOL=FALSE
-.endif
+SRCONV_DESC=	Support the sample rate converter
+SRCONV_CMAKE_ON=	-DUSE_SRC:BOOL=TRUE
+SRCONV_CMAKE_OFF=	-DUSE_SRC:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MSTEREO}
-PLIST_SUB+=	STEREO=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=TRUE
-.else
-PLIST_SUB+=	STEREO="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_STEREO:BOOL=FALSE
-.endif
+CROSSFADE_DESC=	Support cross-fade effect
+CROSSFADE_CMAKE_ON=	-DUSE_CROSSFADE:BOOL=TRUE
+CROSSFADE_CMAKE_OFF=	-DUSE_CROSSFADE:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MANALYZER}
-PLIST_SUB+=	ANALYZER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=TRUE
-.else
-PLIST_SUB+=	ANALYZER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ANALYZER:BOOL=FALSE
-.endif
+STEREO_DESC=	Support stereo effect
+STEREO_CMAKE_ON=	-DUSE_STEREO:BOOL=TRUE
+STEREO_CMAKE_OFF=	-DUSE_STEREO:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCONVERTER}
-PLIST_SUB+=	CONVERTER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CONVERTER:BOOL=TRUE
-.else
-PLIST_SUB+=	CONVERTER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_CONVERTER:BOOL=FALSE
-.endif
+ANALYZER_DESC=	Supoort spectrum analyzer visualization
+ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
+ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCOPYPASTE}
-PLIST_SUB+=	COPYPASTE=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_COPYPASTE:BOOL=TRUE
-.else
-PLIST_SUB+=	COPYPASTE="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_COPYPASTE:BOOL=FALSE
-.endif
+CONVERTER_DESC=	Support file type converter
+CONVERTER_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+CONVERTER_CMAKE_ON=	-DUSE_CONVERTER:BOOL=TRUE
+CONVERTER_CMAKE_OFF=	-DUSE_CONVERTER:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MMPRIS}
-PLIST_SUB+=	MPRIS=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=TRUE
-.else
-PLIST_SUB+=	MPRIS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPRIS:BOOL=FALSE
-.endif
+COPYPASTE_DESC=	Enable copy/paste track infos between playlists
+COPYPASTE_CMAKE_ON=	-DUSE_COPYPASTE:BOOL=TRUE
+COPYPASTE_CMAKE_OFF=	-DUSE_COPYPASTE:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MSCROBBLER}
-PLIST_SUB+=	SCROBBLER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=TRUE
-.else
-PLIST_SUB+=	SCROBBLER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SCROBBLER:BOOL=FALSE
-.endif
+MPRIS_DESC=	Support the Media Player Remote
+MPRIS_USE=	QT4=dbus
+MPRIS_CMAKE_ON=	-DUSE_MPRIS:BOOL=TRUE
+MPRIS_CMAKE_OFF=	-DUSE_MPRIS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MSTATICON}
-PLIST_SUB+=	STATICON=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=TRUE
-.else
-PLIST_SUB+=	STATICON="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_STATICON:BOOL=FALSE
-.endif
+SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
+SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
+SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MSB}
-PLIST_SUB+=	SB=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SB:BOOL=TRUE
-.else
-PLIST_SUB+=	SB="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_SB:BOOL=FALSE
-.endif
+STATICON_DESC=	Support to show status icon
+STATICON_CMAKE_ON=	-DUSE_STATICON:BOOL=TRUE
+STATICON_CMAKE_OFF=	-DUSE_STATICON:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MNOTIFIER}
-PLIST_SUB+=	NOTIFIER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=TRUE
-.else
-PLIST_SUB+=	NOTIFIER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_NOTIFIER:BOOL=FALSE
-.endif
+SB_DESC=	Browser for IceCast stream directory
+SB_CMAKE_ON=	-DUSE_SB:BOOL=TRUE
+SB_CMAKE_OFF=	-DUSE_SB:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MLYRICS}
-PLIST_SUB+=	LYRICS=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=TRUE
-.else
-PLIST_SUB+=	LYRICS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_LYRICS:BOOL=FALSE
-.endif
+NOTIFIER_DESC=	Support to popup notifier
+NOTIFIER_CMAKE_ON=	-DUSE_NOTIFIER:BOOL=TRUE
+NOTIFIER_CMAKE_OFF=	-DUSE_NOTIFIER:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MHAL}
-PLIST_SUB+=	HAL=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=TRUE
-.else
-PLIST_SUB+=	HAL="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_HAL:BOOL=FALSE
-.endif
+LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
+LYRICS_CMAKE_ON=	-DUSE_LYRICS:BOOL=TRUE
+LYRICS_CMAKE_OFF=	-DUSE_LYRICS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MHOTKEY}
-PLIST_SUB+=	HOTKEY=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=TRUE
-.else
-PLIST_SUB+=	HOTKEY="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_HOTKEY:BOOL=FALSE
-.endif
+HAL_USE=	QT4=dbus
+HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
+HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MFILEOPS}
-PLIST_SUB+=	FILEOPS=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=TRUE
-.else
-PLIST_SUB+=	FILEOPS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FILEOPS:BOOL=FALSE
-.endif
+HOTKEY_DESC=	Support to set shortcut keys
+HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
+HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MCOVER}
-PLIST_SUB+=	COVER=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=TRUE
-.else
-PLIST_SUB+=	COVER="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_COVER:BOOL=FALSE
-.endif
+FILEOPS_DESC=	Support file operation
+FILEOPS_CMAKE_ON=	-DUSE_FILEOPS:BOOL=TRUE
+FILEOPS_CMAKE_OFF=	-DUSE_FILEOPS:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MKDENOTIFY}
-PLIST_SUB+=	KDENOTIFY=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=TRUE
-.else
-PLIST_SUB+=	KDENOTIFY="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_KDENOTIFY:BOOL=FALSE
-.endif
+COVER_DESC=	Support to show cover images
+COVER_CMAKE_ON=	-DUSE_COVER:BOOL=TRUE
+COVER_CMAKE_OFF=	-DUSE_COVER:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MTRACKCHANGE}
-PLIST_SUB+=	TRACKCHANGE=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_TRACKCHANGE:BOOL=TRUE
-.else
-PLIST_SUB+=	TRACKCHANGE="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_TRACKCHANGE:BOOL=FALSE
-.endif
+KDENOTIFY_DESC=	Support to popup notifier for KDE
+KDENOTIFY_USE=	QT4=dbus
+KDENOTIFY_CMAKE_ON=	-DUSE_KDENOTIFY:BOOL=TRUE
+KDENOTIFY_CMAKE_OFF=	-DUSE_KDENOTIFY:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MUDISKS}
-PLIST_SUB+=	UDISKS=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=TRUE
-.else
-PLIST_SUB+=	UDISKS="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS:BOOL=FALSE
-.endif
+TRACKCHANGE_DESC=	Enable to run external command each track switching
+TRACKCHANGE_CMAKE_ON=	-DUSE_TRACKCHANGE:BOOL=TRUE
+TRACKCHANGE_CMAKE_OFF=	-DUSE_TRACKCHANGE:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MUDISKS2}
-PLIST_SUB+=	UDISKS2=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS2:BOOL=TRUE
-.else
-PLIST_SUB+=	UDISKS2="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_UDISKS2:BOOL=FALSE
-.endif
+UDISKS_DESC=	Support removable disc detection (obsolete)
+UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS_USE=	QT4=dbus
+UDISKS2_USE=	QT4=dbus
+UDISKS_CMAKE_ON=	-DUSE_UDISKS:BOOL=TRUE
+UDISKS_CMAKE_OFF=	-DUSE_UDISKS:BOOL=FALSE
+UDISKS2_CMAKE_ON=	-DUSE_UDISKS2:BOOL=TRUE
+UDISKS2_CMAKE_OFF=	-DUSE_UDISKS2:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MQMMP_DIALOG}
-PLIST_SUB+=	QMMP_DIALOG=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=TRUE
-.else
-PLIST_SUB+=	QMMP_DIALOG="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_QMMP_DIALOG:BOOL=FALSE
-.endif
+QMMP_DIALOG_DESC=	An original dialog
+QMMP_DIALOG_CMAKE_ON=	-DUSE_QMMP_DIALOG:BOOL=TRUE
+QMMP_DIALOG_CMAKE_OFF=	-DUSE_QMMP_DIALOG:BOOL=FALSE
 
-.if ${PORT_OPTIONS:MFAAD} || ${PORT_OPTIONS:MMAD} \
-	|| ${PORT_OPTIONS:MMUSEPACK} || ${PORT_OPTIONS:MFLAC} \
-	|| ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MCONVERTER}
-LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
-.endif
-.if ${PORT_OPTIONS:MKDENOTIFY} \
-	|| ${PORT_OPTIONS:MUDISKS} || ${PORT_OPTIONS:MUDISKS2} \
-	|| ${PORT_OPTIONS:MHAL}  || ${PORT_OPTIONS:MMPRIS}
-USE_QT4+=	dbus
-.endif
+.include <bsd.port.pre.mk>
 
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 
 PORTDOCS=	README README.RUS AUTHORS
 INSTALLS_ICONS=	yes
 
-CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} -DUSE_RPATH:BOOL=TRUE \
+CMAKE_ARGS+=	-DUSE_RPATH:BOOL=TRUE \
+	-DUSE_FFMPEG_LEGACY:BOOL=FALSE \
 	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -535,10 +280,10 @@ post-patch:
 		${WRKSRC}/src/qmmpui/CMakeLists.txt
 
 pre-configure:
-	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
 post-build:
-.if ${PORT_OPTIONS:MAPIDOC}
+.if ${PORT_OPTIONS:MDOXYGEN}
 	cd ${WRKSRC}/doc && doxygen Doxyfile
 .endif
 
@@ -547,7 +292,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
 	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
-.if ${PORT_OPTIONS:MAPIDOC}
+.if ${PORT_OPTIONS:MDOXYGEN}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/search ; \
 	cd ${WRKSRC}/doc/html && \
 		${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}${DOCSDIR}/html ; \
@@ -563,4 +308,4 @@ post-install:
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/multimedia/qmmp/pkg-plist
==============================================================================
--- head/multimedia/qmmp/pkg-plist	Wed Nov 13 13:02:56 2013	(r333681)
+++ head/multimedia/qmmp/pkg-plist	Wed Nov 13 13:11:02 2013	(r333682)
@@ -96,7 +96,7 @@ lib/qmmp/CommandLineOptions/libstatusopt
 %%NULLOUT%%lib/qmmp/Output/libnull.so
 %%OSS%%lib/qmmp/Output/liboss.so
 %%OSS4%%lib/qmmp/Output/liboss4.so
-%%PULSE_AUDIO%%lib/qmmp/Output/libpulseaudio.so
+%%PULSEAUDIO%%lib/qmmp/Output/libpulseaudio.so
 lib/qmmp/PlayListFormats/libm3uplaylistformat.so
 lib/qmmp/PlayListFormats/libplsplaylistformat.so
 lib/qmmp/PlayListFormats/libxspfplaylistformat.so
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 dfilter service freebsd_committer 2013-11-13 13:12:08 UTC
Author: wg
Date: Wed Nov 13 13:12:00 2013
New Revision: 333683
URL: http://svnweb.freebsd.org/changeset/ports/333683

Log:
  multimedia/qmmp-plugin-pack: update to 0.7.3
  
  - Update to 0.7.3
  - Use options helpers
  
  PR:		ports/183919
  Submitted by:	maintainer

Modified:
  head/multimedia/qmmp-plugin-pack/Makefile
  head/multimedia/qmmp-plugin-pack/distinfo

Modified: head/multimedia/qmmp-plugin-pack/Makefile
==============================================================================
--- head/multimedia/qmmp-plugin-pack/Makefile	Wed Nov 13 13:11:02 2013	(r333682)
+++ head/multimedia/qmmp-plugin-pack/Makefile	Wed Nov 13 13:12:00 2013	(r333683)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
 		http://qmmp.googlecode.com/files/
@@ -19,65 +19,40 @@ USES=		cmake:outsource pkgconfig
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	FFAP MPG123 QSUI
 OPTIONS_DEFAULT=	FFAP MPG123 QSUI
+
 FFAP_DESC=		Support APE sound file
-MPG123_DESC=	Support libmpg123 (MPEG v1/2 layer1/2/3)
-QSUI_DESC=		Simple UI based on standard widgets set
+FFAP_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+FFAP_CMAKE_ON=	-DUSE_FFAP:BOOL=TRUE
+FFAP_CMAKE_OFF=	-DUSE_FFAP:BOOL=FALSE
 OPTIONS_DEFINE_i386=	FFAPASM
 OPTIONS_DEFAULT_i386=	FFAPASM
 OPTIONS_DEFINE_amd64=	FFAPASM
 OPTIONS_DEFAULT_amd64=	FFAPASM
 FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
+FFAPASM_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+FFAPASM_CMAKE_ON=	-DUSE_ASM:BOOL=TRUE
+FFAPASM_CMAKE_OFF=	-DUSE_ASM:BOOL=FALSE
+
+MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_USE=	QT4=uic_build
+MPG123_CMAKE_ON=	-DUSE_MPG123:BOOL=TRUE
+MPG123_CMAKE_OFF=	-DUSE_MPG123:BOOL=FALSE
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQSUI}
-USE_QT4+=	network
-PLIST_SUB+=	QSUI=""
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_QSUI:BOOL=TRUE
-.else
-PLIST_SUB+=	QSUI="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_QSUI:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MMPG123}
-PLIST_SUB+=	MPG123=""
-LIB_DEPENDS+=	libmpg123.so:${PORTSDIR}/audio/mpg123
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPG123:BOOL=TRUE
-.else
-PLIST_SUB+=	MPG123="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPG123:BOOL=FALSE
-.endif
+QSUI_DESC=		Simple UI based on standard widgets set
+QSUI_USE=	QT4=network,uic_build
+QSUI_CMAKE_ON=	-DUSE_QSUI:BOOL=TRUE
+QSUI_CMAKE_OFF=	-DUSE_QSUI:BOOL=FALSE
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MFFAP}
-PLIST_SUB+=	FFAP=""
-. if (${ARCH} == i386 || ${ARCH} == amd64) && ${PORT_OPTIONS:MFFAPASM}
-BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=TRUE
-. else
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=FALSE
-. endif
-LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFAP:BOOL=TRUE
-.else
-PLIST_SUB+=	FFAP="@comment "
-PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFAP:BOOL=FALSE
-.endif
-
-.if ${PORT_OPTIONS:MQSUI} || ${PORT_OPTIONS:MMPG123}
-USE_QT4+=	uic_build
-.endif
-
-CMAKE_ARGS+=	${PLUGIN_OPTIONS_CMAKE} \
-	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
+CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 pre-configure:
-	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/qmmp-plugin-pack/distinfo
==============================================================================
--- head/multimedia/qmmp-plugin-pack/distinfo	Wed Nov 13 13:11:02 2013	(r333682)
+++ head/multimedia/qmmp-plugin-pack/distinfo	Wed Nov 13 13:12:00 2013	(r333683)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.7.2.tar.bz2) = ff35e1576aa91082496433c4ea22984469eb7810ec0ab7a1d99a7510066cad2d
-SIZE (qmmp-plugin-pack-0.7.2.tar.bz2) = 135630
+SHA256 (qmmp-plugin-pack-0.7.3.tar.bz2) = fd07f480a5b1affdd4c82a49c27a00c3cddfa58f7cc8e9081b8e35c4518ae4b2
+SIZE (qmmp-plugin-pack-0.7.3.tar.bz2) = 135705
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 William Grzybowski freebsd_committer 2013-11-13 14:55:06 UTC
State Changed
From-To: open->closed

Committed. Thanks!