[Midnightbsd-cvs] mports: games/linux-enemyterritory-jaymod: Update to 2.x

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 2.x

Modified Files:
--------------
    mports/games/linux-enemyterritory-jaymod:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/games/linux-enemyterritory-jaymod/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L games/linux-enemyterritory-jaymod/pkg-plist -L games/linux-enemyterritory-jaymod/pkg-plist -u -r1.1 -r1.2
--- games/linux-enemyterritory-jaymod/pkg-plist
+++ games/linux-enemyterritory-jaymod/pkg-plist
@@ -1,9 +1,23 @@
 bin/et-jaymod
 bin/etded-jaymod
-%%PORTDOCS%%%%DOCSDIR%%/jaymod-%%VERSION%%.pdf
-%%DATADIR%%/jaymod-%%VERSION%%.pk3
-%%DATADIR%%/jaymod.cfg-sample
+%%DATADIR%%/jaymod.cfg
+%%DATADIR%%/%%CLIENT_PK3%%
+%%DATADIR%%/linux/convert_shrub
+%%DATADIR%%/linux/serverctl
+%%DATADIR%%/mapscripts/battery.script
+%%DATADIR%%/mapscripts/fueldump.script
+%%DATADIR%%/mapscripts/fueldump_lms.script
+%%DATADIR%%/mapscripts/goldrush.script
+%%DATADIR%%/mapscripts/oasis.script
+%%DATADIR%%/mapscripts/oasis_lms.script
+%%DATADIR%%/mapscripts/radar.script
+%%DATADIR%%/mapscripts/railgun.script
+%%DATADIR%%/mapscripts/railgun_lms.script
 %%DATADIR%%/qagame.mp.i386.so
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
- at dirrm %%DATADIR%%
+%%DATADIR%%/server.cfg
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%/mapscripts
+ at dirrm %%DATADIR%%/linux
+ at dirrm %%DATADIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/games/linux-enemyterritory-jaymod/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L games/linux-enemyterritory-jaymod/Makefile -L games/linux-enemyterritory-jaymod/Makefile -u -r1.1 -r1.2
--- games/linux-enemyterritory-jaymod/Makefile
+++ games/linux-enemyterritory-jaymod/Makefile
@@ -3,12 +3,11 @@
 # Whom:					alepulver
 #
 # $MidnightBSD$
-# $FreeBSD: ports/games/linux-enemyterritory-jaymod/Makefile,v 1.2 2006/05/31 01:43:26 alepulver Exp $
+# $FreeBSD: ports/games/linux-enemyterritory-jaymod/Makefile,v 1.12 2008/02/19 13:20:30 alepulver Exp $
 #
 
 PORTNAME=	jaymod
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.7
 CATEGORIES=	games linux
 MASTER_SITES=	http://jaymod.clanfu.org/lib/downloads/ \
 		http://budjb.com/lib/downloads/ \
@@ -18,22 +17,30 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Jaymod - An Enemy Territory Modification
+LICENSE=	restricted
 
-RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
+DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
-ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-NO_WRKSUBDIR=	yes
+
+OPTIONS=	OMNIBOT "Install Omni-Bot for bot support" off
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
 
-PLIST_SUB=	VERSION="${PORTVERSION}"
+CLIENT_PK3=	${PORTNAME}-${PORTVERSION}.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
+.endif
 
 do-build:
 .for f in et etded
-	@(${ECHO} "#!/bin/sh"; \
-	${ECHO} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} "$$@"') > \
+	@(${ECHO_CMD} "#!/bin/sh"; \
+	${ECHO_CMD} 'exec ${PREFIX}/bin/${f} +set fs_game ${PORTNAME} +set omnibot_path "${DATADIR}/../omni-bot" "$$@"') > \
 		${WRKSRC}/${f}-${PORTNAME}
 .endfor
 
@@ -43,14 +50,11 @@
 .endfor
 	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR}
-.for f in jaymod-${PORTVERSION}.pk3 jaymod.cfg-sample
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} *.cfg ${DATADIR}
+	${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.   for f in jaymod-${PORTVERSION}.pdf readme.txt
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.   endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} README.txt doc/jaymod.pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/games/linux-enemyterritory-jaymod/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L games/linux-enemyterritory-jaymod/distinfo -L games/linux-enemyterritory-jaymod/distinfo -u -r1.1 -r1.2
--- games/linux-enemyterritory-jaymod/distinfo
+++ games/linux-enemyterritory-jaymod/distinfo
@@ -1,3 +1,3 @@
-MD5 (jaymod-1.4.tar.gz) = 86e69f4985c5c10be9ee61b15abb9292
-SHA256 (jaymod-1.4.tar.gz) = 41b1f9fa51724c67867c2c2805441277fc4f35fe10253157c718a0619570ba77
-SIZE (jaymod-1.4.tar.gz) = 4189340
+MD5 (jaymod-2.1.7.tar.gz) = 422eec802d4bded0b89908ca38c00434
+SHA256 (jaymod-2.1.7.tar.gz) = f9341236f351765826e00c5905ede9f485dbf2a57c556d2959b925a4a4aa8948
+SIZE (jaymod-2.1.7.tar.gz) = 11926903