From owner-svn-ports-all@freebsd.org Fri Sep 18 17:45:59 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05EB59CEE98; Fri, 18 Sep 2015 17:45:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 9C30319BE; Fri, 18 Sep 2015 17:45:58 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8IHjwMK087086; Fri, 18 Sep 2015 17:45:58 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8IHjvO8087084; Fri, 18 Sep 2015 17:45:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509181745.t8IHjvO8087084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 18 Sep 2015 17:45:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397273 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 18 Sep 2015 17:45:59 -0000 Author: amdmi3 Date: Fri Sep 18 17:45:57 2015 New Revision: 397273 URL: https://svnweb.freebsd.org/changeset/ports/397273 Log: - Fix shebangs - Switch to @sample - Switch to options helpers - Drop @dirrm* from plist Approved by: portmgr blanket 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 Fri Sep 18 17:45:51 2015 (r397272) +++ head/games/linux-enemyterritory-jaymod-21/Makefile Fri Sep 18 17:45:57 2015 (r397273) @@ -3,7 +3,7 @@ PORTNAME= jaymod PORTVERSION= 2.1.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games linux MASTER_SITES= http://etmod.googlecode.com/files/ \ http://www.zenenterprises.biz/bud/jaymod/ \ @@ -20,6 +20,9 @@ VERSTR= ${PORTVERSION:C/([0-9])\.([0-9] PKGNAMESUFFIX= -${VERSTR} PLIST_SUB= VERSTR="${VERSTR}" +USES= shebangfix +SHEBANG_FILES= linux/convert_shrub +perl_OLD_CMD= /bin/env perl USE_LINUX= yes PORTSCOUT= limit:^2\.1\.7 @@ -36,8 +39,6 @@ PLIST_SUB+= CLIENT_PK3="${CLIENT_PK3}" OB_VERSTR= 0660 OMNIBOT_RUN_DEPENDS= et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR} -.include - do-build: .for f in et etded @(${ECHO_CMD} "#!/bin/sh"; \ @@ -56,6 +57,8 @@ do-install: @${CP} -p ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f}.sample .endfor @${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${STAGEDIR}${DATADIR} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in README.txt doc/jaymod.pdf @cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR} Modified: head/games/linux-enemyterritory-jaymod-21/pkg-plist ============================================================================== --- head/games/linux-enemyterritory-jaymod-21/pkg-plist Fri Sep 18 17:45:51 2015 (r397272) +++ head/games/linux-enemyterritory-jaymod-21/pkg-plist Fri Sep 18 17:45:57 2015 (r397273) @@ -1,8 +1,6 @@ bin/et-jaymod-%%VERSTR%% bin/etded-jaymod-%%VERSTR%% -@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 +@sample %%DATADIR%%/jaymod.cfg.sample %%DATADIR%%/%%CLIENT_PK3%% %%DATADIR%%/linux/convert_shrub %%DATADIR%%/linux/serverctl @@ -16,12 +14,6 @@ bin/etded-jaymod-%%VERSTR%% %%DATADIR%%/mapscripts/railgun.script %%DATADIR%%/mapscripts/railgun_lms.script %%DATADIR%%/qagame.mp.i386.so -@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 +@sample %%DATADIR%%/server.cfg.sample %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/mapscripts -@dirrm %%DATADIR%%/linux -@dirrmtry %%DATADIR%%