From maxlor@maxlor.mine.nu  Tue May 30 17:30:00 2006
Return-Path: <maxlor@maxlor.mine.nu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66B9D16A6A0;
	Tue, 30 May 2006 17:30:00 +0000 (UTC)
	(envelope-from maxlor@maxlor.mine.nu)
Received: from maxlor.mine.nu (c-213-160-32-54.customer.ggaweb.ch [213.160.32.54])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E4D243D77;
	Tue, 30 May 2006 17:29:55 +0000 (GMT)
	(envelope-from maxlor@maxlor.mine.nu)
Received: from localhost (unknown [127.0.0.1])
	by maxlor.mine.nu (Postfix) with ESMTP id 900532E07F;
	Tue, 30 May 2006 19:29:53 +0200 (CEST)
Received: from maxlor.mine.nu ([127.0.0.1])
	by localhost (atlantis.intranet [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id v1Zwt5V5Nx4L; Tue, 30 May 2006 19:29:53 +0200 (CEST)
Received: by maxlor.mine.nu (Postfix, from userid 1000)
	id 31F782E07E; Tue, 30 May 2006 19:29:53 +0200 (CEST)
Message-Id: <20060530172953.31F782E07E@maxlor.mine.nu>
Date: Tue, 30 May 2006 19:29:53 +0200 (CEST)
From: Benjamin Lutz <benlutz@datacomm.ch>
Reply-To: Benjamin Lutz <benlutz@datacomm.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Alejandro Pulver <alepulver@freebsd.org>
Subject: Update: games/linux-enemyterritory 2.60 -> 2.60b
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         98160
>Category:       ports
>Synopsis:       Update: games/linux-enemyterritory 2.60 -> 2.60b
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    alepulver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 30 17:30:16 GMT 2006
>Closed-Date:    Wed May 31 01:46:05 GMT 2006
>Last-Modified:  Wed May 31 01:46:05 GMT 2006
>Originator:     Benjamin Lutz
>Release:        FreeBSD 5.5-RELEASE i386
>Organization:
>Environment:
System: FreeBSD merlin 5.5-RELEASE FreeBSD 5.5-RELEASE #5: Sat May 27 02:02:02 CEST 2006 maxlor@merlin:/usr/obj/usr/src/sys/MERLIN i386
>Description:
- 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.


Dear Committer: When committing this port, please also update all the
ET mods (games/linux-enemyterritory-*)! You need to remove 
USE_X_PREFIX=yes from each one, and bump the PORTREVISION.

>How-To-Repeat:
>Fix:

--- patch begins here ---
diff -ruN linux-enemyterritory.orig/Makefile linux-enemyterritory/Makefile
--- linux-enemyterritory.orig/Makefile	Thu Apr  6 02:21:40 2006
+++ linux-enemyterritory/Makefile	Tue May 30 18:55:01 2006
@@ -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 @@
 
 .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 -ruN linux-enemyterritory.orig/distinfo linux-enemyterritory/distinfo
--- linux-enemyterritory.orig/distinfo	Thu Apr 14 18:26:34 2005
+++ linux-enemyterritory/distinfo	Mon May 29 21:05:21 2006
@@ -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 -ruN linux-enemyterritory.orig/pkg-plist linux-enemyterritory/pkg-plist
--- linux-enemyterritory.orig/pkg-plist	Thu Apr 14 18:26:34 2005
+++ linux-enemyterritory/pkg-plist	Tue May 30 18:59:37 2006
@@ -254,7 +254,6 @@
 %%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%%
--- patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->alepulver 
Responsible-Changed-By: alepulver 
Responsible-Changed-When: Tue May 30 17:45:31 UTC 2006 
Responsible-Changed-Why:  
I will take this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98160 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Wed May 31 01:45:38 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=98160 
>Unformatted:
