[Midnightbsd-cvs] mports [20465] trunk/games/linux-enemyterritory-jaymod: update jmod to 2.1.7

[laffer1 at midnightbsd.org]

Revision: 20465
          http://svnweb.midnightbsd.org/mports/?rev=20465
Author:   laffer1
Date:     2015-10-04 12:08:59 -0400 (Sun, 04 Oct 2015)
Log Message:
-----------
update jmod to 2.1.7

Modified Paths:
--------------
    trunk/games/linux-enemyterritory-jaymod/Makefile
    trunk/games/linux-enemyterritory-jaymod/distinfo
    trunk/games/linux-enemyterritory-jaymod/pkg-plist

Modified: trunk/games/linux-enemyterritory-jaymod/Makefile
===================================================================
--- trunk/games/linux-enemyterritory-jaymod/Makefile	2015-10-04 16:06:39 UTC (rev 20464)
+++ trunk/games/linux-enemyterritory-jaymod/Makefile	2015-10-04 16:08:59 UTC (rev 20465)
@@ -1,30 +1,23 @@
-# New ports collection makefile for:	jaymod
-# Date created:				7 May 2006
-# Whom:					alepulver
-#
 # $MidnightBSD$
 # $FreeBSD: ports/games/linux-enemyterritory-jaymod/Makefile,v 1.12 2008/02/19 13:20:30 alepulver Exp $
-#
 
 PORTNAME=	jaymod
-PORTVERSION=	2.1.7
+PORTVERSION=	2.2.0
 CATEGORIES=	games linux
 MASTER_SITES=	http://jaymod.clanfu.org/lib/downloads/ \
-		http://budjb.com/lib/downloads/ \
-		http://www.zenenterprises.org/bud/jaymod/ \
-		http://www.spherens.com/zen/et/distro/
+		http://www.zenenterprises.biz/bud/jaymod/
 PKGNAMEPREFIX=	linux-enemyterritory-
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Jaymod - An Enemy Territory Modification
-LICENSE=	restricted
+LICENSE=	other
 
-BUILD_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 USE_LINUX=	yes
 
-OPTIONS=	OMNIBOT "Install Omni-Bot for bot support" off
+OPTIONS_DEFINE=	DOCS OMNIBOT
+OMNIBOT_DESC=	Install Omni-Bot for bot support
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}
@@ -32,11 +25,9 @@
 CLIENT_PK3=	${PORTNAME}-${PORTVERSION}.pk3
 PLIST_SUB=	CLIENT_PK3="${CLIENT_PK3}"
 
-.include <bsd.port.pre.mk>
+OMNIBOT_RUN_DEPENDS=	et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot
 
-.if defined(WITH_OMNIBOT)
-RUN_DEPENDS+=	et-omni-bot:${PORTSDIR}/games/linux-enemyterritory-omni-bot
-.endif
+.include <bsd.mport.options.mk>
 
 do-build:
 .for f in et etded
@@ -47,15 +38,18 @@
 
 do-install:
 .for f in et etded
-	${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/${f}-${PORTNAME} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} *.cfg ${DATADIR}
-	${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README.txt doc/jaymod.pdf ${DOCSDIR}
-.endif
+	@${MKDIR} ${DATADIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/qagame.mp.i386.so ${DATADIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${CLIENT_PK3} ${DATADIR}
+.for f in jaymod.cfg server.cfg
+	@${CP} -p ${WRKSRC}/${f} ${DATADIR}/${f}.sample
+.endfor
+	@${CP} -r ${WRKSRC}/linux ${WRKSRC}/mapscripts ${DATADIR}
+	@${MKDIR} ${DOCSDIR}
+.for f in README.txt doc/jaymod.pdf
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR}
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/games/linux-enemyterritory-jaymod/distinfo
===================================================================
--- trunk/games/linux-enemyterritory-jaymod/distinfo	2015-10-04 16:06:39 UTC (rev 20464)
+++ trunk/games/linux-enemyterritory-jaymod/distinfo	2015-10-04 16:08:59 UTC (rev 20465)
@@ -1,3 +1,2 @@
-SHA256 (jaymod-2.1.7.tar.gz) = f9341236f351765826e00c5905ede9f485dbf2a57c556d2959b925a4a4aa8948
-RMD160 (jaymod-2.1.7.tar.gz) = 8e61064106dbd070bb967b947fb3cea0e6fb176c
-SIZE (jaymod-2.1.7.tar.gz) = 11926903
+SHA256 (jaymod-2.2.0.tar.gz) = b6e7fa62762ec9dfe4cd890f2265ad5e380c9aa134615eb23a64a05d237122ff
+SIZE (jaymod-2.2.0.tar.gz) = 11898043

Modified: trunk/games/linux-enemyterritory-jaymod/pkg-plist
===================================================================
--- trunk/games/linux-enemyterritory-jaymod/pkg-plist	2015-10-04 16:06:39 UTC (rev 20464)
+++ trunk/games/linux-enemyterritory-jaymod/pkg-plist	2015-10-04 16:08:59 UTC (rev 20465)
@@ -1,6 +1,8 @@
 bin/et-jaymod
 bin/etded-jaymod
-%%DATADIR%%/jaymod.cfg
+ at unexec if cmp %D/lib/enemyterritory/jaymod/jaymod.cfg %D/lib/enemyterritory/jaymod/jaymod.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod/jaymod.cfg; fi
+%%DATADIR%%/jaymod.cfg.sample
+ at exec if [ ! -f %D/lib/enemyterritory/jaymod/jaymod.cfg ] ; then cp -p %D/%F %B/jaymod.cfg; fi
 %%DATADIR%%/%%CLIENT_PK3%%
 %%DATADIR%%/linux/convert_shrub
 %%DATADIR%%/linux/serverctl
@@ -14,10 +16,12 @@
 %%DATADIR%%/mapscripts/railgun.script
 %%DATADIR%%/mapscripts/railgun_lms.script
 %%DATADIR%%/qagame.mp.i386.so
-%%DATADIR%%/server.cfg
+ at unexec if cmp %D/lib/enemyterritory/jaymod/server.cfg %D/lib/enemyterritory/jaymod/server.cfg.sample; then rm -f %D/lib/enemyterritory/jaymod/server.cfg; fi
+%%DATADIR%%/server.cfg.sample
+ at exec if [ ! -f %D/lib/enemyterritory/jaymod/server.cfg ] ; then cp -p %D/%F %B/server.cfg; fi
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/jaymod.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/mapscripts
 @dirrm %%DATADIR%%/linux
- at dirrm %%DATADIR%%
+ at dirrmtry %%DATADIR%%