From owner-svn-ports-head@FreeBSD.ORG Fri Jul 26 08:44: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 82A95B49; Fri, 26 Jul 2013 08:44:53 +0000 (UTC) (envelope-from danfe@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 559ED2CC3; Fri, 26 Jul 2013 08:44: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 r6Q8iqHn052709; Fri, 26 Jul 2013 08:44:52 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6Q8iqrQ052708; Fri, 26 Jul 2013 08:44:52 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307260844.r6Q8iqrQ052708@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 26 Jul 2013 08:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323704 - head/multimedia/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.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: Fri, 26 Jul 2013 08:44:53 -0000 Author: danfe Date: Fri Jul 26 08:44:52 2013 New Revision: 323704 URL: http://svnweb.freebsd.org/changeset/ports/323704 Log: - Fix parallel build by wrapping compound commands in parentheses (for a subshell spawn) and replacing hardcoded `make' with correct $(MAKE) - Remove useless and confusing global modifiers from REINPLACE_CMD regex' - Cleanup Makefile while here: trim header, sort the knobs, employ USES - Convert NOPORTDOCS -> PORT_OPTIONS:MDOCS, add OPTIONS_DEFINE Reported by: pointyhat-west Modified: head/multimedia/umplayer/Makefile Modified: head/multimedia/umplayer/Makefile ============================================================================== --- head/multimedia/umplayer/Makefile Fri Jul 26 08:03:41 2013 (r323703) +++ head/multimedia/umplayer/Makefile Fri Jul 26 08:44:52 2013 (r323704) @@ -1,9 +1,5 @@ -# New ports collection makefile for: umplayer -# Date created: 2 May, 2011 -# Whom: Zhihao Yuan -# +# Created by: Zhihao Yuan # $FreeBSD$ -# PORTNAME= umplayer DISTVERSION= 0.97 @@ -12,33 +8,35 @@ CATEGORIES= multimedia audio kde MASTER_SITES= LOCAL/wen MAINTAINER= lichray@gmail.com -COMMENT= A modern front-end for mplayer (forked from smplayer) +COMMENT= Modern front-end for MPlayer (fork of SMPlayer) RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer +USES= gmake +USE_XZ= yes USE_QT4= gui network xml qmake_build moc_build rcc_build uic_build \ linguist_build - -ALL_TARGET= src/umplayer - -USE_XZ= yes -USE_GMAKE= yes INSTALLS_ICONS= yes -MAKE_ARGS+= QMAKE_OPTS="DEFINES+=NO_DEBUG_ON_CONSOLE" +MAKE_ARGS= QMAKE_OPTS="DEFINES+=NO_DEBUG_ON_CONSOLE" PREFIX="${PREFIX}" +ALL_TARGET= src/umplayer MAN1= umplayer.1 MANCOMPRESSED= yes +OPTIONS_DEFINE= DOCS + +.include + post-patch: - @${REINPLACE_CMD} -e 's|qmake|${QMAKE}|g' \ - -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|g' \ - -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|g' \ - -e 's,/share/man,/man,g' \ + @${REINPLACE_CMD} -e 's| make| $$(MAKE)|' \ + -e 's|cd src|(&| ; /cd src/s|$$|)|' \ + -e 's|qmake|${QMAKE}|' \ + -e 's|lrelease|${QT_PREFIX}/bin/lrelease-qt4|' \ + -e 's|/share/man|/man|' \ -e 's|/doc/packages|/doc|' \ -e 's|^.*/get_svn_revision.sh$$||' \ - ${WRKSRC}/Makefile - -.if defined(NOPORTDOCS) + ${WRKSRC}/Makefile +.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -E -e '/(install|tar).*DOC_PATH/d' \ ${WRKSRC}/Makefile .endif