From owner-svn-ports-head@FreeBSD.ORG Sun May 11 21:24:28 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 A49ABF05; Sun, 11 May 2014 21:24:28 +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 91B292778; Sun, 11 May 2014 21:24:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4BLOSiU001820; Sun, 11 May 2014 21:24:28 GMT (envelope-from bar@svn.freebsd.org) Received: (from bar@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4BLOS6I001818; Sun, 11 May 2014 21:24:28 GMT (envelope-from bar@svn.freebsd.org) Message-Id: <201405112124.s4BLOS6I001818@svn.freebsd.org> From: Barbara Guida Date: Sun, 11 May 2014 21:24:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353738 - head/games/linux-enemyterritory-jaymod-21 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.18 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, 11 May 2014 21:24:28 -0000 Author: bar Date: Sun May 11 21:24:27 2014 New Revision: 353738 URL: http://svnweb.freebsd.org/changeset/ports/353738 QAT: https://qat.redports.org/buildarchive/r353738/ Log: - Support STAGEDIR - Use options helpers - Keep .cfg files - Limit PORTSCOUT Modified: head/games/linux-enemyterritory-jaymod-21/Makefile head/games/linux-enemyterritory-jaymod-21/pkg-plist Modified: head/games/linux-enemyterritory-jaymod-21/Makefile ============================================================================== --- head/games/linux-enemyterritory-jaymod-21/Makefile Sun May 11 21:23:09 2014 (r353737) +++ head/games/linux-enemyterritory-jaymod-21/Makefile Sun May 11 21:24:27 2014 (r353738) @@ -22,6 +22,8 @@ PLIST_SUB= VERSTR="${VERSTR}" USE_LINUX= yes +PORTSCOUT= limit:^2\.1\.7 + OPTIONS_DEFINE= DOCS OMNIBOT OMNIBOT_DESC= Install Omni-Bot 0.660 for bot support @@ -31,13 +33,10 @@ DOCSDIR= ${PREFIX}/share/doc/enemyterrit CLIENT_PK3= ${PORTNAME}-${PORTVERSION}.pk3 PLIST_SUB+= CLIENT_PK3="${CLIENT_PK3}" -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MOMNIBOT} OB_VERSTR= 0660 -RUN_DEPENDS+= et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR} -.endif +OMNIBOT_RUN_DEPENDS= et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR} + +.include do-build: .for f in et etded @@ -48,15 +47,18 @@ do-build: do-install: .for f in et etded - ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${STAGEDIR}${PREFIX}/bin +.endfor + @${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} ${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 - ${MKDIR} ${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} *.cfg ${DATADIR} - ${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR} -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} README.txt doc/jaymod.pdf ${DOCSDIR} -.endif .include Modified: head/games/linux-enemyterritory-jaymod-21/pkg-plist ============================================================================== --- head/games/linux-enemyterritory-jaymod-21/pkg-plist Sun May 11 21:23:09 2014 (r353737) +++ head/games/linux-enemyterritory-jaymod-21/pkg-plist Sun May 11 21:24:27 2014 (r353738) @@ -1,6 +1,8 @@ bin/et-jaymod-%%VERSTR%% bin/etded-jaymod-%%VERSTR%% -%%DATADIR%%/jaymod.cfg +@unexec if cmp %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg; fi +%%DATADIR%%/jaymod.cfg.sample +@exec if [ ! -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/jaymod.cfg ] ; then cp -p %D/%F %B/jaymod.cfg; fi %%DATADIR%%/%%CLIENT_PK3%% %%DATADIR%%/linux/convert_shrub %%DATADIR%%/linux/serverctl @@ -14,10 +16,12 @@ bin/etded-jaymod-%%VERSTR%% %%DATADIR%%/mapscripts/railgun.script %%DATADIR%%/mapscripts/railgun_lms.script %%DATADIR%%/qagame.mp.i386.so -%%DATADIR%%/server.cfg +@unexec if cmp %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg; fi +%%DATADIR%%/server.cfg.sample +@exec if [ ! -f %D/lib/enemyterritory/jaymod-%%VERSTR%%/server.cfg ] ; then cp -p %D/%F %B/server.cfg; fi %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/mapscripts @dirrm %%DATADIR%%/linux -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%