From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 13 15:40:09 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29F0E1065672 for ; Fri, 13 Jan 2012 15:40:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0172A8FC16 for ; Fri, 13 Jan 2012 15:40:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0DFe8iF021239 for ; Fri, 13 Jan 2012 15:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0DFe8k7021238; Fri, 13 Jan 2012 15:40:08 GMT (envelope-from gnats) Resent-Date: Fri, 13 Jan 2012 15:40:08 GMT Resent-Message-Id: <201201131540.q0DFe8k7021238@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Barbara Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B62C61065672 for ; Fri, 13 Jan 2012 15:30:39 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 9574D8FC1E for ; Fri, 13 Jan 2012 15:30:39 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q0DFUdhY049390 for ; Fri, 13 Jan 2012 15:30:39 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q0DFUdHV049389; Fri, 13 Jan 2012 15:30:39 GMT (envelope-from nobody) Message-Id: <201201131530.q0DFUdHV049389@red.freebsd.org> Date: Fri, 13 Jan 2012 15:30:39 GMT From: Barbara To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/164088: games/linux-enemyterritory-jaymod: update to 2.2.0 (supersedes ports/164006) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2012 15:40:09 -0000 >Number: 164088 >Category: ports >Synopsis: games/linux-enemyterritory-jaymod: update to 2.2.0 (supersedes ports/164006) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jan 13 15:40:08 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Barbara >Release: RELENG_9 >Organization: >Environment: FreeBSD satanasso.local.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan 8 00:49:01 CET 2012 root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386 >Description: Update to version of jaymod to 2.2.0. This version is compatible with the current version of omnibot in ports (games/linux-enemyterritory-omni-bot) >How-To-Repeat: >Fix: Patch attached with submission follows: --- Makefile.orig 2012-01-10 22:44:14.000000000 +0100 +++ Makefile 2012-01-13 02:35:55.000000000 +0100 @@ -6,13 +6,10 @@ # PORTNAME= jaymod -PORTVERSION= 2.1.7 -PORTREVISION= 2 +PORTVERSION= 2.2.0 CATEGORIES= games linux -MASTER_SITES= http://etmod.googlecode.com/files/ \ - http://www.zenenterprises.biz/bud/jaymod/ \ - http://bud.zenenterprises.biz/jaymod/ \ - http://et.lsdfunweb.fr/et/jaymod/ +MASTER_SITES= http://jaymod.clanfu.org/lib/downloads/ \ + http://www.zenenterprises.biz/bud/jaymod/ PKGNAMEPREFIX= linux-enemyterritory- MAINTAINER= barbara.xxx1975@libero.it @@ -33,7 +30,7 @@ .include .if defined(WITH_OMNIBOT) -RUN_DEPENDS+= et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot-0660 +RUN_DEPENDS+= et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot .endif do-build: @@ -49,11 +46,22 @@ .endfor ${MKDIR} ${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} *.cfg ${DATADIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} ${DATADIR} +.for f in jaymod.cfg server.cfg + ${CP} -p ${WRKSRC}/${f} ${DATADIR}/${f}.sample +.endfor ${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR} .if !defined(NOPORTDOCS) ${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 --- distinfo.orig 2011-12-03 12:41:30.000000000 +0100 +++ distinfo 2012-01-12 03:25:58.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (jaymod-2.1.7.tar.gz) = f9341236f351765826e00c5905ede9f485dbf2a57c556d2959b925a4a4aa8948 -SIZE (jaymod-2.1.7.tar.gz) = 11926903 +SHA256 (jaymod-2.2.0.tar.gz) = b6e7fa62762ec9dfe4cd890f2265ad5e380c9aa134615eb23a64a05d237122ff +SIZE (jaymod-2.2.0.tar.gz) = 11898043 --- pkg-plist.orig 2011-12-03 12:41:30.000000000 +0100 +++ pkg-plist 2012-01-13 01:49:25.000000000 +0100 @@ -1,6 +1,8 @@ bin/et-jaymod bin/etded-jaymod -%%DATADIR%%/jaymod.cfg +@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 %%DATADIR%%/%%CLIENT_PK3%% %%DATADIR%%/linux/convert_shrub %%DATADIR%%/linux/serverctl @@ -14,10 +16,12 @@ %%DATADIR%%/mapscripts/railgun.script %%DATADIR%%/mapscripts/railgun_lms.script %%DATADIR%%/qagame.mp.i386.so -%%DATADIR%%/server.cfg +@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 %%PORTDOCS%%%%DOCSDIR%%/README.txt %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/mapscripts @dirrm %%DATADIR%%/linux -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted: