diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2012-01-24 21:26:40 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2012-01-24 21:26:40 +0000 |
| commit | 743a5b1728e5c3614590b1d98e6536bae5d081c5 (patch) | |
| tree | 717478e9ef3e05af27a0294893ce7232f54b58ca /games | |
| parent | 21cd1819a0cd36b6b719c0eb283deb3ee14592cb (diff) | |
- Add version to package name and installed binaries to avoid conflicts
with games/linux-enemyterritory-jaymod [1]
- Bump PORTREVISION [1]
- Connect to the build
PR: ports/164086
Submitted by: Barbara
Notes
Notes:
svn path=/head/; revision=289753
Diffstat (limited to 'games')
| -rw-r--r-- | games/Makefile | 1 | ||||
| -rw-r--r-- | games/linux-enemyterritory-jaymod-21/Makefile | 21 | ||||
| -rw-r--r-- | games/linux-enemyterritory-jaymod-21/pkg-plist | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/games/Makefile b/games/Makefile index 63f46207d5e7..05a93c05cd0e 100644 --- a/games/Makefile +++ b/games/Makefile @@ -462,6 +462,7 @@ SUBDIR += linux-enemyterritory-etpub SUBDIR += linux-enemyterritory-fortress SUBDIR += linux-enemyterritory-jaymod + SUBDIR += linux-enemyterritory-jaymod-21 SUBDIR += linux-enemyterritory-omni-bot SUBDIR += linux-enemyterritory-omni-bot-0660 SUBDIR += linux-enemyterritory-shrub diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile index 5a3b6e2f9c65..4f8f116fe0c6 100644 --- a/games/linux-enemyterritory-jaymod-21/Makefile +++ b/games/linux-enemyterritory-jaymod-21/Makefile @@ -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 @@ COMMENT= Jaymod - An Enemy Territory Modification 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} diff --git a/games/linux-enemyterritory-jaymod-21/pkg-plist b/games/linux-enemyterritory-jaymod-21/pkg-plist index 24da152cd408..6cafea9af8d2 100644 --- a/games/linux-enemyterritory-jaymod-21/pkg-plist +++ b/games/linux-enemyterritory-jaymod-21/pkg-plist @@ -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 |