2 files changed, 61 insertions, 116 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 43e9a1ef3753..48435a584403 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.10.0
+PORTVERSION=	0.10.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -67,81 +67,65 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
 QSUI_USE=	QT4=uic_build
-QSUI_CMAKE_ON=	-DUSE_QSUI:BOOL=TRUE
-QSUI_CMAKE_OFF=	-DUSE_QSUI:BOOL=FALSE
+QSUI_CMAKE_BOOL=	USE_QSUI
 
 SKINNEDUI_DESC=	Skinned GUI
 SKINNEDUI_USE=	XORG=x11
-SKINNEDUI_CMAKE_ON=	-DUSE_SKINNED:BOOL=TRUE
-SKINNEDUI_CMAKE_OFF=	-DUSE_SKINNED:BOOL=FALSE
+SKINNEDUI_CMAKE_BOOL=	USE_SKINNED
 
 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
+DIR_ASSOC_CMAKE_BOOL=	USE_DIR_ASSOC
 DIR_ASSOC_USES=	desktop-file-utils
 
-JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack \
+		libsoxr.so:audio/libsoxr
 JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
-JACK_IMPLIES=	SOXR
-JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
-JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
+JACK_CMAKE_BOOL=	USE_JACK
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=TRUE
-ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=FALSE
+ALSA_CMAKE_BOOL=	USE_ALSA
 
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
 BS2B_LIB_DEPENDS=	libbs2b.so:audio/libbs2b
-BS2B_CMAKE_ON=	-DUSE_BS2B:BOOL=TRUE
-BS2B_CMAKE_OFF=	-DUSE_BS2B:BOOL=FALSE
+BS2B_CMAKE_BOOL=	USE_BS2B
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CMAKE_ON=	-DUSE_PULSE:BOOL=TRUE
-PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSE:BOOL=FALSE
+PULSEAUDIO_CMAKE_BOOL=	USE_PULSE
 
 QTMULTIMEDIA_DESC=	Support to use Qt low-level multimedia API
 QTMULTIMEDIA_USE=	QT4=multimedia
-QTMULTIMEDIA_CMAKE_ON=	-DUSE_QTMULTIMEDIA:BOOL=TRUE
-QTMULTIMEDIA_CMAKE_OFF=	-DUSE_QTMULTIMEDIA:BOOL=FALSE
+QTMULTIMEDIA_CMAKE_BOOL=	USE_QTMULTIMEDIA
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libtag.so:audio/taglib
-FLAC_CMAKE_ON=	-DUSE_FLAC:BOOL=TRUE
-FLAC_CMAKE_OFF=	-DUSE_FLAC:BOOL=FALSE
+FLAC_CMAKE_BOOL=	USE_FLAC
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack \
 		libtag.so:audio/taglib
-MUSEPACK_CMAKE_ON=	-DUSE_MPC:BOOL=TRUE
-MUSEPACK_CMAKE_OFF=	-DUSE_MPC:BOOL=FALSE
+MUSEPACK_CMAKE_BOOL=	USE_MPC
 
 GME_DESC=		Support video game music files
 GME_LIB_DEPENDS=	libgme.so:audio/libgme
-GME_CMAKE_ON=	-DUSE_GME:BOOL=TRUE
-GME_CMAKE_OFF=	-DUSE_GME:BOOL=FALSE
+GME_CMAKE_BOOL=	USE_GME
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=TRUE
-FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=FALSE
+FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
-MODPLUG_CMAKE_ON=	-DUSE_MODPLUG:BOOL=TRUE
-MODPLUG_CMAKE_OFF=	-DUSE_MODPLUG:BOOL=FALSE
+MODPLUG_CMAKE_BOOL=	USE_MODPLUG
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
 		libtag.so:audio/taglib
-FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
-FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
+FAAD_CMAKE_BOOL=	USE_AAC
 
 CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 		libcddb.so:audio/libcddb \
 		libcdio_cdda.so:sysutils/libcdio-paranoia
