ports/175234: update multimedia/qmmp, multimedia/qmmp-plugin-pack

[RyoTa SimaMoto]

>Number:         175234
>Category:       ports
>Synopsis:       update multimedia/qmmp, multimedia/qmmp-plugin-pack
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 12 15:40:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     RyoTa SimaMoto
>Release:        9.1-STABLE
>Organization:
>Environment:
FreeBSD takiba.fakenet 9.1-STABLE FreeBSD 9.1-STABLE #3 r244924M: Thu Jan  3 22:31:43 JST 2013     root at takiba.fakenet:/usr/obj/usr/src/sys/VAIO  i386
>Description:
Update multimedia/qmmp to version 0.6.6, and
multimedia/qmmp-plugin-pack to version 0.6.4.

This report includes all changes of  my previous
PR (ports/173112) and its follow-ups, so please
ignore them and close it.

* Allow to select a port from several versions of
   FFMPEG and MPLAYER
* Trim Makefile headers
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: multimedia/qmmp/Makefile
===================================================================
--- multimedia/qmmp/Makefile	(revision 310262)
+++ multimedia/qmmp/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection Makefile for:	qmmp
-# Date created:		Fri Jan 30 01:13:20 JST 2009
-# Whom:      SimaMoto,RyoTa <liangtai.s4 at gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qmmp
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 		${MASTER_SITE_GOOGLE_CODE}
@@ -23,16 +18,19 @@
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	build
 
+OPTIONS_SINGLE=	FFMPEG MPLAYER
+OPTIONS_SINGLE_FFMPEG=	FFMPEG0_7 FFMPEG0_11 FFMPEG1 FFMPEGDEVEL
+OPTIONS_SINGLE_MPLAYER=	MPLAYER1 MPLAYER2
 OPTIONS_DEFINE=	SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
 		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
 		VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
 		STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
 		CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
 		FILEOPS COVER KDENOTIFY HAL UDISKS QMMP_DIALOG
-OPTIONS_DEFAULT=	SKINNEDUI DIR_ASSOC PULSEAUDIO ALSA OSS4 \
-		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
+OPTIONS_DEFAULT=	SKINNEDUI DIR_ASSOC PULSEAUDIO ALSA OSS4 JACK \
+		NULLOUT FLAC MUSEPACK FFMPEG FFMPEG1 MODPLUG WILDMIDI GME MAD \
 		VORBIS SNDFILE WAVPACK CUE CDIO FAAD LADSPA CROSSFADE BS2B \
-		STEREO SRCONV MPLAYER CURL MMS PROJECTM ANALYZER ENCA \
+		STEREO SRCONV MPLAYER MPLAYER1 CURL MMS PROJECTM ANALYZER ENCA \
 		CONVERTER MPRIS SCROBBLER STATICON SB NOTIFIER LYRICS HOTKEY \
 		FILEOPS COVER KDENOTIFY HAL UDISKS QMMP_DIALOG
 SKINNEDUI_DESC=	Skinned GUI
@@ -42,7 +40,6 @@
 NULLOUT_DESC=	Support a null output
 WILDMIDI_DESC=	Support to playback MIDI files
 GME_DESC=		Support video game music files
-CDIO_DESC=		Support to playback compact discs
 CROSSFADE_DESC=	Support cross-fade effect
 BS2B_DESC=		Support the Bauer stereophonic2binaural effect
 STEREO_DESC=	Support stereo effect
@@ -63,6 +60,12 @@
 KDENOTIFY_DESC=	Support to popup notifier for KDE
 UDISKS_DESC=	Support removable disc detection using UDisks
 QMMP_DIALOG_DESC=	An original dialog
+FFMPEG0_7_DESC=	ffmpeg-0.7.x (multimedia/ffmpeg)
+FFMPEG0_11_DESC=	ffmpeg-0.11.x (multimedia/ffmpeg-011)
+FFMPEG1_DESC=	ffmpeg-1.x (multimedia/ffmpeg1)
+FFMPEGDEVEL_DESC=	ffmpeg-devel (multimedia/ffmpeg-devel)
+MPLAYER1_DESC=	mplayer-1.1.x (multimedia/mplayer)
+MPLAYER2_DESC=	mplayer-2.0.x (multimedia/mplayer2)
 
 .include <bsd.port.options.mk>
 
