From owner-svn-ports-head@FreeBSD.ORG Mon Jan 6 16:18:19 2014 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 ESMTPS id 3407CAA8; Mon, 6 Jan 2014 16:18:19 +0000 (UTC) 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 0619111CD; Mon, 6 Jan 2014 16:18:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06GIIrJ029677; Mon, 6 Jan 2014 16:18:18 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06GIIgq029675; Mon, 6 Jan 2014 16:18:18 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201401061618.s06GIIgq029675@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 6 Jan 2014 16:18:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338904 - in head/multimedia: smplayer umplayer 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.17 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: Mon, 06 Jan 2014 16:18:19 -0000 Author: makc Date: Mon Jan 6 16:18:18 2014 New Revision: 338904 URL: http://svnweb.freebsd.org/changeset/ports/338904 Log: - Convert to USES=qmake Approved by: maintainer Modified: head/multimedia/smplayer/Makefile head/multimedia/umplayer/Makefile Modified: head/multimedia/smplayer/Makefile ============================================================================== --- head/multimedia/smplayer/Makefile Mon Jan 6 16:17:31 2014 (r338903) +++ head/multimedia/smplayer/Makefile Mon Jan 6 16:18:18 2014 (r338904) @@ -12,12 +12,14 @@ COMMENT= Complete front-end based on Qt4 RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ ${LOCALBASE}/share/smplayer/themes:${PORTSDIR}/multimedia/smplayer-themes -USE_QT4= gui network script xml qmake_build moc_build rcc_build uic_build \ +USE_QT4= gui network script xml moc_build rcc_build uic_build \ uic3_build porting_build linguist_build ALL_TARGET= src/smplayer +CONFIGURE_WRKSRC= ${WRKSRC}/src +MAKE_ARGS+= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} -USES= gmake +USES= gmake qmake USE_BZIP2= yes INSTALLS_ICONS= yes @@ -27,9 +29,8 @@ PORTDOCS= Changelog Copying.txt Install. .include post-patch: - @${REINPLACE_CMD} -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|g' \ + @${REINPLACE_CMD} -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||' \ -e 's|lrelease|${LRELEASE}|g' \ - -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ -e 's,/share/man,/man,g' \ -e 's, make, ${MAKE_CMD},g' \ ${WRKSRC}/Makefile Modified: head/multimedia/umplayer/Makefile ============================================================================== --- head/multimedia/umplayer/Makefile Mon Jan 6 16:17:31 2014 (r338903) +++ head/multimedia/umplayer/Makefile Mon Jan 6 16:18:18 2014 (r338904) @@ -12,14 +12,15 @@ COMMENT= Modern front-end for MPlayer (f RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer -USES= gmake +USES= gmake qmake USE_XZ= yes -USE_QT4= gui network xml qmake_build moc_build rcc_build uic_build \ +USE_QT4= gui network xml moc_build rcc_build uic_build \ linguist_build INSTALLS_ICONS= yes -MAKE_ARGS+= ${PREFIX} +MAKE_ARGS+= PREFIX=${PREFIX} DESTDIR=${STAGEDIR} QMAKE_ARGS+= "DEFINES+=NO_DEBUG_ON_CONSOLE" ALL_TARGET= src/umplayer +CONFIGURE_WRKSRC= ${WRKSRC}/src OPTIONS_DEFINE= DOCS @@ -28,7 +29,7 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \ -e 's|cd src|(&| ; /cd src/s|$$|)|' \ - -e 's|qmake|${QMAKE} ${QMAKE_ARGS}|' \ + -e 's|&& $$(QMAKE) $$(QMAKE_OPTS)||' \ -e 's|lrelease|${LRELEASE}|' \ -e 's|/share/man|/man|' \ -e 's|/doc/packages|/doc|' \