Update to 0.9.7

Changelog: http://sourceforge.net/p/qmmp-dev/code/HEAD/tree/tags/qmmp-0.9.7/ChangeLog

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

2 files changed, 17 insertions, 16 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index e920d4cf647c..7b3adc52ae77 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -13,7 +13,7 @@ LICENSE=	GPLv2
 
 CONFLICTS=	${PORTNAME}-qt5-1.*
 
-USES=		cmake:outsource desktop-file-utils pkgconfig tar:bzip2
+USES=		cmake:outsource desktop-file-utils pathfix pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
 		linguisttools_build moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
@@ -51,14 +51,12 @@ PLUGIN_NETWORKING_DESC=	Features via the Net
 OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
 
 MISC_DESC=	Other features
-OPTIONS_RADIO=	MPLAYER
-OPTIONS_RADIO_MPLAYER=	MPLAYER1 MPLAYER2
-OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID
+OPTIONS_GROUP_MISC=	CONVERTER CUE ENCA MPLAYER1 MPLAYER2 MPRIS RGSCAN SID
 
 OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \
 		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \
 		GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
-		MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK NOTIFIER NULLOUT \
+		MMS MODPLUG MPRIS MPLAYER1 MUSEPACK NOTIFIER NULLOUT \
 		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI RGSCAN \
 		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
@@ -137,11 +135,9 @@ ENCA_CMAKE_OFF=	-DUSE_ENCA:BOOL=FALSE
 MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
 MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
 MPLAYER1_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-MPLAYER1_IMPLIES=	MPLAYER
 MPLAYER2_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer2
-MPLAYER2_IMPLIES=	MPLAYER
-MPLAYER_CMAKE_ON=	-DUSE_MPLAYER:BOOL=TRUE
-MPLAYER_CMAKE_OFF=	-DUSE_MPLAYER:BOOL=FALSE
+MPLAYER1_PREVENTS=	MPLAYER2
+MPLAYER2_PREVENTS=	MPLAYER1
 
 PROJECTM_DESC=	Support the projectM music visualiser
 PROJECTM_LIB_DEPENDS=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
@@ -311,8 +307,17 @@ QMMP_DIALOG_CMAKE_OFF=	-DUSE_QMMP_DIALOG:BOOL=FALSE
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2}
+CMAKE_ARGS+=	-DUSE_MPLAYER:BOOL=TRUE
+PLIST_SUB+=	MPLAYER=""
+.else
+CMAKE_ARGS+=	-DUSE_MPLAYER:BOOL=FALSE
+PLIST_SUB+=	MPLAYER="@comment "
+.endif
+
 PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 
+PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
 PORTDOCS=	README README.RUS AUTHORS
 INSTALLS_ICONS=	yes
 
@@ -325,10 +330,6 @@ post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|'
-	@${GREP} -L 'libdata/pkgconfig' \
-		${WRKSRC}/src/qmmp/CMakeLists.txt \
-		${WRKSRC}/src/qmmpui/CMakeLists.txt | ${XARGS} \
-		${REINPLACE_CMD} -e '/pkgconfig/s|\$${LIB_DIR}|libdata|'
 
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index 9fd77eaabd2e..0a00b95168eb 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.9.6.tar.bz2) = 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b
-SIZE (qmmp-0.9.6.tar.bz2) = 1124762
+SHA256 (qmmp-0.9.7.tar.bz2) = 339f260c8fac0c1ddcf4205b852724c0633e63a39d83ee1906b9661ef821bcdc
+SIZE (qmmp-0.9.7.tar.bz2) = 1125295