From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jan 13 15:30:15 2012
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
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 D91221065670
for <freebsd-ports-bugs@hub.freebsd.org>;
Fri, 13 Jan 2012 15:30:15 +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 B09638FC29
for <freebsd-ports-bugs@hub.freebsd.org>;
Fri, 13 Jan 2012 15:30:15 +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 q0DFUFHf010794
for <freebsd-ports-bugs@freefall.freebsd.org>;
Fri, 13 Jan 2012 15:30:15 GMT
(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0DFUFBP010789;
Fri, 13 Jan 2012 15:30:15 GMT (envelope-from gnats)
Resent-Date: Fri, 13 Jan 2012 15:30:15 GMT
Resent-Message-Id: <201201131530.q0DFUFBP010789@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 <barbara.xxx1975@libero.it>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 6CE6C106566C
for <freebsd-gnats-submit@FreeBSD.org>;
Fri, 13 Jan 2012 15:29:03 +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 3C3B58FC0C
for <freebsd-gnats-submit@FreeBSD.org>;
Fri, 13 Jan 2012 15:29:03 +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 q0DFT3hL049172
for <freebsd-gnats-submit@FreeBSD.org>; Fri, 13 Jan 2012 15:29:03 GMT
(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
by red.freebsd.org (8.14.4/8.14.4/Submit) id q0DFT38l049170;
Fri, 13 Jan 2012 15:29:03 GMT (envelope-from nobody)
Message-Id: <201201131529.q0DFT38l049170@red.freebsd.org>
Date: Fri, 13 Jan 2012 15:29:03 GMT
From: Barbara <barbara.xxx1975@libero.it>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc:
Subject: ports/164086: games/linux-enemyterritory-jaymod-217: install to
different directories preventing conflict with future version
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jan 2012 15:30:16 -0000
>Number: 164086
>Category: ports
>Synopsis: games/linux-enemyterritory-jaymod-217: install to different directories preventing conflict with future version
>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:30:15 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:
The patch adds the "-217" suffix to directories and to scripts in ${LOCALBASE}/bin to prevent CONFLICTS with future port versions.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2012-01-10 22:44:14.000000000 +0100
+++ Makefile 2012-01-13 03:07:47.000000000 +0100
@@ -7,7 +7,7 @@
PORTNAME= jaymod
PORTVERSION= 2.1.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games linux
MASTER_SITES= http://etmod.googlecode.com/files/ \
http://www.zenenterprises.biz/bud/jaymod/ \
@@ -20,32 +20,37 @@
RUN_DEPENDS= et:${PORTSDIR}/games/linux-enemyterritory
+VERSTR= ${PORTVERSION:C/([0-9])\.([0-9])\.([0-9]+)/\1\2\3/}
+PKGNAMESUFFIX= -${VERSTR}
+PLIST_SUB= VERSTR="${VERSTR}"
+
USE_LINUX= yes
OPTIONS= OMNIBOT "Install Omni-Bot for bot support" off
-DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME}
-DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME}
+DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
+DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR}
CLIENT_PK3= ${PORTNAME}-${PORTVERSION}.pk3
-PLIST_SUB= CLIENT_PK3="${CLIENT_PK3}"
+PLIST_SUB+= CLIENT_PK3="${CLIENT_PK3}"
.include <bsd.port.pre.mk>
.if defined(WITH_OMNIBOT)
-RUN_DEPENDS+= et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot-0660
+OB_VERSTR= 0660
+RUN_DEPENDS+= et-omni-bot-${OB_VERSTR}:${PORTSDIR}/games/linux-enemyterritory-omni-bot-${OB_VERSTR}
.endif
do-build:
.for f in et etded
@(${ECHO_CMD} "#!/bin/sh"; \
- ${ECHO_CMD} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/../omni-bot" "$$@"') > \
- ${WRKSRC}/${f}-${PORTNAME}
+ ${ECHO_CMD} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME}-${VERSTR} +set omnibot_path "${DATADIR}/../omni-bot-${OB_VERSTR}" "$$@"') > \
+ ${WRKSRC}/${f}-${PORTNAME}-${VERSTR}
.endfor
do-install:
.for f in et etded
- ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${PREFIX}/bin
.endfor
${MKDIR} ${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR}
--- pkg-plist.orig 2011-12-03 12:41:30.000000000 +0100
+++ pkg-plist 2012-01-12 05:39:42.000000000 +0100
@@ -1,5 +1,5 @@
-bin/et-jaymod
-bin/etded-jaymod
+bin/et-jaymod-%%VERSTR%%
+bin/etded-jaymod-%%VERSTR%%
%%DATADIR%%/jaymod.cfg
%%DATADIR%%/%%CLIENT_PK3%%
%%DATADIR%%/linux/convert_shrub
>Release-Note:
>Audit-Trail:
>Unformatted: