Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Dec 2015 17:39:11 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r404443 - in head/multimedia: . qmmp qmmp-plugin-pack qmmp-plugin-pack-qt5 qmmp-qt5
Message-ID:  <201512251739.tBPHdBse069445@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivierd
Date: Fri Dec 25 17:39:11 2015
New Revision: 404443
URL: https://svnweb.freebsd.org/changeset/ports/404443

Log:
  - 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)

Added:
  head/multimedia/qmmp-plugin-pack-qt5/
     - copied from r404441, head/multimedia/qmmp-plugin-pack/
  head/multimedia/qmmp-qt5/
     - copied from r404441, head/multimedia/qmmp/
Modified:
  head/multimedia/Makefile
  head/multimedia/qmmp-plugin-pack-qt5/Makefile
  head/multimedia/qmmp-plugin-pack-qt5/distinfo
  head/multimedia/qmmp-plugin-pack-qt5/pkg-descr
  head/multimedia/qmmp-plugin-pack-qt5/pkg-plist
  head/multimedia/qmmp-plugin-pack/Makefile
  head/multimedia/qmmp-plugin-pack/distinfo
  head/multimedia/qmmp-plugin-pack/pkg-descr
  head/multimedia/qmmp-plugin-pack/pkg-plist
  head/multimedia/qmmp-qt5/Makefile
  head/multimedia/qmmp-qt5/distinfo
  head/multimedia/qmmp-qt5/pkg-descr
  head/multimedia/qmmp-qt5/pkg-plist
  head/multimedia/qmmp/Makefile
  head/multimedia/qmmp/distinfo
  head/multimedia/qmmp/pkg-descr
  head/multimedia/qmmp/pkg-plist

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/Makefile	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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

Modified: head/multimedia/qmmp-plugin-pack-qt5/Makefile
==============================================================================
--- head/multimedia/qmmp-plugin-pack/Makefile	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-plugin-pack-qt5/Makefile	Fri Dec 25 17:39:11 2015	(r404443)
@@ -1,28 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.8.3
+PORTVERSION=	1.0.2
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/
+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
+COMMENT=	Additional plug-ins for QMMP (Qt5)
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libqmmpui.so:${PORTSDIR}/multimedia/qmmp
-BUILD_DEPENDS=	qmmp>=0.8.0:${PORTSDIR}/multimedia/qmmp
+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_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
+USE_QT5=	core gui qmake_build buildtools_build linguisttools_build
 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
@@ -38,20 +42,13 @@ FFAPASM_CMAKE_ON=	-DUSE_ASM:BOOL=TRUE
 FFAPASM_CMAKE_OFF=	-DUSE_ASM:BOOL=FALSE
 
 MPG123_LIB_DEPENDS=	libmpg123.so:${PORTSDIR}/audio/mpg123
-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
-
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
+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

Modified: head/multimedia/qmmp-plugin-pack-qt5/distinfo
==============================================================================
--- head/multimedia/qmmp-plugin-pack/distinfo	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-plugin-pack-qt5/distinfo	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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-1.0.2.tar.bz2) = a3a309342fd5077c80bcba214a3d5df6f96135e9fae37d5d122e608557080767
+SIZE (qmmp-plugin-pack-1.0.2.tar.bz2) = 76533

Modified: head/multimedia/qmmp-plugin-pack-qt5/pkg-descr
==============================================================================
--- head/multimedia/qmmp-plugin-pack/pkg-descr	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-plugin-pack-qt5/pkg-descr	Fri Dec 25 17:39:11 2015	(r404443)
@@ -4,6 +4,6 @@ Additional plug-ins for Qt MultiMedia Pl
 		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/

Modified: head/multimedia/qmmp-plugin-pack-qt5/pkg-plist
==============================================================================
--- head/multimedia/qmmp-plugin-pack/pkg-plist	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-plugin-pack-qt5/pkg-plist	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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

Modified: head/multimedia/qmmp-plugin-pack/Makefile
==============================================================================
--- head/multimedia/qmmp-plugin-pack/Makefile	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp-plugin-pack/Makefile	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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
 

Modified: head/multimedia/qmmp-plugin-pack/distinfo
==============================================================================
--- head/multimedia/qmmp-plugin-pack/distinfo	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp-plugin-pack/distinfo	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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

Modified: head/multimedia/qmmp-plugin-pack/pkg-descr
==============================================================================
--- head/multimedia/qmmp-plugin-pack/pkg-descr	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp-plugin-pack/pkg-descr	Fri Dec 25 17:39:11 2015	(r404443)
@@ -4,6 +4,6 @@ Additional plug-ins for Qt MultiMedia Pl
 		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/

Modified: head/multimedia/qmmp-plugin-pack/pkg-plist
==============================================================================
--- head/multimedia/qmmp-plugin-pack/pkg-plist	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp-plugin-pack/pkg-plist	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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

Modified: head/multimedia/qmmp-qt5/Makefile
==============================================================================
--- head/multimedia/qmmp/Makefile	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-qt5/Makefile	Fri Dec 25 17:39:11 2015	(r404443)
@@ -1,42 +1,77 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	multimedia
-MASTER_SITES=	http://qmmp.ylsoftware.com/files/
+MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
+	SF/qmmp-dev/${PORTNAME}/
+PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	liangtai.s16@gmail.com
-COMMENT=	Qt4-based multimedia player
+COMMENT=	Qt5-based multimedia player
 
 LICENSE=	GPLv2
 
+CONFLICTS=	${PORTNAME}-0.*
+
 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_QT5=	core gui network widgets xml \
+		qmake_build buildtools_build linguisttools_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 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_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
 
@@ -90,10 +125,10 @@ FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}
 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,13 +138,15 @@ 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=	QT4=opengl
+PROJECTM_USE=	QT5=opengl
 PROJECTM_CMAKE_ON=	-DUSE_PROJECTM:BOOL=TRUE
 PROJECTM_CMAKE_OFF=	-DUSE_PROJECTM:BOOL=FALSE
 
@@ -175,6 +212,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 +224,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
 
@@ -200,7 +238,7 @@ COPYPASTE_CMAKE_ON=	-DUSE_COPYPASTE:BOOL
 COPYPASTE_CMAKE_OFF=	-DUSE_COPYPASTE:BOOL=FALSE
 
 MPRIS_DESC=	Support the Media Player Remote
-MPRIS_USE=	QT4=dbus
+MPRIS_USE=	QT5=dbus
 MPRIS_CMAKE_ON=	-DUSE_MPRIS:BOOL=TRUE
 MPRIS_CMAKE_OFF=	-DUSE_MPRIS:BOOL=FALSE
 
@@ -229,16 +267,17 @@ LYRICS_DESC=	Support to show lyrics usin
 LYRICS_CMAKE_ON=	-DUSE_LYRICS:BOOL=TRUE
 LYRICS_CMAKE_OFF=	-DUSE_LYRICS:BOOL=FALSE
 
-HAL_USE=	QT4=dbus
+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=	QT4=dbus
+GNOMEHOTKEY_USE=	QT5=dbus
 GNOMEHOTKEY_CMAKE_ON=	-DUSE_GNOMEHOTKEY:BOOL=TRUE
 GNOMEHOTKEY_CMAKE_OFF=	-DUSE_GNOMEHOTKEY:BOOL=FALSE
 
@@ -251,20 +290,16 @@ COVER_CMAKE_ON=	-DUSE_COVER:BOOL=TRUE
 COVER_CMAKE_OFF=	-DUSE_COVER:BOOL=FALSE
 
 KDENOTIFY_DESC=	Support to popup notifier for KDE
-KDENOTIFY_USE=	QT4=dbus
+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 switching
+TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_ON=	-DUSE_TRACKCHANGE:BOOL=TRUE
 TRACKCHANGE_CMAKE_OFF=	-DUSE_TRACKCHANGE:BOOL=FALSE
 
