* Updated to 0.10.10

* Cleanup Makefile
* Added license file

PR:		221247
Submitted by:	SimaMoto,RyōTa (maintainer)
Reviewed by:	matthew (mentor)
Approved by:	matthew (mentor)
Differential Revision:	https://reviews.freebsd.org/D11999

2 files changed, 24 insertions, 24 deletions

diff --git a/multimedia/qmmp/Makefile b/multimedia/qmmp/Makefile
index 45a950e67d50..3845a060132a 100644
--- a/multimedia/qmmp/Makefile
+++ b/multimedia/qmmp/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	0.10.7
-PORTREVISION=	2
+PORTVERSION=	0.10.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -11,15 +10,31 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt4-based multimedia player
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-qt5-1.*
-PORTSCOUT=	limit:^0.*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:outsource localbase pathfix pkgconfig tar:bzip2
 USE_QT4=	corelib gui network xml \
 		linguisttools_build moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
+CONFLICTS=	${PORTNAME}-qt5-1.*
+PORTSCOUT=	limit:^0.*
+
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:C/-.*//}
+
+PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
+PORTDOCS=	README README.RUS AUTHORS
+INSTALLS_ICONS=	yes
+
+CMAKE_ARGS=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE
+
+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 MUSEPACK NOTIFIER NULLOUT \
+		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
+		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
+		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
 OPTIONS_SUB=	yes
 OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 		PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \
@@ -56,14 +71,6 @@ OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
 MISC_DESC=	Other features
 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 MUSEPACK NOTIFIER NULLOUT \
-		OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \
-		RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \
-		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
-
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 QSUI_DESC=	Simple UI based on standard widgets set
@@ -254,6 +261,7 @@ TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS_DESC=	Support removable disc detection (obsolete)
 UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS2_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS_USE=	QT4=dbus
 UDISKS2_USE=	QT4=dbus
 UDISKS_CMAKE_BOOL=	USE_UDISKS
@@ -265,14 +273,6 @@ QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//}
-
-PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
-PORTDOCS=	README README.RUS AUTHORS
-INSTALLS_ICONS=	yes
-
-CMAKE_ARGS+=	-DUSE_FFMPEG_LEGACY:BOOL=FALSE
-
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
diff --git a/multimedia/qmmp/distinfo b/multimedia/qmmp/distinfo
index 097689b6e6dc..c25ff1325c40 100644
--- a/multimedia/qmmp/distinfo
+++ b/multimedia/qmmp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490427682
-SHA256 (qmmp-0.10.7.tar.bz2) = 1f9e9198bb7bc2f71691653112704ce73ab10bf191b27b7836ccc7ceee155e4b
-SIZE (qmmp-0.10.7.tar.bz2) = 1342434
+TIMESTAMP = 1501879675
+SHA256 (qmmp-0.10.10.tar.bz2) = 7f8982a1a4bb216cd4c8d5d5599b24a16c3f2bc1faf22c1ab40bdaf6c6ea5cc0
+SIZE (qmmp-0.10.10.tar.bz2) = 1346679