From 6c741c4aba6e6203921bd78fd71abd9d086ff81e Mon Sep 17 00:00:00 2001
From: ultima <ultima@FreeBSD.org>
Date: Sun, 13 Aug 2017 22:20:55 +0000
Subject: * Updated to 1.1.10 * Cleanup Makefile * Added license file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR:		221250
Submitted by:	SimaMoto,RyōTa (maintainer)
Reviewed by:	matthew (mentor)
Approved by:	matthew (mentor)
Differential Revision:	https://reviews.freebsd.org/D11998
---
 multimedia/qmmp-qt5/Makefile | 39 ++++++++++++++++++++-------------------
 multimedia/qmmp-qt5/distinfo |  6 +++---
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 2865f2c422cf..29ccb2936402 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	1.1.7
-PORTREVISION=	2
+PORTVERSION=	1.1.10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -12,15 +11,30 @@ MAINTAINER=	liangtai.s16@gmail.com
 COMMENT=	Qt5-based multimedia player
 
 LICENSE=	GPLv2
-
-CONFLICTS=	${PORTNAME}-0.*
-PORTSCOUT=	limit:^1\..*
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:outsource pathfix pkgconfig tar:bzip2
 USE_QT5=	core gui network widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
+CONFLICTS=	${PORTNAME}-0.*
+PORTSCOUT=	limit:^1\..*
+
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:C/-.*//}
+
+PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
+PORTDOCS=	README README.RUS AUTHORS
+INSTALLS_ICONS=	yes
+
+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 \
@@ -57,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
@@ -253,6 +259,7 @@ TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
 UDISKS2_DESC=	Support removable disc detection using UDisks
+UDISKS2_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
 UDISKS2_USE=	QT5=dbus
 UDISKS2_CMAKE_BOOL=	USE_UDISKS2
 
@@ -262,12 +269,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
-
 post-patch:
 	@${GREP} -L '${LOCALBASE}/lib/oss' \
 		${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
index a2fe4e174b82..6745805a25ff 100644
--- a/multimedia/qmmp-qt5/distinfo
+++ b/multimedia/qmmp-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490441147
-SHA256 (qmmp-1.1.7.tar.bz2) = 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7
-SIZE (qmmp-1.1.7.tar.bz2) = 1135005
+TIMESTAMP = 1501879751
+SHA256 (qmmp-1.1.10.tar.bz2) = 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a
+SIZE (qmmp-1.1.10.tar.bz2) = 1142444
-- 
cgit