-UDISKS_DESC=	Support removable disc detection (obsolete)
 UDISKS2_DESC=	Support removable disc detection using UDisks
-UDISKS_USE=	QT4=dbus
-UDISKS2_USE=	QT4=dbus
-UDISKS_CMAKE_ON=	-DUSE_UDISKS:BOOL=TRUE
-UDISKS_CMAKE_OFF=	-DUSE_UDISKS:BOOL=FALSE
+UDISKS2_USE=	QT5=dbus
 UDISKS2_CMAKE_ON=	-DUSE_UDISKS2:BOOL=TRUE
 UDISKS2_CMAKE_OFF=	-DUSE_UDISKS2:BOOL=FALSE
 
@@ -279,12 +314,6 @@ 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 \
-	-DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
@@ -297,17 +326,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 +343,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>

Modified: head/multimedia/qmmp-qt5/distinfo
==============================================================================
--- head/multimedia/qmmp/distinfo	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-qt5/distinfo	Fri Dec 25 17:39:11 2015	(r404443)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.8.3.tar.bz2) = 9e73518adf011e60e36c18d55d05845f8103b4af61351e26edb6c105390dd949
-SIZE (qmmp-0.8.3.tar.bz2) = 991403
+SHA256 (qmmp-1.0.4.tar.bz2) = 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85
+SIZE (qmmp-1.0.4.tar.bz2) = 1102390

Modified: head/multimedia/qmmp-qt5/pkg-descr
==============================================================================
--- head/multimedia/qmmp/pkg-descr	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-qt5/pkg-descr	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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/

Modified: head/multimedia/qmmp-qt5/pkg-plist
==============================================================================
--- head/multimedia/qmmp/pkg-plist	Fri Dec 25 17:18:55 2015	(r404441)
+++ head/multimedia/qmmp-qt5/pkg-plist	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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
@@ -47,10 +49,10 @@ include/qmmpui/uifactory.h
 include/qmmpui/uihelper.h
 include/qmmpui/uiloader.h
 lib/libqmmp.so
-lib/libqmmp.so.0
+lib/libqmmp.so.1
 lib/libqmmp.so.%%SHLIB_VER%%
 lib/libqmmpui.so
-lib/libqmmpui.so.0
+lib/libqmmpui.so.1
 lib/libqmmpui.so.%%SHLIB_VER%%
 lib/qmmp/CommandLineOptions/libincdecvolumeoption.so
 lib/qmmp/CommandLineOptions/libplaylistoption.so
@@ -79,10 +81,9 @@ lib/qmmp/CommandLineOptions/libstatusopt
 %%STATICON%%lib/qmmp/General/libstatusicon.so
 %%SB%%lib/qmmp/General/libstreambrowser.so
 %%TRACKCHANGE%%lib/qmmp/General/libtrackchange.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 +109,7 @@ lib/qmmp/PlayListFormats/libxspfplaylist
 %%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 +117,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

Modified: head/multimedia/qmmp/Makefile
==============================================================================
--- head/multimedia/qmmp/Makefile	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp/Makefile	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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}
 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>

Modified: head/multimedia/qmmp/distinfo
==============================================================================
--- head/multimedia/qmmp/distinfo	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp/distinfo	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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

Modified: head/multimedia/qmmp/pkg-descr
==============================================================================
--- head/multimedia/qmmp/pkg-descr	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp/pkg-descr	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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/

Modified: head/multimedia/qmmp/pkg-plist
==============================================================================
--- head/multimedia/qmmp/pkg-plist	Fri Dec 25 17:24:00 2015	(r404442)
+++ head/multimedia/qmmp/pkg-plist	Fri Dec 25 17:39:11 2015	(r404443)
@@ -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/libstatusopt
 %%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/libxspfplaylist
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512251739.tBPHdBse069445>