- Update multimedia/qmmp to 0.9.5

- Update multimedia/qmmp-plugin-pack to 0.9.3

- Add multimedia/qmmp-qt5 (1.0.4)
- Add multimedia/qmmp-plugin-pack-qt5 (1.0.2)

Qmmp 0.9.x works only with Qt4, whereas 1.x switched to Qt5

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

17 files changed, 663 insertions, 53 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index ef54a7fc65a5..5a96715f79a1 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -328,7 +328,9 @@
     SUBDIR += pyjama
     SUBDIR += pymp
     SUBDIR += qmmp
+    SUBDIR += qmmp-qt5
     SUBDIR += qmmp-plugin-pack
+    SUBDIR += qmmp-plugin-pack-qt5
     SUBDIR += qt-faststart
     SUBDIR += qt4-mobility
     SUBDIR += qt4-multimedia
diff --git a/multimedia/qmmp-plugin-pack-qt5/Makefile b/multimedia/qmmp-plugin-pack-qt5/Makefile
new file mode 100644
index 000000000000..33881557d886
--- /dev/null
+++ b/multimedia/qmmp-plugin-pack-qt5/Makefile
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+PORTNAME=	qmmp-plugin-pack
+PORTVERSION=	1.0.2
+CATEGORIES=	multimedia
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
+	SF/qmmp-dev/${PORTNAME}/
+PKGNAMESUFFIX=	-qt5
+
+MAINTAINER=	liangtai.s16@gmail.com
+COMMENT=	Additional plug-ins for QMMP (Qt5)
+
+LICENSE=	GPLv2
+
+CONFLICTS=	${PORTNAME}-0.*
+
+LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp-qt5
+BUILD_DEPENDS=	qmmp-qt5>=1.0.0:${PORTSDIR}/multimedia/qmmp-qt5
+
+USES=		cmake:outsource pkgconfig tar:bzip2
+USE_QT5=	core gui qmake_build buildtools_build linguisttools_build
+USE_LDCONFIG=	yes
+
+OPTIONS_SUB=	yes
+
+OPTIONS_MULTI=	PLUGINS
+OPTIONS_MULTI_PLUGINS=	FFAP MPG123 XMP
+
+OPTIONS_DEFAULT=	FFAP MPG123 XMP
+
+FFAP_DESC=		Support APE sound file
+FFAP_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+FFAP_CMAKE_ON=	-DUSE_FFAP:BOOL=TRUE
+FFAP_CMAKE_OFF=	-DUSE_FFAP:BOOL=FALSE
+OPTIONS_DEFINE_i386=	FFAPASM
+OPTIONS_DEFAULT_i386=	FFAPASM
+OPTIONS_DEFINE_amd64=	FFAPASM
+OPTIONS_DEFAULT_amd64=	FFAPASM
+FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
+FFAPASM_BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
+FFAPASM_CMAKE_ON=	-DUSE_ASM:BOOL=TRUE
+FFAPASM_CMAKE_OFF=	-DUSE_ASM:BOOL=FALSE
+
+MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
+MPG123_CMAKE_ON=	-DUSE_MPG123:BOOL=TRUE
+MPG123_CMAKE_OFF=	-DUSE_MPG123:BOOL=FALSE
+
+XMP_DESC=		Support various module formats using libxmp
+XMP_LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
+XMP_CMAKE_ON=	-DUSE_XMP:BOOL=TRUE
+XMP_CMAKE_OFF=	-DUSE_XMP:BOOL=FALSE
+
+pre-configure:
+	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+
+.include <bsd.port.mk>
diff --git a/multimedia/qmmp-plugin-pack-qt5/distinfo b/multimedia/qmmp-plugin-pack-qt5/distinfo
new file mode 100644
index 000000000000..4b8ecec18a5d
--- /dev/null
+++ b/multimedia/qmmp-plugin-pack-qt5/distinfo
@@ -0,0 +1,2 @@
+SHA256 (qmmp-plugin-pack-1.0.2.tar.bz2) = a3a309342fd5077c80bcba214a3d5df6f96135e9fae37d5d122e608557080767
+SIZE (qmmp-plugin-pack-1.0.2.tar.bz2) = 76533
diff --git a/multimedia/qmmp-plugin-pack-qt5/pkg-descr b/multimedia/qmmp-plugin-pack-qt5/pkg-descr
new file mode 100644
index 000000000000..9077f4ee48bb
--- /dev/null
+++ b/multimedia/qmmp-plugin-pack-qt5/pkg-descr
@@ -0,0 +1,9 @@
+Additional plug-ins for Qt MultiMedia Player
+
+- MPG123:	provides MPEG v1/2 layer1/2/3 support with use of
+		libmpg123 library
+- FFap:		provides enhanced Monkey's Audio (APE) support
+		(24-bit samples and embedded cue support)
+- XMP:		Decodes module audio and renders sound
+
+WWW: http://qmmp.ylsoftware.com/
diff --git a/multimedia/qmmp-plugin-pack-qt5/pkg-plist b/multimedia/qmmp-plugin-pack-qt5/pkg-plist
new file mode 100644
index 000000000000..4fe3eebd2a78
--- /dev/null
+++ b/multimedia/qmmp-plugin-pack-qt5/pkg-plist
@@ -0,0 +1,3 @@
+%%FFAP%%lib/qmmp/Input/libffap.so
+%%MPG123%%lib/qmmp/Input/libmpg123.so
+%%XMP%%lib/qmmp/Input/libxmp.so
diff --git a/multimedia/qmmp-plugin-pack/Makefile b/multimedia/qmmp-plugin-pack/Makefile
index bcf1069d8b60..5e46d52f357f 100644
--- a/multimedia/qmmp-plugin-pack/Makefile
+++ b/multimedia/qmmp-plugin-pack/Makefile
@@ -1,17 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.8.3
+PORTVERSION=	0.9.3
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
+	SF/qmmp-dev/${PORTNAME}/
 
 MAINTAINER=	liangtai.s16@gmail.com
