ports/164086: games/linux-enemyterritory-jaymod-217: install to different directories preventing conflict with future version

[Barbara]

>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 at 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: