- Update to 0.9.10

- Adjust dependencies
- Set PORTSCOUT to specify targeted version is 0.*, not 1.*.

PR:		209913
Submitted by:	<liangtai.s16@gmail.com> (maintainer)

2 files changed, 15 insertions, 7 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index d258aba88dd8..3af52a322fe6 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -12,6 +12,7 @@ COMMENT=	Qt4-based multimedia player
 LICENSE=	GPLv2
 
 CONFLICTS=	${PORTNAME}-qt5-1.*
+PORTSCOUT=	limit:^0.*
 
 USES=		cmake:outsource localbase pathfix pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
@@ -64,11 +65,12 @@ OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
-QSUI_USE=	QT4=network,uic_build
+QSUI_USE=	QT4=uic_build
 QSUI_CMAKE_ON=	-DUSE_QSUI:BOOL=TRUE
 QSUI_CMAKE_OFF=	-DUSE_QSUI:BOOL=FALSE
 
 SKINNEDUI_DESC=	Skinned GUI
+SKINNEDUI_USE=	XORG=x11
 SKINNEDUI_CMAKE_ON=	-DUSE_SKINNED:BOOL=TRUE
 SKINNEDUI_CMAKE_OFF=	-DUSE_SKINNED:BOOL=FALSE
 
@@ -77,7 +79,8 @@ DIR_ASSOC_CMAKE_ON=	-DUSE_DIR_ASSOC:BOOL=TRUE
 DIR_ASSOC_CMAKE_OFF=	-DUSE_DIR_ASSOC:BOOL=FALSE
 DIR_ASSOC_USES=	desktop-file-utils
 
-JACK_LIB_DEPENDS=	libjack.so:audio/jack
+JACK_LIB_DEPENDS=	libjack.so:audio/jack \
+		libsamplerate.so:audio/libsamplerate
 JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
 JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
@@ -124,7 +127,8 @@ FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
 FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
 
 CDDA_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
-	libcdio_cdda.so:sysutils/libcdio-paranoia
+		libcddb.so:audio/libcddb \
+		libcdio_cdda.so:sysutils/libcdio-paranoia
 CDDA_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
 CDDA_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
@@ -142,7 +146,7 @@ MPLAYER2_PREVENTS=	MPLAYER1
 
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so.2:graphics/libprojectm
-PROJECTM_USE=	QT4=opengl
+PROJECTM_USE=	GL=gl QT4=opengl
 PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
 PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
 
@@ -170,6 +174,7 @@ MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
 
 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
@@ -184,6 +189,7 @@ SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
 SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
 
 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
@@ -268,6 +274,7 @@ HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
 HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
 
 HOTKEY_DESC=	Support global shortcut keys
+HOTKEY_USE=	XORG=x11
 HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
 HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
 
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index d185c67f1257..ad348b5e2349 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qmmp-0.9.9.tar.bz2) = 8159f877d3a0329d49e54d9c367b4a85e73c2a0c4eca4033a4ae8382e59a64f3
-SIZE (qmmp-0.9.9.tar.bz2) = 1125419
+TIMESTAMP = 1464687723
+SHA256 (qmmp-0.9.10.tar.bz2) = a93ca43b2407b917602a47b5728cd4d72d694069a3ea329572c01ff66845f7e1
+SIZE (qmmp-0.9.10.tar.bz2) = 1126355