-COMMENT=	Additional plug-ins for QMMP
+COMMENT=	Additional plug-ins for QMMP (Qt4)
 
 LICENSE=	GPLv2
 
+CONFLICTS=	${PORTNAME}-qt5-1.*
+
 LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
-BUILD_DEPENDS=	qmmp>=0.8.0:${PORTSDIR}/multimedia/qmmp
+BUILD_DEPENDS=	qmmp>=0.9.0:${PORTSDIR}/multimedia/qmmp
 
 USES=		cmake:outsource pkgconfig tar:bzip2
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
@@ -20,9 +23,9 @@ USE_LDCONFIG=	yes
 OPTIONS_SUB=	yes
 
 OPTIONS_MULTI=	PLUGINS
-OPTIONS_MULTI_PLUGINS=	FFAP MPG123 QSUI
+OPTIONS_MULTI_PLUGINS=	FFAP MPG123 XMP
 
-OPTIONS_DEFAULT=	FFAP MPG123 QSUI
+OPTIONS_DEFAULT=	FFAP MPG123 XMP
 
 FFAP_DESC=		Support APE sound file
 FFAP_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
@@ -42,17 +45,15 @@ MPG123_USE=	QT4=uic_build
 MPG123_CMAKE_ON=	-DUSE_MPG123:BOOL=TRUE
 MPG123_CMAKE_OFF=	-DUSE_MPG123:BOOL=FALSE
 
-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
+XMP_DESC=		Support various module formats using libxmp
+XMP_LIB_DEPENDS=	libxmp.so:${PORTSDIR}/audio/libxmp
+XMP_CMAKE_ON=	-DUSE_XMP:BOOL=TRUE
+XMP_CMAKE_OFF=	-DUSE_XMP:BOOL=FALSE
 
 CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	@${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
 
diff --git a/multimedia/qmmp-plugin-pack/distinfo b/multimedia/qmmp-plugin-pack/distinfo
index 60270845a732..ab3befe10907 100644
--- a/multimedia/qmmp-plugin-pack/distinfo
+++ b/multimedia/qmmp-plugin-pack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.8.3.tar.bz2) = 7b45464429a44f0de9f611ec4c2d396752c3be19e3b8076f8909cb18930589f0
-SIZE (qmmp-plugin-pack-0.8.3.tar.bz2) = 163989
+SHA256 (qmmp-plugin-pack-0.9.3.tar.bz2) = 4c65cf6b917574858248b81f7c357b128af21908e7a437f1e1cb89f1501020ec
+SIZE (qmmp-plugin-pack-0.9.3.tar.bz2) = 76668
diff --git a/multimedia/qmmp-plugin-pack/pkg-descr b/multimedia/qmmp-plugin-pack/pkg-descr
index 021284a21749..9077f4ee48bb 100644
--- a/multimedia/qmmp-plugin-pack/pkg-descr
+++ b/multimedia/qmmp-plugin-pack/pkg-descr
@@ -4,6 +4,6 @@ Additional plug-ins for Qt MultiMedia Player
 		libmpg123 library
 - FFap:		provides enhanced Monkey's Audio (APE) support
 		(24-bit samples and embedded cue support)
-- Simple Ui:	simple user interface based on standard widgets set
+- XMP:		Decodes module audio and renders sound
 
-WWW: http://qmmp.ylsoftware.com/ or http://code.google.com/p/qmmp/
+WWW: http://qmmp.ylsoftware.com/
diff --git a/multimedia/qmmp-plugin-pack/pkg-plist b/multimedia/qmmp-plugin-pack/pkg-plist
index 6867fde0ec0a..4fe3eebd2a78 100644
--- a/multimedia/qmmp-plugin-pack/pkg-plist
+++ b/multimedia/qmmp-plugin-pack/pkg-plist
@@ -1,3 +1,3 @@
 %%FFAP%%lib/qmmp/Input/libffap.so
 %%MPG123%%lib/qmmp/Input/libmpg123.so
-%%QSUI%%lib/qmmp/Ui/libqsui.so
+%%XMP%%lib/qmmp/Input/libxmp.so
diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
new file mode 100644
index 000000000000..ebba36f879af
--- /dev/null
+++ b/multimedia/qmmp-qt5/Makefile
@@ -0,0 +1,348 @@
+# $FreeBSD$
+
+PORTNAME=	qmmp
+PORTVERSION=	1.0.4
+CATEGORIES=	multimedia
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
+	SF/qmmp-dev/${PORTNAME}/
+PKGNAMESUFFIX=	-qt5
+
+MAINTAINER=	liangtai.s16@gmail.com
+COMMENT=	Qt5-based multimedia player
+
+LICENSE=	GPLv2
+
+CONFLICTS=	${PORTNAME}-0.*
+
+USES=		cmake:outsource desktop-file-utils pkgconfig tar:bzip2
+USE_QT5=	core gui network widgets xml \
+		qmake_build buildtools_build linguisttools_build
+USE_LDCONFIG=	yes
+
+OPTIONS_SUB=	yes
+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 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 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_CMAKE_ON=	-DUSE_QSUI:BOOL=TRUE
+QSUI_CMAKE_OFF=	-DUSE_QSUI:BOOL=FALSE
+
+SKINNEDUI_DESC=	Skinned GUI
+SKINNEDUI_USE=	QT5=x11extras
+SKINNEDUI_CMAKE_ON=	-DUSE_SKINNED:BOOL=TRUE
+SKINNEDUI_CMAKE_OFF=	-DUSE_SKINNED:BOOL=FALSE
+
+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
+
+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
+JACK_BUILD_DEPENDS=	jackit>=0.121.2:${PORTSDIR}/audio/jack
+JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
+JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
+
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=TRUE
+ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=FALSE
+
+BS2B_DESC=		Support the Bauer stereophonic2binaural effect
+BS2B_LIB_DEPENDS=	libbs2b.so:${PORTSDIR}/audio/libbs2b
+BS2B_CMAKE_ON=	-DUSE_BS2B:BOOL=TRUE
+BS2B_CMAKE_OFF=	-DUSE_BS2B:BOOL=FALSE
+
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CMAKE_ON=	-DUSE_PULSE:BOOL=TRUE
+PULSEAUDIO_CMAKE_OFF=	-DUSE_PULSE:BOOL=FALSE
+
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libtag.so:${PORTSDIR}/audio/taglib
+FLAC_CMAKE_ON=	-DUSE_FLAC:BOOL=TRUE
+FLAC_CMAKE_OFF=	-DUSE_FLAC:BOOL=FALSE
+
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack \
+		libtag.so:${PORTSDIR}/audio/taglib
+MUSEPACK_CMAKE_ON=	-DUSE_MPC:BOOL=TRUE
+MUSEPACK_CMAKE_OFF=	-DUSE_MPC:BOOL=FALSE
+
+GME_DESC=		Support video game music files
+GME_LIB_DEPENDS=	libgme.so:${PORTSDIR}/audio/libgme
+GME_CMAKE_ON=	-DUSE_GME:BOOL=TRUE
+GME_CMAKE_OFF=	-DUSE_GME:BOOL=FALSE
+
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CMAKE_ON=	-DUSE_FFMPEG:BOOL=TRUE
+FFMPEG_CMAKE_OFF=	-DUSE_FFMPEG:BOOL=FALSE
+
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CMAKE_ON=	-DUSE_MODPLUG:BOOL=TRUE
+MODPLUG_CMAKE_OFF=	-DUSE_MODPLUG:BOOL=FALSE
+
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad \
+		libtag.so:${PORTSDIR}/audio/taglib
+FAAD_CMAKE_ON=	-DUSE_AAC:BOOL=TRUE
+FAAD_CMAKE_OFF=	-DUSE_AAC:BOOL=FALSE
+
+CDDA_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio \
+	libcdio_cdda.so:${PORTSDIR}/sysutils/libcdio-paranoia
+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
+ENCA_CMAKE_ON=	-DUSE_ENCA:BOOL=TRUE
+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
+
+PROJECTM_DESC=	Support the projectM music visualiser
+PROJECTM_LIB_DEPENDS=	libprojectM.so.2:${PORTSDIR}/graphics/libprojectm
+PROJECTM_USE=	QT5=opengl
+PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
+PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
+
+OSS_CMAKE_ON=	-DUSE_OSS:BOOL=TRUE
+OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=FALSE
+
+OSS4_DESC=		Open Sound System (ver4) support
+OSS4_BUILD_DEPENDS=	${LOCALBASE}/lib/oss/include/sys/soundcard.h:${PORTSDIR}/audio/oss
+OSS4_CMAKE_ON=	-DUSE_OSS4:BOOL=TRUE
+OSS4_CMAKE_OFF=	-DUSE_OSS4:BOOL=FALSE
+
+LADSPA_RUN_DEPENDS=	analyseplugin:${PORTSDIR}/audio/ladspa
+LADSPA_CMAKE_ON=	-DUSE_LADSPA:BOOL=TRUE
+LADSPA_CMAKE_OFF=	-DUSE_LADSPA:BOOL=FALSE
+
+WILDMIDI_DESC=	Support to playback MIDI files
+WILDMIDI_LIB_DEPENDS=	libWildMidi.so:${PORTSDIR}/audio/wildmidi
+WILDMIDI_CMAKE_ON=	-DUSE_MIDI:BOOL=TRUE
+WILDMIDI_CMAKE_OFF=	-DUSE_MIDI:BOOL=FALSE
+
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad \
+		libtag.so:${PORTSDIR}/audio/taglib
+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
+
+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
+SNDFILE_CMAKE_OFF=	-DUSE_SNDFILE:BOOL=FALSE
+
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis \
+		libtag.so:${PORTSDIR}/audio/taglib
+VORBIS_CMAKE_ON=	-DUSE_VORBIS:BOOL=TRUE
+VORBIS_CMAKE_OFF=	-DUSE_VORBIS:BOOL=FALSE
+
+WAVPACK_LIB_DEPENDS=	libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CMAKE_ON=	-DUSE_WAVPACK:BOOL=TRUE
+WAVPACK_CMAKE_OFF=	-DUSE_WAVPACK:BOOL=FALSE
+
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+CURL_CMAKE_ON=	-DUSE_CURL:BOOL=TRUE
+CURL_CMAKE_OFF=	-DUSE_CURL:BOOL=FALSE
+
+MMS_LIB_DEPENDS=	libmms.so:${PORTSDIR}/net/libmms
+MMS_CMAKE_ON=	-DUSE_MMS:BOOL=TRUE
+MMS_CMAKE_OFF=	-DUSE_MMS:BOOL=FALSE
+
+CUE_CMAKE_ON=	-DUSE_CUE:BOOL=TRUE
+CUE_CMAKE_OFF=	-DUSE_CUE:BOOL=FALSE
+
+NULLOUT_DESC=	Support null output
+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
+
+CROSSFADE_DESC=	Support cross-fade effect
+CROSSFADE_CMAKE_ON=	-DUSE_CROSSFADE:BOOL=TRUE
+CROSSFADE_CMAKE_OFF=	-DUSE_CROSSFADE:BOOL=FALSE
+
+STEREO_DESC=	Support stereo effect
+STEREO_CMAKE_ON=	-DUSE_STEREO:BOOL=TRUE
+STEREO_CMAKE_OFF=	-DUSE_STEREO:BOOL=FALSE
+
+ANALYZER_DESC=	Support spectrum analyzer visualization
+ANALYZER_CMAKE_ON=	-DUSE_ANALYZER:BOOL=TRUE
+ANALYZER_CMAKE_OFF=	-DUSE_ANALYZER:BOOL=FALSE
+
+CONVERTER_DESC=	Support file type converter
+CONVERTER_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+CONVERTER_CMAKE_ON=	-DUSE_CONVERTER:BOOL=TRUE
+CONVERTER_CMAKE_OFF=	-DUSE_CONVERTER:BOOL=FALSE
+
+COPYPASTE_DESC=	Enable copy/paste track infos between playlists
+COPYPASTE_CMAKE_ON=	-DUSE_COPYPASTE:BOOL=TRUE
+COPYPASTE_CMAKE_OFF=	-DUSE_COPYPASTE:BOOL=FALSE
+
+MPRIS_DESC=	Support the Media Player Remote
+MPRIS_USE=	QT5=dbus
+MPRIS_CMAKE_ON=	-DUSE_MPRIS:BOOL=TRUE
+MPRIS_CMAKE_OFF=	-DUSE_MPRIS:BOOL=FALSE
+
+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
+
+SB_DESC=	Browser for IceCast stream directory
+SB_CMAKE_ON=	-DUSE_SB:BOOL=TRUE
+SB_CMAKE_OFF=	-DUSE_SB:BOOL=FALSE
+
+NOTIFIER_DESC=	Support to popup notifier
+NOTIFIER_CMAKE_ON=	-DUSE_NOTIFIER:BOOL=TRUE
+NOTIFIER_CMAKE_OFF=	-DUSE_NOTIFIER:BOOL=FALSE
+
+LYRICS_DESC=	Support to show lyrics using lyrics.wikia.com
+LYRICS_CMAKE_ON=	-DUSE_LYRICS:BOOL=TRUE
+LYRICS_CMAKE_OFF=	-DUSE_LYRICS:BOOL=FALSE
+
+HAL_USE=	QT5=dbus
+HAL_CMAKE_ON=	-DUSE_HAL:BOOL=TRUE
+HAL_CMAKE_OFF=	-DUSE_HAL:BOOL=FALSE
+
+HOTKEY_DESC=	Support global shortcut keys
+HOTKEY_USE=	QT5=x11extras
+HOTKEY_CMAKE_ON=	-DUSE_HOTKEY:BOOL=TRUE
+HOTKEY_CMAKE_OFF=	-DUSE_HOTKEY:BOOL=FALSE
+
+GNOMEHOTKEY_DESC=	Support GNOME/Cinnamon shortcut keys
+GNOMEHOTKEY_USE=	QT5=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
+
+COVER_DESC=	Support to show cover images
+COVER_CMAKE_ON=	-DUSE_COVER:BOOL=TRUE
+COVER_CMAKE_OFF=	-DUSE_COVER:BOOL=FALSE
+
+KDENOTIFY_DESC=	Support to popup notifier for KDE
+KDENOTIFY_USE=	QT5=dbus
+KDENOTIFY_CMAKE_ON=	-DUSE_KDENOTIFY:BOOL=TRUE
+KDENOTIFY_CMAKE_OFF=	-DUSE_KDENOTIFY:BOOL=FALSE
+
+TRACKCHANGE_DESC=	Enable to run external command each track
+TRACKCHANGE_CMAKE_ON=	-DUSE_TRACKCHANGE:BOOL=TRUE
+TRACKCHANGE_CMAKE_OFF=	-DUSE_TRACKCHANGE:BOOL=FALSE
+
+UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS2_USE=	QT5=dbus
+UDISKS2_CMAKE_ON=	-DUSE_UDISKS2:BOOL=TRUE
+UDISKS2_CMAKE_OFF=	-DUSE_UDISKS2:BOOL=FALSE
+
+QMMP_DIALOG_DESC=	An original dialog
+QMMP_DIALOG_CMAKE_ON=	-DUSE_QMMP_DIALOG:BOOL=TRUE
+QMMP_DIALOG_CMAKE_OFF=	-DUSE_QMMP_DIALOG:BOOL=FALSE
+
+.include <bsd.port.options.mk>
+
+PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
+
+PORTDOCS=	README README.RUS AUTHORS
+INSTALLS_ICONS=	yes
+
+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
+
+post-build-DOXYGEN-on:
+	cd ${WRKSRC}/doc && doxygen Doxyfile
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}; \
+		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 ; \
+	cd ${WRKSRC}/doc/html/search && \
+		${INSTALL_MAN} *.html *.png *.css *.js ${STAGEDIR}${DOCSDIR}/html/search ; \
+	${RM} -f ${WRKDIR}/PLIST.doc ; \
+	${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \
+		${SED} 's|${STAGEDIR}${PREFIX}/||' \
+		>> ${WRKDIR}/PLIST.doc
+	cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST}
+
+.include <bsd.port.mk>
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
new file mode 100644
index 000000000000..5c1d7b0b81c9
--- /dev/null
+++ b/multimedia/qmmp-qt5/distinfo
@@ -0,0 +1,2 @@
+SHA256 (qmmp-1.0.4.tar.bz2) = 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85
+SIZE (qmmp-1.0.4.tar.bz2) = 1102390
diff --git a/multimedia/qmmp-qt5/pkg-descr b/multimedia/qmmp-qt5/pkg-descr
new file mode 100644
index 000000000000..821b2c059073
--- /dev/null
+++ b/multimedia/qmmp-qt5/pkg-descr
@@ -0,0 +1,25 @@
+This program is an audio-player, written with help of Qt library.
+Supported formats:
+	MPEG1 layer 2/3, Ogg Vorbis, Native FLAC, Ogg FLAC, Musepack, WavePack,
+	tracker modules (mod, s3m, it, xm, etc.), ADTS AAC, CD Audio, MIDI,
+	Opus tags, WMA-Monkey's Audio (and other formats via FFmpeg),
+	PCM Wave (and other formats via libsndfile), and Chiptune formats
+	(AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ, VTX)
+DSP effects:
+	Bauer Stereophonic-to-Binaural effect, sample rate conversion,
+	LADSPA effects, extra stereo effect, and crossfade effect
+Visual effects:
+	Spectrum Analyzer, and projectM audio visulaliser
+Output system support:
+	PulseAudio, OSS, OSS4, jack, and ALSA
+Other features:
+	multi-band equalizer, Last.fm/Libre.fm scrobbler, global hotkey,
+	streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast) and browser,
+	CDDB, removable device detection (via HAL or UDisks), cover art,
+	multiple playlists, MMS, file type determination and converter, MPRIS,
+	CUE sheet, embedded CUE (for FLAC and WavPack), ReplayGain,
+	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/
diff --git a/multimedia/qmmp-qt5/pkg-plist b/multimedia/qmmp-qt5/pkg-plist
new file mode 100644
index 000000000000..fc69aa5b57c0
--- /dev/null
+++ b/multimedia/qmmp-qt5/pkg-plist
@@ -0,0 +1,127 @@
+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
+include/qmmp/effectfactory.h
+include/qmmp/enginefactory.h
+include/qmmp/eqsettings.h
+include/qmmp/fileinfo.h
+include/qmmp/inputsource.h
+include/qmmp/inputsourcefactory.h
+include/qmmp/metadatamanager.h
+include/qmmp/metadatamodel.h
+include/qmmp/output.h
+include/qmmp/outputfactory.h
+include/qmmp/qmmp.h
+include/qmmp/qmmpsettings.h
+include/qmmp/soundcore.h
+include/qmmp/statehandler.h
+include/qmmp/tagmodel.h
+include/qmmp/visual.h
+include/qmmp/visualfactory.h
+include/qmmp/volume.h
+include/qmmpui/commandlinemanager.h
+include/qmmpui/commandlineoption.h
+include/qmmpui/configdialog.h
+include/qmmpui/detailsdialog.h
+include/qmmpui/filedialog.h
+include/qmmpui/filedialogfactory.h
+include/qmmpui/general.h
+include/qmmpui/generalfactory.h
+include/qmmpui/mediaplayer.h
+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
+include/qmmpui/playlistparser.h
+include/qmmpui/playlisttrack.h
+include/qmmpui/qmmpuisettings.h
+include/qmmpui/templateeditor.h
+include/qmmpui/uifactory.h
+include/qmmpui/uihelper.h
+include/qmmpui/uiloader.h
+lib/libqmmp.so
+lib/libqmmp.so.1
+lib/libqmmp.so.%%SHLIB_VER%%
+lib/libqmmpui.so
+lib/libqmmpui.so.1
+lib/libqmmpui.so.%%SHLIB_VER%%
+lib/qmmp/CommandLineOptions/libincdecvolumeoption.so
+lib/qmmp/CommandLineOptions/libplaylistoption.so
+lib/qmmp/CommandLineOptions/libseekoption.so
+lib/qmmp/CommandLineOptions/libstatusoption.so
+%%LADSPA%%lib/qmmp/Effect/libladspa.so
+%%BS2B%%lib/qmmp/Effect/libbs2b.so
+%%SRCONV%%lib/qmmp/Effect/libsrconverter.so
+%%STEREO%%lib/qmmp/Effect/libstereo.so
+%%CROSSFADE%%lib/qmmp/Effect/libcrossfade.so
+%%MPLAYER%%lib/qmmp/Engines/libmplayer.so
+%%QMMP_DIALOG%%lib/qmmp/FileDialogs/libqmmpfiledialog.so
+%%CONVERTER%%lib/qmmp/General/libconverter.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
+%%TRACKCHANGE%%lib/qmmp/General/libtrackchange.so
+%%UDISKS2%%lib/qmmp/General/libudisks2.so
+%%FAAD%%lib/qmmp/Input/libaac.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
+%%MAD%%lib/qmmp/Input/libmad.so
+%%MODPLUG%%lib/qmmp/Input/libmodplug.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
+%%WILDMIDI%%lib/qmmp/Input/libwildmidi.so
+%%JACK%%lib/qmmp/Output/libjack.so
+%%ALSA%%lib/qmmp/Output/libalsa.so
+%%NULLOUT%%lib/qmmp/Output/libnull.so
+%%OSS%%lib/qmmp/Output/liboss.so
+%%OSS4%%lib/qmmp/Output/liboss4.so
+%%PULSEAUDIO%%lib/qmmp/Output/libpulseaudio.so
+lib/qmmp/PlayListFormats/libm3uplaylistformat.so
+lib/qmmp/PlayListFormats/libplsplaylistformat.so
+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
+libdata/pkgconfig/qmmpui.pc
+%%DIR_ASSOC%%share/applications/qmmp.desktop
+%%DIR_ASSOC%%share/applications/qmmp_enqueue.desktop
+%%DIR_ASSOC%%share/applications/qmmp_dir.desktop
+share/icons/hicolor/16x16/apps/qmmp.png
+share/icons/hicolor/32x32/apps/qmmp.png
+share/icons/hicolor/48x48/apps/qmmp.png
+share/icons/hicolor/scalable/apps/qmmp.svgz
+share/icons/hicolor/scalable/apps/qmmp-simple.svgz
+%%KDENOTIFY%%%%DATADIR%%/images/app_icon.png
+%%KDENOTIFY%%%%DATADIR%%/images/empty_cover.png
+@comment Insert PLIST.doc here
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