ports/170668: Update qmmp to v0.6.3, qmmp-plugin-pack to v0.6.2

[RyoTa SimaMoto]

>Number:         170668
>Category:       ports
>Synopsis:       Update qmmp to v0.6.3, qmmp-plugin-pack to v0.6.2
>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:   Thu Aug 16 13:40:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     RyoTa SimaMoto
>Release:        9-STABLE
>Organization:
>Environment:
FreeBSD takiba.fakenet 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #12 r238861: Sat Jul 28 22:15:53 JST 2012     root at takiba.fakenet:/usr/obj/usr/src/sys/VAIO  i386
>Description:
Micro upgrades.
multimedia/qmmp:                 version 0.6.3
multimedia/qmmp-plugin-pack:     version 0.6.2

Atached patch file acts updates ports of them.


I should apologize that I did not give feedback to
ports/170109 after additional obscure reports.
Now that report is no longer needed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: multimedia/qmmp/distinfo
===================================================================
--- multimedia/qmmp/distinfo	(revision 302526)
+++ multimedia/qmmp/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-0.6.0.tar.bz2) = 4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe
-SIZE (qmmp-0.6.0.tar.bz2) = 772882
+SHA256 (qmmp-0.6.3.tar.bz2) = 98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8
+SIZE (qmmp-0.6.3.tar.bz2) = 775285
Index: multimedia/qmmp/Makefile
===================================================================
--- multimedia/qmmp/Makefile	(revision 302526)
+++ multimedia/qmmp/Makefile	(working copy)
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	qmmp
-PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTVERSION=	0.6.3
+PORTREVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 		${MASTER_SITE_GOOGLE_CODE}
@@ -22,6 +22,7 @@
 USE_QT4=	corelib gui network xml \
 		qmake_build rcc_build uic_build moc_build linguist_build
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
 OPTIONS_DEFINE=	SKINNEDUI DIR_ASSOC APIDOC PULSEAUDIO ALSA OSS OSS4 \
 		JACK NULLOUT FLAC MUSEPACK FFMPEG MODPLUG WILDMIDI GME MAD \
Index: multimedia/qmmp-plugin-pack/distinfo
===================================================================
--- multimedia/qmmp-plugin-pack/distinfo	(revision 302526)
+++ multimedia/qmmp-plugin-pack/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (qmmp-plugin-pack-0.6.0.tar.bz2) = 47fe88ef372e5407a33fdd6d0fdfdc78eab9a746aa5c570b2f489836576ae9e1
-SIZE (qmmp-plugin-pack-0.6.0.tar.bz2) = 268941
+SHA256 (qmmp-plugin-pack-0.6.2.tar.bz2) = 8f241b94a3671a27d1d1f5d4695469760a52dcaafdc5e97f069b932ccb2ed41c
+SIZE (qmmp-plugin-pack-0.6.2.tar.bz2) = 121619
Index: multimedia/qmmp-plugin-pack/files/patch-SET_RPATH
===================================================================
--- multimedia/qmmp-plugin-pack/files/patch-SET_RPATH	(revision 0)
+++ multimedia/qmmp-plugin-pack/files/patch-SET_RPATH	(working copy)
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2012-07-23 03:56:51.000000000 +0900
++++ CMakeLists.txt	2012-07-24 07:13:44.000000000 +0900
+@@ -3,6 +3,7 @@
+ #freebsd include
+ include_directories(SYSTEM /usr/include /usr/local/include)
+ 
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ CONFIGURE_FILE(
+   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Index: multimedia/qmmp-plugin-pack/Makefile
===================================================================
--- multimedia/qmmp-plugin-pack/Makefile	(revision 302526)
+++ multimedia/qmmp-plugin-pack/Makefile	(working copy)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmmp-plugin-pack
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/plugins/ \
 		http://qmmp.googlecode.com/files/
@@ -23,13 +23,18 @@
 USE_CMAKE=	yes
 USE_QT4=	corelib gui qmake_build rcc_build moc_build linguist_build
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
-OPTIONS_MULTI=	PLUGINS
-OPTIONS_MULTI_PLUGINS=	FFAP MPG123 QSUI
+OPTIONS_DEFINE=	FFAP MPG123 QSUI
 OPTIONS_DEFAULT=	FFAP MPG123 QSUI
 FFAP_DESC=		Support APE sound file
 MPG123_DESC=	Support libmpg123 (MPEG v1/2 layer1/2/3)
 QSUI_DESC=		Simple UI based on standard widgets set
+OPTIONS_DEFINE_i386=	FFAPASM
+OPTIONS_DEFAULT_i386=	FFAPASM
+OPTIONS_DEFINE_x86_64=	FFAPASM
+OPTIONS_DEFAULT_x86_64=	FFAPASM
+FFAPASM_DESC=	Optimize FFap decoder using devel/yasm
 
 .include <bsd.port.options.mk>
 
@@ -55,8 +60,11 @@
 
 .if ${PORT_OPTIONS:MFFAP}
 PLIST_SUB+=	FFAP=""
-. if ${ARCH} == i386 || ${ARCH} == x86_64
+. if (${ARCH} == i386 || ${ARCH} == x86_64) && ${PORT_OPTIONS:MFFAPASM}
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=TRUE
+. else
+PLUGIN_OPTIONS_CMAKE+=	-DUSE_ASM:BOOL=FALSE
 . endif
 LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
 PLUGIN_OPTIONS_CMAKE+=	-DUSE_FFAP:BOOL=TRUE


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