- Update Enemy Territory from 2.60 to 2.60b. This fixes two security

  holes.
- Switch from X11BASE to LOCALBASE.
- Switch to $MASTER_SITE_IDSOFTWARE as only download source. This
  should hopefully provide a more reliable download mirror list.
- Replace RESTRICTED with NO_CDROM, since the license actually allows
  packages to be built and offered for download.
- Switch mods from X11BASE to LOCALBASE (linux-enemyterritory-*) and bump
  their PORTREVISION.

PR:		ports/98160
Submitted by:	Benjamin Lutz <benlutz@datacomm.ch> (maintainer)

12 files changed, 26 insertions, 28 deletions

diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index 47c1a6d42c17..3e015dc1614c 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etpro
 PORTVERSION=	3.2.5
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://bani.anime.net/etpro/ \
 		http://dl.vpclan.de/etpro/ \
@@ -24,7 +25,6 @@ COMMENT=	ET Pro - The Enemy Territory Competition Mod
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-enemyterritory-etpub/Makefile b/games/linux-enemyterritory-etpub/Makefile
index a5619c6d8720..8f4c9ffce52d 100644
--- a/games/linux-enemyterritory-etpub/Makefile
+++ b/games/linux-enemyterritory-etpub/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etpub
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://et.tjw.org/etpub/dist/
 PKGNAMEPREFIX=	linux-enemyterritory-
@@ -20,7 +21,6 @@ COMMENT=	ET Pub - An Enemy Territory Modification
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 
diff --git a/games/linux-enemyterritory-fortress/Makefile b/games/linux-enemyterritory-fortress/Makefile
index 9d067e8ca795..cc71e2c0ae2d 100644
--- a/games/linux-enemyterritory-fortress/Makefile
+++ b/games/linux-enemyterritory-fortress/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enemyterritory-fortress
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.sonnensturm.net/download/
 PKGNAMEPREFIX=	linux-
@@ -20,7 +21,6 @@ RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 NO_PACKAGE=	Distfile is 263MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index 6ef946d24627..261e502c70a4 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jaymod
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://jaymod.clanfu.org/lib/downloads/ \
 		http://budjb.com/lib/downloads/ \
@@ -20,7 +21,6 @@ COMMENT=	Jaymod - An Enemy Territory Modification
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-jaymod/Makefile b/games/linux-enemyterritory-jaymod/Makefile
index 6ef946d24627..261e502c70a4 100644
--- a/games/linux-enemyterritory-jaymod/Makefile
+++ b/games/linux-enemyterritory-jaymod/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jaymod
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://jaymod.clanfu.org/lib/downloads/ \
 		http://budjb.com/lib/downloads/ \
@@ -20,7 +21,6 @@ COMMENT=	Jaymod - An Enemy Territory Modification
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 7eb8691ec765..8b9c92f204d1 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	omni-bot
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-enemyterritory-
@@ -17,7 +18,6 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index 7eb8691ec765..8b9c92f204d1 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	omni-bot
 PORTVERSION=	0.51
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-enemyterritory-
@@ -17,7 +18,6 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 3ee535d83753..fe46f264d5a6 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	shrub
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.etstats.com/shrubet/downloads/
 PKGNAMEPREFIX=	linux-enemyterritory-
@@ -18,7 +19,6 @@ COMMENT=	Shrub - An Enemy Territory Modification
 RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index ae5ce67d27a9..cac5125fff4a 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enemyterritory-tce
 PORTVERSION=	0.48
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games linux
 MASTER_SITES=	http://ftp.games.skynet.be/pub/www.filesnetwork.com/Wolfenstein_Enemy_Territory/Mods/Total_Conversions/:full,update \
 		http://darkstar.ist.utl.pt/pub/games/:full,update \
@@ -27,7 +27,6 @@ RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
 NO_PACKAGE=	Distfiles are 135MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/enemyterritory
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index 268fbe5fa8a3..81689c27d86d 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -6,42 +6,37 @@
 #
 
 PORTNAME=	enemyterritory
-PORTVERSION=	2.60
-PORTREVISION=	1
+PORTVERSION=	2.60b
 CATEGORIES=	games linux
-MASTER_SITES=	http://mirrors.xmission.com/idsoftware/et/linux/ \
-		http://3dgamers.intelenet.net/pub/3dgamers/games/wolfensteinet/ \
-		http://ftp7.3dgamers.com/pub/3dgamers/games/wolfensteinet/ \
-		http://ftp4.3dgamers.com/pub/3dgamers/games/wolfensteinet/ \
-		http://3dgamers.gameservers.net/pub/3dgamers/games/wolfensteinet/ \
-		http://downloads-3dg.planetmirror.com/pub/3dgamers/games/wolfensteinet/ \
-		http://3dgamers.iinet.net.au/pub/3dgamers/games/wolfensteinet/ \
-		${MASTER_SITE_IDSOFTWARE:S|$|et/linux/|}
+MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|et/linux/:full|} \
+		${MASTER_SITE_IDSOFTWARE:S|$|et/:patch|}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	et-linux-2.60.x86
-EXTRACT_SUFX=	.run
+DISTNAME=	et-linux-2.60b.x86
+DISTFILES=	et-linux-2.60.x86.run:full ET-2.60b.zip:patch
 
 MAINTAINER=	benlutz@datacomm.ch
 COMMENT=	Wolfenstein: Enemy Territory (Linux version)
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
-NO_PACKAGE=	Package will be 257MB, set FORCE_PACKAGE if you really want to build it
-RESTRICTED=	Redistribution is limited, see license
-NO_WRKSUBDIR=	yes
+NO_CDROM=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/${PORTNAME}
 INSTALL_DIR=	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+PATCH_260B_DIR=	Enemy Territory 2.60b
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@cd ${WRKSRC} && \
-		${TAIL} +374 ${_DISTDIR}/${DISTFILES} | ${TAR} xfz -
+		${TAIL} +374 ${_DISTDIR}/et-linux-2.60.x86.run | ${TAR} xfz -
+	@cd ${WRKSRC} && \
+		${TAR} xf ${_DISTDIR}/ET-2.60b.zip
 
 post-patch:
 .for FILE in et etded
 	@${SED} -e 's|@ETDIR@|${ETDIR}|' ${FILESDIR}/${FILE}.in > ${WRKSRC}/${FILE}
 .endfor
+	@${MV} "${WRKSRC}/${PATCH_260B_DIR}/linux/et.x86" ${WRKSRC}/bin/Linux/x86
+	@${MV} "${WRKSRC}/${PATCH_260B_DIR}/linux/etded.x86" ${WRKSRC}/bin/Linux/x86
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/pb/pbweb.x86
@@ -58,6 +53,7 @@ do-install:
 
 .if !defined(NOPORTDOCS)
 	${INSTALL_DIR} ${DOCSDIR}
+	${RMDIR} ${WRKSRC}/Docs/Help/_private
 	${CP} -R ${WRKSRC}/Docs/* ${DOCSDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}/*
 	${FIND} ${DOCSDIR}/* -type f -print0 | \
diff --git a/games/linux-enemyterritory/distinfo b/games/linux-enemyterritory/distinfo
index 3f1c1be5c0a0..ee5b6f9d2ca5 100644
--- a/games/linux-enemyterritory/distinfo
+++ b/games/linux-enemyterritory/distinfo
@@ -1,2 +1,6 @@
 MD5 (et-linux-2.60.x86.run) = 2d2373f29f02e18d365d7f1860eee435
+SHA256 (et-linux-2.60.x86.run) = 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36
 SIZE (et-linux-2.60.x86.run) = 270965248
+MD5 (ET-2.60b.zip) = fb83b8732fc7373c277180b663debf57
+SHA256 (ET-2.60b.zip) = 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8
+SIZE (ET-2.60b.zip) = 4143401
diff --git a/games/linux-enemyterritory/pkg-plist b/games/linux-enemyterritory/pkg-plist
index 2f154ec8dabe..f80602a6a041 100644
--- a/games/linux-enemyterritory/pkg-plist
+++ b/games/linux-enemyterritory/pkg-plist
@@ -254,7 +254,6 @@ lib/enemyterritory/pb/pbweb.x86
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Help/Tech Help/vendor
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Help/Tech Help
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Help/_borders
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Help/_private
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Help/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Help
 %%PORTDOCS%%@dirrm %%DOCSDIR%%