Update to 1.4

3 files changed, 22 insertions, 18 deletions

diff --git a/games/linux-enemyterritory-fortress/Makefile b/games/linux-enemyterritory-fortress/Makefile
index df57fd082573..962c7a834928 100644
--- a/games/linux-enemyterritory-fortress/Makefile
+++ b/games/linux-enemyterritory-fortress/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	enemyterritory-fortress
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	games linux
-MASTER_SITES=	http://camelot.snt.utwente.nl/etf/ \
-		http://ftp.games.skynet.be/pub/wolfenstein/etf/
+MASTER_SITES=	http://ftp.games.skynet.be/pub/wolfenstein/etf/ \
+		http://www.playlinux.net/pub/files/native/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	etf_${PORTVERSION}-english
+DISTNAME=	etf_${PORTVERSION}-english-2
 EXTRACT_SUFX=	.run
 
 MAINTAINER=	jylefort@FreeBSD.org
@@ -22,17 +22,16 @@ RUN_DEPENDS=	et:${PORTSDIR}/games/linux-enemyterritory
 ONLY_FOR_ARCHS=	i386
 PREFIX?=	${X11BASE}	# USE_X_PREFIX would pull in USE_XLIB
 USE_LINUX=	yes
-NO_PACKAGE=	Distfile is 251MB, set FORCE_PACKAGE if you really want to build this package
+NO_PACKAGE=	Distfile is 249MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_WRKSUBDIR=	yes
 ETDIR=		${PREFIX}/lib/enemyterritory
-STRIP=		# do not brand Linux binaries as FreeBSD on INSTALL_PROGRAM
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@(cd ${WRKSRC} && \
-		${TAIL} -c +8748 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf - && \
-		${TAR} yxf etf.tar.bz2 && \
+		${TAIL} -c +8497 ${DISTDIR}/${DISTFILES} | ${TAR} zxf - && \
+		${TAR} zxf etf.tar.gz && \
 		${TAR} zxf cfgnormal.tar.gz)
 
 do-build:
@@ -47,18 +46,17 @@ do-install:
 .endfor
 
 	${MKDIR} ${ETDIR}/etf
-.for f in autoexec.cfg cgame.mp.i386.so etconfig.cfg etf_dissect.pk3 \
-	etf_pak0.pk3 etf_pak1.pk3 etf_pak2.pk3 etf_pak3.pk3 etf_server.cfg \
-	mp_bin.pk3 preset_normal.cfg qagame.mp.i386.so servercache.dat \
-	ui.mp.i386.so
+.for f in autoexec.cfg etconfig.cfg etf_dissect.pk3 etf_pak0.pk3 \
+	etf_pak1.pk3 etf_pak2.pk3 etf_pak3.pk3 etf_server.cfg \
+	mp_bin.pk3 preset_normal.cfg servercache.dat
 	${INSTALL_DATA} ${WRKSRC}/etf/${f} ${ETDIR}/etf
 .endfor
-.for f in cgame.mp.i386.so qagame.mp.i386.so ui.mp.i386.so
-	-${CHOWN} ${LIBOWN}:${LIBGRP} ${ETDIR}/etf/${f}
-	${CHMOD} ${LIBMODE} ${ETDIR}/etf/${f}
+.for f in cgame.mp.i386.so omnibot_etf.so qagame.mp.i386.so ui.mp.i386.so
+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${WRKSRC}/etf/${f} \
+		${ETDIR}/etf
 .endfor
 
-.for d in classconfigs ui/usermenu video
+.for d in classconfigs nav scripts ui/usermenu video
 	${MKDIR} ${ETDIR}/etf/${d}
 	${INSTALL_DATA} ${WRKSRC}/etf/${d}/* ${ETDIR}/etf/${d}
 .endfor
diff --git a/games/linux-enemyterritory-fortress/distinfo b/games/linux-enemyterritory-fortress/distinfo
index fc4bb625058c..6889ecc97c7e 100644
--- a/games/linux-enemyterritory-fortress/distinfo
+++ b/games/linux-enemyterritory-fortress/distinfo
@@ -1,2 +1,2 @@
-MD5 (etf_1.3-english.run) = 67a327d265e3f4e7d1d4a25b43f3d53c
-SIZE (etf_1.3-english.run) = 263633097
+MD5 (etf_1.4-english-2.run) = 4cafef1945a547eefae844966d45ac10
+SIZE (etf_1.4-english-2.run) = 262023758
diff --git a/games/linux-enemyterritory-fortress/pkg-plist b/games/linux-enemyterritory-fortress/pkg-plist
index 51f62b4e89b9..8434c41ca1b8 100644
--- a/games/linux-enemyterritory-fortress/pkg-plist
+++ b/games/linux-enemyterritory-fortress/pkg-plist
@@ -20,8 +20,12 @@ lib/enemyterritory/etf/etf_pak2.pk3
 lib/enemyterritory/etf/etf_pak3.pk3
 lib/enemyterritory/etf/etf_server.cfg
 lib/enemyterritory/etf/mp_bin.pk3
+lib/enemyterritory/etf/nav/etf_official_wps.zip
+lib/enemyterritory/etf/omnibot_etf.so
 lib/enemyterritory/etf/preset_normal.cfg
 lib/enemyterritory/etf/qagame.mp.i386.so
+lib/enemyterritory/etf/scripts/def_bot.gm
+lib/enemyterritory/etf/scripts/etf_autoexec.gm
 lib/enemyterritory/etf/servercache.dat
 lib/enemyterritory/etf/ui/usermenu/default_defense.cfg
 lib/enemyterritory/etf/ui/usermenu/default_general.cfg
@@ -40,6 +44,8 @@ lib/enemyterritory/etf/video/etintro.roq
 %%EXAMPLESDIR%%/sample_server/README
 %%EXAMPLESDIR%%/sample_server/sample_server.cfg
 @dirrm lib/enemyterritory/etf/classconfigs
+@dirrm lib/enemyterritory/etf/nav
+@dirrm lib/enemyterritory/etf/scripts
 @dirrm lib/enemyterritory/etf/ui/usermenu
 @dirrm lib/enemyterritory/etf/ui
 @dirrm lib/enemyterritory/etf/video