@@ -151,12 +154,24 @@
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-PLIST_SUB+=	FFMPEG=""
-. if exists(${LOCALBASE}/include/libavcodec/vda.h)
+. if ${PORT_OPTIONS:MFFMPEGDEVEL}
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg-devel
+FFMPEG_SUFFIX=	-devel
 . else
+.  if ${PORT_OPTIONS:MFFMPEG1}
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg1
+FFMPEG_SUFFIX=	1
+.  else
+.   if ${PORT_OPTIONS:MFFMPEG0_11}
+LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg-011
+FFMPEG_SUFFIX=	-011
+.   else
 LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_SUFFIX=
+.   endif
+.  endif
 . endif
+PLIST_SUB+=	FFMPEG=""
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFMPEG:BOOL=TRUE
 .else
 PLIST_SUB+=	FFMPEG="@comment "
@@ -201,8 +216,12 @@
 .endif
 
 .if ${PORT_OPTIONS:MMPLAYER}
+. if ${PORT_OPTIONS:MMPLAYER2}
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer2
+. else
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+. endif
 PLIST_SUB+=	MPLAYER=""
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_MPLAYER:BOOL=TRUE
 .else
 PLIST_SUB+=	MPLAYER="@comment "
@@ -498,6 +517,9 @@
 
 pre-configure:
 	${RM} -f ${BUILD_WRKSRC}/CMakeCache.txt
+	${REINPLACE_CMD} -E -e '/pkg_check_modules/ { \
+	s/(libavcodec|libavformat|libavutil)[^ ]*>=/\1${FFMPEG_SUFFIX}>=/g; }' \
+		${WRKSRC}/src/plugins/Input/ffmpeg/CMakeLists.txt
 
 post-build:
 .if ${PORT_OPTIONS:MAPIDOC}
Index: multimedia/qmmp/distinfo
===================================================================
--- multimedia/qmmp/distinfo	(revision 310262)
+++ multimedia/qmmp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.6.3.tar.bz2) = 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8
-SIZE (qmmp-0.6.3.tar.bz2) = 775285
+SHA256 (qmmp-0.6.6.tar.bz2) = dfa973cca80c020a85a11bb66701a3804f9fde326440abb179559c98bf3b5b99
+SIZE (qmmp-0.6.6.tar.bz2) = 798388
Index: multimedia/qmmp-plugin-pack/Makefile
===================================================================
--- multimedia/qmmp-plugin-pack/Makefile	(revision 310262)
+++ multimedia/qmmp-plugin-pack/Makefile	(working copy)
@@ -1,12 +1,7 @@
-# New ports collection Makefile for:	qmmp-plugin-pack
-# Date created:		Fri Jul 01 02:59:13 JST 2012
-# Whom:      SimaMoto,RyoTa <liangtai.s4 at gmail.com>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
 		http://qmmp.googlecode.com/files/
Index: multimedia/qmmp-plugin-pack/distinfo
===================================================================
--- multimedia/qmmp-plugin-pack/distinfo	(revision 310262)
+++ multimedia/qmmp-plugin-pack/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.6.2.tar.bz2) = 8f241b94a3671a27d1d1f5d4695469760a52dcaafdc5e97f069b932ccb2ed41c
-SIZE (qmmp-plugin-pack-0.6.2.tar.bz2) = 121619
+SHA256 (qmmp-plugin-pack-0.6.4.tar.bz2) = d999f53ce5483bf7b09c5d2da59b4413b7bcdc32594f9ecd565ddba10f1be81a
+SIZE (qmmp-plugin-pack-0.6.4.tar.bz2) = 119176


>Release-Note:
>Audit-Trail:
>Unformatted: