From owner-svn-ports-head@FreeBSD.ORG Sun Oct 20 11:57:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 95A51A13; Sun, 20 Oct 2013 11:57:53 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8196424A1; Sun, 20 Oct 2013 11:57:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9KBvreV076270; Sun, 20 Oct 2013 11:57:53 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9KBvqgj076267; Sun, 20 Oct 2013 11:57:52 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310201157.r9KBvqgj076267@svn.freebsd.org> From: William Grzybowski Date: Sun, 20 Oct 2013 11:57:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331008 - head/multimedia/qmmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Oct 2013 11:57:53 -0000 Author: wg Date: Sun Oct 20 11:57:52 2013 New Revision: 331008 URL: http://svnweb.freebsd.org/changeset/ports/331008 Log: multimedia/qmmp: update to 0.7.3 - Update to 0.7.3 - Disable legacy ffmpeg - Fix staging PR: ports/177793 Submitted by: RyoTa SimaMoto (maintainer) Modified: head/multimedia/qmmp/Makefile head/multimedia/qmmp/distinfo head/multimedia/qmmp/pkg-plist Modified: head/multimedia/qmmp/Makefile ============================================================================== --- head/multimedia/qmmp/Makefile Sun Oct 20 11:48:55 2013 (r331007) +++ head/multimedia/qmmp/Makefile Sun Oct 20 11:57:52 2013 (r331008) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp -PORTVERSION= 0.7.2 +PORTVERSION= 0.7.3 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ ${MASTER_SITE_GOOGLE_CODE} @@ -17,6 +17,7 @@ USE_QT4= corelib gui network xml \ qmake_build rcc_build uic_build moc_build linguist_build USE_LDCONFIG= yes +OPTIONS_SINGLE= MPLAYER OPTIONS_SINGLE_MPLAYER= MPLAYER1 MPLAYER2 OPTIONS_DEFINE= ALSA ANALYZER APIDOC BS2B CDIO CONVERTER COPYPASTE \ COVER CROSSFADE CUE CURL DIR_ASSOC DOCS ENCA FAAD \ @@ -66,7 +67,6 @@ QMMP_DIALOG_DESC= An original dialog MPLAYER1_DESC= mplayer-1.1.x (multimedia/mplayer) MPLAYER2_DESC= mplayer-2.0.x (multimedia/mplayer2) -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPIDOC} @@ -153,6 +153,8 @@ PLIST_SUB+= GME="@comment " PLUGIN_OPTIONS_CMAKE+= -DUSE_GME:BOOL=FALSE .endif +PLUGIN_OPTIONS_CMAKE+= -DUSE_FFMPEG_LEGACY:BOOL=FALSE + .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg PLIST_SUB+= FFMPEG="" @@ -541,20 +543,22 @@ post-build: .endif post-install: - @${MKDIR} ${STAGEDIR}/${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR}; \ + cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} +.endif .if ${PORT_OPTIONS:MAPIDOC} - @${MKDIR} ${STAGEDIR}/${DOCSDIR}/html/search ; \ + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html/search ; \ cd ${WRKSRC}/doc/html && \ - ${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}/${DOCSDIR}/html ; \ + ${INSTALL_MAN} *.html *.png *.css ${STAGEDIR}${DOCSDIR}/html ; \ cd ${WRKSRC}/doc/html/search && \ - ${INSTALL_MAN} *.html *.png *.css *.js ${STAGEDIR}/${DOCSDIR}/html/search ; \ + ${INSTALL_MAN} *.html *.png *.css *.js ${STAGEDIR}${DOCSDIR}/html/search ; \ ${RM} -f ${WRKDIR}/PLIST.doc ; \ - ${FIND} ${STAGEDIR}/${DOCSDIR}/html -type f | \ - ${SED} 's|${STAGEDIR}/${PREFIX}/||' \ + ${FIND} ${STAGEDIR}${DOCSDIR}/html -type f | \ + ${SED} 's|${STAGEDIR}${PREFIX}/||' \ >> ${WRKDIR}/PLIST.doc ; \ - ${FIND} ${STAGEDIR}/${DOCSDIR}/html -type d | \ - ${SED} 's|${STAGEDIR}/${PREFIX}/|@dirrm |' \ + ${FIND} ${STAGEDIR}${DOCSDIR}/html -type d | \ + ${SED} 's|${STAGEDIR}${PREFIX}/|@dirrm |' \ | ${SORT} -r >> ${WRKDIR}/PLIST.doc ; \ cd ${WRKDIR} ; ${SED} -i -e '/PLIST.doc/ r PLIST.doc' ${TMPPLIST} .endif Modified: head/multimedia/qmmp/distinfo ============================================================================== --- head/multimedia/qmmp/distinfo Sun Oct 20 11:48:55 2013 (r331007) +++ head/multimedia/qmmp/distinfo Sun Oct 20 11:57:52 2013 (r331008) @@ -1,2 +1,2 @@ -SHA256 (qmmp-0.7.2.tar.bz2) = 8e6b50ced58e247972060bb5a5156ea2c74b03f33df92e87591d09f685b82081 -SIZE (qmmp-0.7.2.tar.bz2) = 847558 +SHA256 (qmmp-0.7.3.tar.bz2) = 57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562 +SIZE (qmmp-0.7.3.tar.bz2) = 848638 Modified: head/multimedia/qmmp/pkg-plist ============================================================================== --- head/multimedia/qmmp/pkg-plist Sun Oct 20 11:48:55 2013 (r331007) +++ head/multimedia/qmmp/pkg-plist Sun Oct 20 11:57:52 2013 (r331008) @@ -81,7 +81,6 @@ lib/qmmp/CommandLineOptions/libstatusopt %%CDIO%%lib/qmmp/Input/libcdaudio.so %%CUE%%lib/qmmp/Input/libcue.so %%FFMPEG%%lib/qmmp/Input/libffmpeg.so -%%FFMPEG_LEGACY%%lib/qmmp/Input/libffmpeg_legacy.so %%FLAC%%lib/qmmp/Input/libflac.so %%MAD%%lib/qmmp/Input/libmad.so %%MODPLUG%%lib/qmmp/Input/libmodplug.so