-CDDA_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
-CDDA_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
+CDDA_CMAKE_BOOL=	USE_CDA
 
 ENCA_DESC=		Support automatic character set detection
 ENCA_LIB_DEPENDS=	libenca.so:converters/enca
-ENCA_CMAKE_ON=	-DUSE_ENCA:BOOL=TRUE
-ENCA_CMAKE_OFF=	-DUSE_ENCA:BOOL=FALSE
+ENCA_CMAKE_BOOL=	USE_ENCA
 
 MPLAYER1_DESC=	mplayer-1.x (multimedia/mplayer)
 MPLAYER2_DESC=	mplayer-2.x (multimedia/mplayer2)
@@ -153,175 +137,136 @@ MPLAYER2_PREVENTS=	MPLAYER1
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so.2:graphics/libprojectm
 PROJECTM_USE=	GL=gl QT4=opengl
-PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
-PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
+PROJECTM_CMAKE_BOOL=	USE_PROJECTM
 
-OSS_CMAKE_ON=	-DUSE_OSS:BOOL=TRUE
-OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=FALSE
+OSS_CMAKE_BOOL=	USE_OSS
 
 OSS4_DESC=		Open Sound System (ver4) support
 OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:audio/oss
-OSS4_CMAKE_ON=	-DUSE_OSS4:BOOL=TRUE
-OSS4_CMAKE_OFF=	-DUSE_OSS4:BOOL=FALSE
+OSS4_CMAKE_BOOL=	USE_OSS4
 
 LADSPA_RUN_DEPENDS=	analyseplugin:audio/ladspa
-LADSPA_CMAKE_ON=	-DUSE_LADSPA:BOOL=TRUE
-LADSPA_CMAKE_OFF=	-DUSE_LADSPA:BOOL=FALSE
+LADSPA_CMAKE_BOOL=	USE_LADSPA
 
 WILDMIDI_DESC=	Support to playback MIDI files
 WILDMIDI_LIB_DEPENDS=	libWildMidi.so:audio/wildmidi
-WILDMIDI_CMAKE_ON=	-DUSE_MIDI:BOOL=TRUE
-WILDMIDI_CMAKE_OFF=	-DUSE_MIDI:BOOL=FALSE
+WILDMIDI_CMAKE_BOOL=	USE_MIDI
 
 MAD_LIB_DEPENDS=	libmad.so:audio/libmad \
 		libtag.so:audio/taglib
-MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
-MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
+MAD_CMAKE_BOOL=	USE_MAD
 
 OPUS_DESC=		Enable reading opusfile tags
 OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile \
 		libopus.so:audio/opus \
 		libtag.so:audio/taglib
-OPUS_CMAKE_ON=	-DUSE_OPUS:BOOL=TRUE
-OPUS_CMAKE_OFF=	-DUSE_OPUS:BOOL=FALSE
+OPUS_CMAKE_BOOL=	USE_OPUS
 
 RGSCAN_DESC=	ReplayGain scanner
 RGSCAN_LIB_DEPENDS=	libtag.so:audio/taglib
-RGSCAN_CMAKE_ON=	-DUSE_RGSCAN:BOOL=TRUE
-RGSCAN_CMAKE_OFF=	-DUSE_RGSCAN:BOOL=FALSE
+RGSCAN_CMAKE_BOOL=	USE_RGSCAN
 
 SNDFILE_LIB_DEPENDS=	libsndfile.so:audio/libsndfile
-SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
-SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
+SNDFILE_CMAKE_BOOL=	USE_SNDFILE
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libtag.so:audio/taglib
-VORBIS_CMAKE_ON=	-DUSE_VORBIS:BOOL=TRUE
-VORBIS_CMAKE_OFF=	-DUSE_VORBIS:BOOL=FALSE
+VORBIS_CMAKE_BOOL=	USE_VORBIS
 
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
-WAVPACK_CMAKE_ON=	-DUSE_WAVPACK:BOOL=TRUE
-WAVPACK_CMAKE_OFF=	-DUSE_WAVPACK:BOOL=FALSE
+WAVPACK_CMAKE_BOOL=	USE_WAVPACK
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_CMAKE_ON=	-DUSE_CURL:BOOL=TRUE
-CURL_CMAKE_OFF=	-DUSE_CURL:BOOL=FALSE
+CURL_CMAKE_BOOL=	USE_CURL
 
 MMS_LIB_DEPENDS=	libmms.so:net/libmms
-MMS_CMAKE_ON=	-DUSE_MMS:BOOL=TRUE
-MMS_CMAKE_OFF=	-DUSE_MMS:BOOL=FALSE
+MMS_CMAKE_BOOL=	USE_MMS
 
-CUE_CMAKE_ON=	-DUSE_CUE:BOOL=TRUE
-CUE_CMAKE_OFF=	-DUSE_CUE:BOOL=FALSE
+CUE_CMAKE_BOOL=	USE_CUE
 
 NULLOUT_DESC=	Support null output
-NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
-NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
+NULLOUT_CMAKE_BOOL=	USE_NULL
 
 SOXR_DESC=	Support SoX Resampler
 SOXR_LIB_DEPENDS=	libsoxr.so:audio/libsoxr
-SOXR_CMAKE_ON=	-DUSE_SOXR:BOOL=TRUE
-SOXR_CMAKE_OFF=	-DUSE_SOXR:BOOL=FALSE
+SOXR_CMAKE_BOOL=	USE_SOXR
 
 CROSSFADE_DESC=	Support cross-fade effect
-CROSSFADE_CMAKE_ON=	-DUSE_CROSSFADE:BOOL=TRUE
-CROSSFADE_CMAKE_OFF=	-DUSE_CROSSFADE:BOOL=FALSE
+CROSSFADE_CMAKE_BOOL=	USE_CROSSFADE
 
 STEREO_DESC=	Support stereo effect
-STEREO_CMAKE_ON=	-DUSE_STEREO:BOOL=TRUE
-STEREO_CMAKE_OFF=	-DUSE_STEREO:BOOL=FALSE
+STEREO_CMAKE_BOOL=	USE_STEREO
 
 ANALYZER_DESC=	Support spectrum analyzer visualization
-ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
-ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
+ANALYZER_CMAKE_BOOL=	USE_ANALYZER
 
 CONVERTER_DESC=	Support file type converter
 CONVERTER_LIB_DEPENDS=	libtag.so:audio/taglib
-CONVERTER_CMAKE_ON=	-DUSE_CONVERTER:BOOL=TRUE
-CONVERTER_CMAKE_OFF=	-DUSE_CONVERTER:BOOL=FALSE
+CONVERTER_CMAKE_BOOL=	USE_CONVERTER
 
 COPYPASTE_DESC=	Enable copy/paste track infos between playlists
-COPYPASTE_CMAKE_ON=	-DUSE_COPYPASTE:BOOL=TRUE
-COPYPASTE_CMAKE_OFF=	-DUSE_COPYPASTE:BOOL=FALSE
+COPYPASTE_CMAKE_BOOL=	USE_COPYPASTE
 
 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
+MPRIS_CMAKE_BOOL=	USE_MPRIS
 
 SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
-SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
-SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
+SCROBBLER_CMAKE_BOOL=	USE_SCROBBLER
 
 SID_DESC=	Support sid
 SID_LIB_DEPENDS=	libsidplayfp.so:audio/libsidplayfp
-SID_CMAKE_ON=	-DUSE_SID:BOOL=TRUE
-SID_CMAKE_OFF=	-DUSE_SID:BOOL=FALSE
+SID_CMAKE_BOOL=	USE_SID
 
 STATICON_DESC=	Support to show status icon
-STATICON_CMAKE_ON=	-DUSE_STATICON:BOOL=TRUE
-STATICON_CMAKE_OFF=	-DUSE_STATICON:BOOL=FALSE
+STATICON_CMAKE_BOOL=	USE_STATICON
 
 SB_DESC=	Browser for IceCast stream directory
