- Update to upstream version 0.8.0

- Add additonal OPTIONS for replay gain scanner, sid support and
  GNOME/Cinnamon hotkeys
- General cleanups

PR:		188347
Submitted by:	liangtai.s16@gmail.com (maintainer)
Approved by:	mentors (implicit)

6 files changed, 70 insertions, 54 deletions

diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index 52665b4ac5b7..ccc89779af0a 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
-		http://qmmp.googlecode.com/files/
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/
 
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Additional plug-ins for QMMP
@@ -13,14 +11,17 @@ COMMENT=	Additional plug-ins for QMMP
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
-BUILD_DEPENDS=	qmmp>=0.7.0:${PORTSDIR}/multimedia/qmmp
+BUILD_DEPENDS=	qmmp>=0.8.0:${PORTSDIR}/multimedia/qmmp
 
 USES=		cmake:outsource pkgconfig tar:bzip2
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
 USE_LDCONFIG=	yes
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	FFAP MPG123 QSUI
+
+OPTIONS_MULTI=	PLUGINS
+OPTIONS_MULTI_PLUGINS=	FFAP MPG123 QSUI
+
 OPTIONS_DEFAULT=	FFAP MPG123 QSUI
 
 FFAP_DESC=		Support APE sound file
@@ -50,9 +51,15 @@ CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFFAP} || ${PORT_OPTIONS:MMPG123}
+PLIST_SUB+=	INPUT=""
+.else
+PLIST_SUB+=	INPUT="@comment "
+.endif
+
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
-	@${REINPLACE_CMD} -e 's/IF[(]/&USE_QSUI AND /' \
-		${WRKSRC}/src/Ui/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp-plugin-pack/distinfo b/multimedia/qmmp-plugin-pack/distinfo
index 319ef3959277..f62631a539da 100644
--- a/multimedia/qmmp-plugin-pack/distinfo
+++ b/multimedia/qmmp-plugin-pack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.7.4.tar.bz2) = 6e3559519925cb488a79be078c75de5a5f3f58cb893f055b8422aa37bea32144
-SIZE (qmmp-plugin-pack-0.7.4.tar.bz2) = 136618
+SHA256 (qmmp-plugin-pack-0.8.0.tar.bz2) = 9cde3320115d1f70d34e336d38e5cb6646a9e347b62efae5f958925eadc5d25d
+SIZE (qmmp-plugin-pack-0.8.0.tar.bz2) = 154739
diff --git a/multimedia/qmmp-plugin-pack/pkg-plist b/multimedia/qmmp-plugin-pack/pkg-plist
index cf788bb1a928..7908e231678e 100644
--- a/multimedia/qmmp-plugin-pack/pkg-plist
+++ b/multimedia/qmmp-plugin-pack/pkg-plist
@@ -1,6 +1,6 @@
 %%FFAP%%lib/qmmp/Input/libffap.so
 %%MPG123%%lib/qmmp/Input/libmpg123.so
 %%QSUI%%lib/qmmp/Ui/libqsui.so
-@dirrmtry lib/qmmp/Input
-@dirrmtry lib/qmmp/Ui
+%%INPUT%%@dirrmtry lib/qmmp/Input
+%%QSUI%%@dirrmtry lib/qmmp/Ui
 @dirrmtry lib/qmmp
diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 70677bf3097e..7d82754bfaae 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,18 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.7.4
-PORTREVISION=	2
+PORTVERSION=	0.8.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
-		${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/
 
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt4-based multimedia player
 
 LICENSE=	GPLv2
 
-USES=		cmake:outsource pkgconfig tar:bzip2
+USES=		cmake:outsource desktop-file-utils pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
@@ -22,17 +20,17 @@ OPTIONS_SINGLE=	MPLAYER
 OPTIONS_SINGLE_MPLAYER=	MPLAYER1 MPLAYER2
 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 \
-		SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \
+		FFMPEG FILEOPS FLAC GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY \
+		LADSPA LYRICS MAD MMS MODPLUG MPLAYER MPRIS MUSEPACK NOTIFIER \
+		NULLOUT OPUS OSS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG RGSCAN \
+		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS UDISKS2 VORBIS WAVPACK WILDMIDI
 OPTIONS_DEFAULT=	ALSA ANALYZER BS2B CDIO CONVERTER COPYPASTE COVER \
-		CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD \
-		FFMPEG FILEOPS FLAC GME HAL HOTKEY JACK KDENOTIFY \
-		LADSPA LYRICS MAD MMS MODPLUG MPRIS MPLAYER MPLAYER1 MUSEPACK \
-		NOTIFIER NULLOUT OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG \
-		SB SCROBBLER SKINNEDUI SNDFILE SRCONV STATICON STEREO \
+		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 \
+		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG RGSCAN SB SCROBBLER \
+		SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
@@ -135,13 +133,16 @@ MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
 MAD_CMAKE_ON=	-DUSE_MAD:BOOL=TRUE
 MAD_CMAKE_OFF=	-DUSE_MAD:BOOL=FALSE
 
-#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 "
+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
+
+RGSCAN_DESC=	ReplayGain scanner
+RGSCAN_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+RGSCAN_CMAKE_ON=	-DUSE_RGSCAN:BOOL=TRUE
+RGSCAN_CMAKE_OFF=	-DUSE_RGSCAN:BOOL=FALSE
 
 SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 SNDFILE_CMAKE_ON=	-DUSE_SNDFILE:BOOL=TRUE
@@ -205,6 +206,11 @@ SCROBBLER_DESC=	Support Libre.fm/Last.fm scrobbler feature
 SCROBBLER_CMAKE_ON=	-DUSE_SCROBBLER:BOOL=TRUE
 SCROBBLER_CMAKE_OFF=	-DUSE_SCROBBLER:BOOL=FALSE
 
+SID_DESC=	Support sid
+SID_LIB_DEPENDS=	libsidplayfp.so:${PORTSDIR}/audio/libsidplayfp
+SID_CMAKE_ON=	-DUSE_SID:BOOL=TRUE
+SID_CMAKE_OFF=	-DUSE_SID:BOOL=FALSE
+
 STATICON_DESC=	Support to show status icon
 STATICON_CMAKE_ON=	-DUSE_STATICON:BOOL=TRUE
 STATICON_CMAKE_OFF=	-DUSE_STATICON:BOOL=FALSE
@@ -225,10 +231,15 @@ HAL_USE=	QT4=dbus
 HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
 HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
 
-HOTKEY_DESC=	Support to set shortcut keys
+HOTKEY_DESC=	Support global shortcut keys
 HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
 HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
 
+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
+
 FILEOPS_DESC=	Support file operation
 FILEOPS_CMAKE_ON=	-DUSE_FILEOPS:BOOL=TRUE
 FILEOPS_CMAKE_OFF=	-DUSE_FILEOPS:BOOL=FALSE
@@ -273,11 +284,13 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|' \
-		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt
-	@${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|' \
+	@${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
+		${WRKSRC}/src/qmmpui/CMakeLists.txt | ${XARGS} \
+		${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_DIR}|libdata|'
 
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
@@ -304,8 +317,11 @@ post-install:
 		>> ${WRKDIR}/PLIST.doc ; \
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type d | \
 		${SED} 's|${STAGEDIR}${PREFIX}/|@dirrm |' \
+		| ${SORT} -r >> ${WRKDIR}/PLIST.doc
+.endif
+	${FIND} ${STAGEDIR}${PREFIX}/lib/qmmp -type d | \
+		${SED} 's|${STAGEDIR}${PREFIX}/|@dirrmtry |' \
 		| ${SORT} -r >> ${WRKDIR}/PLIST.doc ; \
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
-.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index e05e8b234bd5..772e04d4ef00 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.7.4.tar.bz2) = ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2
-SIZE (qmmp-0.7.4.tar.bz2) = 862966
+SHA256 (qmmp-0.8.0.tar.bz2) = 61f44646ffd3f1d90b93607076a405160be5d9736e91c9739c80070bc5357439
+SIZE (qmmp-0.8.0.tar.bz2) = 977600
diff --git a/multimedia/qmmp/pkg-plist b/multimedia/qmmp/pkg-plist
index 27db93423cdc..d71163f057c3 100644
--- a/multimedia/qmmp/pkg-plist
+++ b/multimedia/qmmp/pkg-plist
@@ -35,10 +35,12 @@ include/qmmpui/mediaplayer.h
 include/qmmpui/metadataformatter.h
 include/qmmpui/playlistdownloader.h
 include/qmmpui/playlistformat.h
+include/qmmpui/playlistgroup.h
 include/qmmpui/playlistitem.h
 include/qmmpui/playlistmanager.h
 include/qmmpui/playlistmodel.h
 include/qmmpui/playlistparser.h
+include/qmmpui/playlisttrack.h
 include/qmmpui/qmmpuisettings.h
 include/qmmpui/templateeditor.h
 include/qmmpui/uifactory.h
@@ -65,12 +67,14 @@ lib/qmmp/CommandLineOptions/libstatusoption.so
 %%COPYPASTE%%lib/qmmp/General/libcopypaste.so
 %%COVER%%lib/qmmp/General/libcovermanager.so
 %%FILEOPS%%lib/qmmp/General/libfileops.so
+%%GNOMEHOTKEY%%lib/qmmp/General/libgnomehotkey.so
 %%HAL%%lib/qmmp/General/libhal.so
 %%HOTKEY%%lib/qmmp/General/libhotkey.so
 %%KDENOTIFY%%lib/qmmp/General/libkdenotify.so
 %%LYRICS%%lib/qmmp/General/liblyrics.so
 %%MPRIS%%lib/qmmp/General/libmpris.so
 %%NOTIFIER%%lib/qmmp/General/libnotifier.so
+%%RGSCAN%%lib/qmmp/General/librgscan.so
 %%SCROBBLER%%lib/qmmp/General/libscrobbler.so
 %%STATICON%%lib/qmmp/General/libstatusicon.so
 %%SB%%lib/qmmp/General/libstreambrowser.so
@@ -87,6 +91,7 @@ lib/qmmp/CommandLineOptions/libstatusoption.so
 %%GME%%lib/qmmp/Input/libgme.so
 %%MUSEPACK%%lib/qmmp/Input/libmpc.so
 %%OPUS%%lib/qmmp/Input/libopus.so
+%%SID%%lib/qmmp/Input/libsid.so
 %%SNDFILE%%lib/qmmp/Input/libsndfile.so
 %%VORBIS%%lib/qmmp/Input/libvorbis.so
 %%WAVPACK%%lib/qmmp/Input/libwavpack.so
@@ -128,18 +133,6 @@ share/icons/hicolor/scalable/apps/qmmp-simple.svgz
 @dirrmtry share/icons/hicolor/32x32
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
-@comment Insert PLIST.doc here
 @dirrm include/qmmp
 @dirrm include/qmmpui
-@dirrmtry lib/qmmp/CommandLineOptions
-@dirrmtry lib/qmmp/Effect
-@dirrmtry lib/qmmp/Engines
-@dirrmtry lib/qmmp/FileDialogs
-@dirrmtry lib/qmmp/General
-@dirrmtry lib/qmmp/Input
-@dirrmtry lib/qmmp/Output
-@dirrmtry lib/qmmp/PlayListFormats
-@dirrmtry lib/qmmp/Transports
-@dirrmtry lib/qmmp/Ui
-@dirrmtry lib/qmmp/Visual
-@dirrmtry lib/qmmp
+@comment Insert PLIST.doc here