4 files changed, 71 insertions, 36 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 8c9189f002d5..7cbae6d88f31 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,41 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTVERSION=	0.9.5
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
+	SF/qmmp-dev/${PORTNAME}/
 
 MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt4-based multimedia player
 
 LICENSE=	GPLv2
 
+CONFLICTS=	${PORTNAME}-qt5-1.*
+
 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
 
 OPTIONS_SUB=	yes
-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 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 \
+OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
+		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
+		PLUGIN_PLAYLIST PLUGIN_NETWORKING MISC
+
+PLUGIN_APPLICATION_DESC=	Main program view
+OPTIONS_GROUP_PLUGIN_APPLICATION=	GNOMEHOTKEY HOTKEY KDENOTIFY \
+		NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON
+
+DOCUMENTS_DESC=	Documentation and API Reference
+OPTIONS_GROUP_DOCUMENTS=	DOCS DOXYGEN
+
+PLUGIN_FORMATS_DESC=	Support various media formats
+OPTIONS_GROUP_PLUGIN_FORMATS=	CDDA FAAD FFMPEG FLAC GME MAD MODPLUG \
+		MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI
+
+PLUGIN_DSP_EFFECTS_DESC=	DSP effects
+OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SRCONV STEREO
+
+PLUGIN_VISUAL_EFFECTS_DESC=	Visual effects
+OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS=	ANALYZER PROJECTM
+
+PLUGIN_OUTPUT_DESC=	Output sound systems
+OPTIONS_GROUP_PLUGIN_OUTPUT=	ALSA JACK NULLOUT OSS OSS4 PULSEAUDIO
+
+PLUGIN_PLAYLIST_DESC=	Playlist operation
+OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS HAL \
+		TRACKCHANGE UDISKS UDISKS2
+
+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_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 \
-		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG RGSCAN SB SCROBBLER \
-		SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
+		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI RGSCAN \
+		SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \
 		TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 
+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
+
 SKINNEDUI_DESC=	Skinned GUI
 SKINNEDUI_CMAKE_ON=	-DUSE_SKINNED:BOOL=TRUE
 SKINNEDUI_CMAKE_OFF=	-DUSE_SKINNED:BOOL=FALSE
@@ -90,10 +124,10 @@ FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
 FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
 FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
 
-CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
 	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
-CDIO_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
-CDIO_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
+CDDA_CMAKE_ON=	-DUSE_CDA:BOOL=TRUE
+CDDA_CMAKE_OFF=	-DUSE_CDA:BOOL=FALSE
 
 ENCA_DESC=		Support automatic character set detection
 ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
@@ -103,7 +137,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
 
@@ -175,6 +211,7 @@ NULLOUT_CMAKE_ON=	-DUSE_NULL:BOOL=TRUE
 NULLOUT_CMAKE_OFF=	-DUSE_NULL:BOOL=FALSE
 
 SRCONV_DESC=	Support the sample rate converter
+SRCONV_LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 SRCONV_CMAKE_ON=	-DUSE_SRC:BOOL=TRUE
 SRCONV_CMAKE_OFF=	-DUSE_SRC:BOOL=FALSE
 
@@ -186,7 +223,7 @@ STEREO_DESC=	Support stereo effect
 STEREO_CMAKE_ON=	-DUSE_STEREO:BOOL=TRUE
 STEREO_CMAKE_OFF=	-DUSE_STEREO:BOOL=FALSE
 
-ANALYZER_DESC=	Supoort spectrum analyzer visualization
+ANALYZER_DESC=	Support spectrum analyzer visualization
 ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
 ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
 
@@ -255,7 +292,7 @@ KDENOTIFY_USE=	QT4=dbus
 KDENOTIFY_CMAKE_ON=	-DUSE_KDENOTIFY:BOOL=TRUE
 KDENOTIFY_CMAKE_OFF=	-DUSE_KDENOTIFY:BOOL=FALSE
 
-TRACKCHANGE_DESC=	Enable to run external command each track switching
+TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_ON=	-DUSE_TRACKCHANGE:BOOL=TRUE
 TRACKCHANGE_CMAKE_OFF=	-DUSE_TRACKCHANGE:BOOL=FALSE
 
@@ -279,8 +316,7 @@ PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
 PORTDOCS=	README README.RUS AUTHORS
 INSTALLS_ICONS=	yes
 