-SB_CMAKE_ON=	-DUSE_SB:BOOL=TRUE
-SB_CMAKE_OFF=	-DUSE_SB:BOOL=FALSE
+SB_CMAKE_BOOL=	USE_SB
 
 NOTIFIER_DESC=	Support to popup notifier
-NOTIFIER_CMAKE_ON=	-DUSE_NOTIFIER:BOOL=TRUE
-NOTIFIER_CMAKE_OFF=	-DUSE_NOTIFIER:BOOL=FALSE
+NOTIFIER_CMAKE_BOOL=	USE_NOTIFIER
 
 LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
-LYRICS_CMAKE_ON=	-DUSE_LYRICS:BOOL=TRUE
-LYRICS_CMAKE_OFF=	-DUSE_LYRICS:BOOL=FALSE
+LYRICS_CMAKE_BOOL=	USE_LYRICS
 
 HAL_USE=	QT4=dbus
-HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
-HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
+HAL_CMAKE_BOOL=	USE_HAL
 
 HOTKEY_DESC=	Support global shortcut keys
 HOTKEY_USE=	XORG=x11
-HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
-HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
+HOTKEY_CMAKE_BOOL=	USE_HOTKEY
 
 GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
 GNOMEHOTKEY_USE=	QT4=dbus
-GNOMEHOTKEY_CMAKE_ON=	-DUSE_GNOMEHOTKEY:BOOL=TRUE
-GNOMEHOTKEY_CMAKE_OFF=	-DUSE_GNOMEHOTKEY:BOOL=FALSE
+GNOMEHOTKEY_CMAKE_BOOL=	USE_GNOMEHOTKEY
 
 FILEOPS_DESC=	Support file operation
-FILEOPS_CMAKE_ON=	-DUSE_FILEOPS:BOOL=TRUE
-FILEOPS_CMAKE_OFF=	-DUSE_FILEOPS:BOOL=FALSE
+FILEOPS_CMAKE_BOOL=	USE_FILEOPS
 
 COVER_DESC=	Support to show cover images
-COVER_CMAKE_ON=	-DUSE_COVER:BOOL=TRUE
-COVER_CMAKE_OFF=	-DUSE_COVER:BOOL=FALSE
+COVER_CMAKE_BOOL=	USE_COVER
 
 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
+KDENOTIFY_CMAKE_BOOL=	USE_KDENOTIFY
 
 TRACKCHANGE_DESC=	Enable to run external command each track
-TRACKCHANGE_CMAKE_ON=	-DUSE_TRACKCHANGE:BOOL=TRUE
-TRACKCHANGE_CMAKE_OFF=	-DUSE_TRACKCHANGE:BOOL=FALSE
+TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 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
+UDISKS_CMAKE_BOOL=	USE_UDISKS
+UDISKS2_CMAKE_BOOL=	USE_UDISKS2
 
 QMMP_DIALOG_DESC=	An original dialog
-QMMP_DIALOG_CMAKE_ON=	-DUSE_QMMP_DIALOG:BOOL=TRUE
-QMMP_DIALOG_CMAKE_OFF=	-DUSE_QMMP_DIALOG:BOOL=FALSE
+QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
-TWOPANELDIALOG_CMAKE_ON=	-DUSE_TWO_PANEL_DIALOG:BOOL=TRUE
-TWOPANELDIALOG_CMAKE_OFF=	-DUSE_TWO_PANEL_DIALOG:BOOL=FALSE
+TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index 3d6525af87c0..edad4ad60e93 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466521084
-SHA256 (qmmp-0.10.0.tar.bz2) = b22ced5715d6778438054a97ef73326ac92a1bbca9686bfb923a00fe6c7128f4
-SIZE (qmmp-0.10.0.tar.bz2) = 1338447
+TIMESTAMP = 1469299752
+SHA256 (qmmp-0.10.2.tar.bz2) = 142478d8b8367848d0db360c79ab24c17ecf1a80616a876abf1c4ad174b90c5a
+SIZE (qmmp-0.10.2.tar.bz2) = 1337240