From owner-svn-ports-all@FreeBSD.ORG Sun May 11 21:23:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 000BCE1F; Sun, 11 May 2014 21:23:09 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1471276F; Sun, 11 May 2014 21:23:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BLN9OU001409; Sun, 11 May 2014 21:23:09 GMT (envelope-from bar@svn.freebsd.org) Received: (from bar@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BLN9wA001405; Sun, 11 May 2014 21:23:09 GMT (envelope-from bar@svn.freebsd.org) Message-Id: <201405112123.s4BLN9wA001405@svn.freebsd.org> From: Barbara Guida Date: Sun, 11 May 2014 21:23:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353737 - head/games/linux-enemyterritory-jaymod X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2014 21:23:10 -0000 Author: bar Date: Sun May 11 21:23:09 2014 New Revision: 353737 URL: http://svnweb.freebsd.org/changeset/ports/353737 QAT: https://qat.redports.org/buildarchive/r353737/ Log: - Support STAGEDIR - Use options helpers Modified: head/games/linux-enemyterritory-jaymod/Makefile head/games/linux-enemyterritory-jaymod/pkg-plist Modified: head/games/linux-enemyterritory-jaymod/Makefile ============================================================================== --- head/games/linux-enemyterritory-jaymod/Makefile Sun May 11 21:22:47 2014 (r353736) +++ head/games/linux-enemyterritory-jaymod/Makefile Sun May 11 21:23:09 2014 (r353737) @@ -24,12 +24,9 @@ DOCSDIR= ${PREFIX}/share/doc/enemyterrit CLIENT_PK3= ${PORTNAME}-${PORTVERSION}.pk3 PLIST_SUB= CLIENT_PK3="${CLIENT_PK3}" -NO_STAGE= yes -.include +OMNIBOT_RUN_DEPENDS= et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot -.if ${PORT_OPTIONS:MOMNIBOT} -RUN_DEPENDS+= et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot -.endif +.include do-build: .for f in et etded @@ -40,26 +37,18 @@ do-build: do-install: .for f in et etded - ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${STAGEDIR}${PREFIX}/bin .endfor - ${MKDIR} ${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${STAGEDIR}${DATADIR} + @cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} ${STAGEDIR}${DATADIR} .for f in jaymod.cfg server.cfg - ${CP} -p ${WRKSRC}/${f} ${DATADIR}/${f}.sample + @${CP} -p ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f}.sample +.endfor + @${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in README.txt doc/jaymod.pdf + @cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR} .endfor - ${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} README.txt doc/jaymod.pdf ${DOCSDIR} -.endif - -post-install: - @if [ ! -f ${DATADIR}/jaymod.cfg ]; then \ - ${CP} -p ${DATADIR}/jaymod.cfg.sample ${DATADIR}/jaymod.cfg ; \ - fi - @if [ ! -f ${DATADIR}/server.cfg ]; then \ - ${CP} -p ${DATADIR}/server.cfg.sample ${DATADIR}/server.cfg ; \ - fi .include Modified: head/games/linux-enemyterritory-jaymod/pkg-plist ============================================================================== --- head/games/linux-enemyterritory-jaymod/pkg-plist Sun May 11 21:22:47 2014 (r353736) +++ head/games/linux-enemyterritory-jaymod/pkg-plist Sun May 11 21:23:09 2014 (r353737) @@ -2,7 +2,7 @@ bin/et-jaymod bin/etded-jaymod @unexec if cmp %D/lib/enemyterritory/jaymod/jaymod.cfg %D/lib/enemyterritory/jaymod/jaymod.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod/jaymod.cfg; fi %%DATADIR%%/jaymod.cfg.sample -@exec if [ ! -f %D/lib/enemyterritory/jaymod/jaymod.cfg ] ; then cp -p %D/lib/enemyterritory/jaymod/jaymod.cfg.sample %D/lib/enemyterritory/jaymod/jaymod.cfg; fi +@exec if [ ! -f %D/lib/enemyterritory/jaymod/jaymod.cfg ] ; then cp -p %D/%F %B/jaymod.cfg; fi %%DATADIR%%/%%CLIENT_PK3%% %%DATADIR%%/linux/convert_shrub %%DATADIR%%/linux/serverctl @@ -18,7 +18,7 @@ bin/etded-jaymod %%DATADIR%%/qagame.mp.i386.so @unexec if cmp %D/lib/enemyterritory/jaymod/server.cfg %D/lib/enemyterritory/jaymod/server.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod/server.cfg; fi %%DATADIR%%/server.cfg.sample -@exec if [ ! -f %D/lib/enemyterritory/jaymod/server.cfg ] ; then cp -p %D/lib/enemyterritory/jaymod/server.cfg.sample %D/lib/enemyterritory/jaymod/server.cfg; fi +@exec if [ ! -f %D/lib/enemyterritory/jaymod/server.cfg ] ; then cp -p %D/%F %B/server.cfg; fi %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%%