-CMAKE_ARGS+=	-DUSE_RPATH:BOOL=TRUE \
-	-DUSE_FFMPEG_LEGACY:BOOL=FALSE \
+CMAKE_ARGS+=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE \
 	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -297,17 +333,14 @@ post-patch:
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
-post-build:
-.if ${PORT_OPTIONS:MDOXYGEN}
+post-build-DOXYGEN-on:
 	cd ${WRKSRC}/doc && doxygen Doxyfile
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
-	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MDOXYGEN}
+		cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOXYGEN-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/search ; \
 	cd ${WRKSRC}/doc/html && \
 		${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}${DOCSDIR}/html ; \
@@ -317,7 +350,6 @@ post-install:
 	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
 		${SED} 's|${STAGEDIR}${PREFIX}/||' \
 		>> ${WRKDIR}/PLIST.doc
-.endif
 	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index e8e91e36d61d..7de59a989549 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.8.3.tar.bz2) = 9e73518adf011e60e36c18d55d05845f8103b4af61351e26edb6c105390dd949
-SIZE (qmmp-0.8.3.tar.bz2) = 991403
+SHA256 (qmmp-0.9.5.tar.bz2) = 628a017b2327437ff77ccf5b77b4756bd1e73186f030f4bb34b93c1135ea353e
+SIZE (qmmp-0.9.5.tar.bz2) = 1121832
diff --git a/multimedia/qmmp/pkg-descr b/multimedia/qmmp/pkg-descr
index f8afc3971563..821b2c059073 100644
--- a/multimedia/qmmp/pkg-descr
+++ b/multimedia/qmmp/pkg-descr
@@ -21,4 +21,5 @@ Other features:
 	automatic charset detection for cue files and ShoutCast metadata,
 	video playback via Mplayer, lyrics (using lyrics.wikia.com), and
 	skinned UI (supports all skins for XMMS and Winamp 2.x)
-WWW: http://qmmp.ylsoftware.com/ or http://code.google.com/p/qmmp/
+
+WWW: http://qmmp.ylsoftware.com/
diff --git a/multimedia/qmmp/pkg-plist b/multimedia/qmmp/pkg-plist
index f3c400e39835..7b7345dca2c5 100644
--- a/multimedia/qmmp/pkg-plist
+++ b/multimedia/qmmp/pkg-plist
@@ -2,6 +2,7 @@ bin/qmmp
 include/qmmp/abstractengine.h
 include/qmmp/audioparameters.h
 include/qmmp/buffer.h
+include/qmmp/channelmap.h
 include/qmmp/decoder.h
 include/qmmp/decoderfactory.h
 include/qmmp/effect.h
@@ -36,6 +37,7 @@ include/qmmpui/metadataformatter.h
 include/qmmpui/playlistdownloader.h
 include/qmmpui/playlistformat.h
 include/qmmpui/playlistgroup.h
+include/qmmpui/playlistheadermodel.h
 include/qmmpui/playlistitem.h
 include/qmmpui/playlistmanager.h
 include/qmmpui/playlistmodel.h
@@ -82,7 +84,7 @@ lib/qmmp/CommandLineOptions/libstatusoption.so
 %%UDISKS%%lib/qmmp/General/libudisks.so
 %%UDISKS2%%lib/qmmp/General/libudisks2.so
 %%FAAD%%lib/qmmp/Input/libaac.so
-%%CDIO%%lib/qmmp/Input/libcdaudio.so
+%%CDDA%%lib/qmmp/Input/libcdaudio.so
 %%CUE%%lib/qmmp/Input/libcue.so
 %%FFMPEG%%lib/qmmp/Input/libffmpeg.so
 %%FLAC%%lib/qmmp/Input/libflac.so
@@ -108,6 +110,7 @@ lib/qmmp/PlayListFormats/libxspfplaylistformat.so
 %%CURL%%lib/qmmp/Transports/libhttp.so
 %%MMS%%lib/qmmp/Transports/libmms.so
 %%SKINNEDUI%%lib/qmmp/Ui/libskinned.so
+%%QSUI%%lib/qmmp/Ui/libqsui.so
 %%ANALYZER%%lib/qmmp/Visual/libanalyzer.so
 %%PROJECTM%%lib/qmmp/Visual/libprojectm.so
 libdata/pkgconfig/qmmp.pc
@@ -115,7 +118,6 @@ libdata/pkgconfig/qmmpui.pc
 %%DIR_ASSOC%%share/applications/qmmp.desktop
 %%DIR_ASSOC%%share/applications/qmmp_enqueue.desktop
 %%DIR_ASSOC%%share/applications/qmmp_dir.desktop
-%%DIR_ASSOC%%%%CUE%%share/applications/qmmp_cue.desktop
 share/icons/hicolor/16x16/apps/qmmp.png
 share/icons/hicolor/32x32/apps/qmmp.png
 share/icons/hicolor/48x48/apps/qmmp.png