Date: Fri, 13 Jan 2012 15:25:14 GMT From: Barbara <barbara.xxx1975@libero.it> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/164085: games/linux-enemyterritory-omni-bot-0660: install to different directories removing conflict with current version Message-ID: <201201131525.q0DFPEAF048603@red.freebsd.org> Resent-Message-ID: <201201131530.q0DFUF4N010758@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164085
>Category: ports
>Synopsis: games/linux-enemyterritory-omni-bot-0660: install to different directories removing conflict with current 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:14 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 add the "-0660" suffix to directories and to scripts in ${LOCALBASE}/bin.
After that it's possible to have both linux-enemyterritory-omni-bot* ports installed, so the CONFLICTS line is removed.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2012-01-10 22:44:14.000000000 +0100
+++ Makefile 2012-01-13 03:02:17.000000000 +0100
@@ -7,6 +7,7 @@
PORTNAME= omni-bot
PORTVERSION= 0.660
+PORTREVISION= 1
CATEGORIES= games linux
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alepulver
@@ -18,15 +19,16 @@
RUN_DEPENDS= et:${PORTSDIR}/games/linux-enemyterritory
-CONFLICTS= linux-enemyterritory-omni-bot-0.[7-9]*
-NO_LATEST_LINK= yes
+VERSTR= ${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/}
+PKGNAMESUFFIX= -${VERSTR}
+PLIST_SUB= VERSTR="${VERSTR}"
USE_ZIP= yes
USE_LINUX= yes
NO_WRKSUBDIR= yes
-DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME}
-DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME}
+DATADIR= ${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
+DOCSDIR= ${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR}
do-build:
.for f in et etded
@@ -37,7 +39,8 @@
do-install:
.for f in et etded
- ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
+ ${MV} ${WRKSRC}/${f}-${PORTNAME} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME}-${VERSTR} ${PREFIX}/bin
.endfor
${MKDIR} ${DATADIR}
${INSTALL_PROGRAM} ${WRKSRC}/omni-bot/omnibot_et.so ${DATADIR}
--- pkg-plist.orig 2009-03-24 22:03:29.000000000 +0100
+++ pkg-plist 2012-01-12 05:05:26.000000000 +0100
@@ -1,5 +1,5 @@
-bin/et-omni-bot
-bin/etded-omni-bot
+bin/et-omni-bot-%%VERSTR%%
+bin/etded-omni-bot-%%VERSTR%%
%%DATADIR%%/et/nav/et_custom.zip
%%DATADIR%%/et/nav/et_official.zip
%%DATADIR%%/et/scripts/ammo_goal.gm
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201131525.q0DFPEAF048603>