3 files changed, 39 insertions, 38 deletions

diff --git a/games/linux-enemyterritory-fortress/Makefile b/games/linux-enemyterritory-fortress/Makefile
index 648cf928d0da..df57fd082573 100644
--- a/games/linux-enemyterritory-fortress/Makefile
+++ b/games/linux-enemyterritory-fortress/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	enemyterritory-fortress
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	games linux
-MASTER_SITES=	${MASTER_SITE_GENTOO} \
-		http://camelot.snt.utwente.nl/etf/ \
-		ftp://ftp.planet-multiplayer.de/sites/rtcw-prison/et/mods/etf/ \
+MASTER_SITES=	http://camelot.snt.utwente.nl/etf/ \
 		http://ftp.games.skynet.be/pub/wolfenstein/etf/
-MASTER_SITE_SUBDIR=	distfiles		# for MASTER_SITE_GENTOO
 PKGNAMEPREFIX=	linux-
 DISTNAME=	etf_${PORTVERSION}-english
 EXTRACT_SUFX=	.run
@@ -25,7 +22,7 @@ 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 225MB, set FORCE_PACKAGE if you really want to build this package
+NO_PACKAGE=	Distfile is 251MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_WRKSUBDIR=	yes
 ETDIR=		${PREFIX}/lib/enemyterritory
@@ -33,23 +30,27 @@ STRIP=		# do not brand Linux binaries as FreeBSD on INSTALL_PROGRAM
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@cd ${WRKSRC} && ${TAIL} -c +8763 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf -
-.for f in etf12.tar.gz cfgnormal.tar.gz
-	@cd ${WRKSRC} && ${TAR} zxf ${f}
-.endfor
+	@(cd ${WRKSRC} && \
+		${TAIL} -c +8748 ${_DISTDIR}/${DISTFILES} | ${TAR} zxf - && \
+		${TAR} yxf etf.tar.bz2 && \
+		${TAR} zxf cfgnormal.tar.gz)
 
 do-build:
-	@${ECHO} '#!/bin/sh' > ${WRKSRC}/et-fortress
-	@${ECHO} 'exec ${PREFIX}/bin/et +set fs_game etf "$$@"' >> ${WRKSRC}/et-fortress
+.for f in et etded
+	@${ECHO} '#!/bin/sh' > ${WRKSRC}/${f}-fortress
+	@${ECHO} 'exec ${PREFIX}/bin/${f} +set fs_game etf "$$@"' >> ${WRKSRC}/${f}-fortress
+.endfor
 
 do-install:
-	${MKDIR} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/et-fortress ${PREFIX}/bin
+.for f in et etded
+	${INSTALL_SCRIPT} ${WRKSRC}/${f}-fortress ${PREFIX}/bin
+.endfor
 
 	${MKDIR} ${ETDIR}/etf
-.for f in autoexec.cfg cgame.mp.i386.so etconfig.cfg etf_pak0.pk3 \
-	etf_pak1.pk3 etf_pak2.pk3 mp_bin.pk3 qagame.mp.i386.so \
-	sample_server.cfg servercache.dat ui.mp.i386.so
+.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
 	${INSTALL_DATA} ${WRKSRC}/etf/${f} ${ETDIR}/etf
 .endfor
 .for f in cgame.mp.i386.so qagame.mp.i386.so ui.mp.i386.so
@@ -65,14 +66,14 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/etf.xpm ${DATADIR}
 
-.for d in advanced_server_configs sample_server
-	${MKDIR} ${DATADIR}/${d}
-	${INSTALL_DATA} ${WRKSRC}/etf/${d:S/_/\ /g}/* ${DATADIR}/${d}
+	${MKDIR} ${EXAMPLESDIR}/sample_server
+.for f in sample_server.cfg sample_srv/*
+	${INSTALL_DATA} ${WRKSRC}/etf/${f} ${EXAMPLESDIR}/sample_server
 .endfor
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for f in EULA README etf/12_changelog.txt
+.for f in LICENSE README etf/ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/games/linux-enemyterritory-fortress/distinfo b/games/linux-enemyterritory-fortress/distinfo
index fce2e39014ed..fc4bb625058c 100644
--- a/games/linux-enemyterritory-fortress/distinfo
+++ b/games/linux-enemyterritory-fortress/distinfo
@@ -1,2 +1,2 @@
-MD5 (etf_1.2-english.run) = a0efbbeae4e3a079ae438ce98470d1d8
-SIZE (etf_1.2-english.run) = 235943434
+MD5 (etf_1.3-english.run) = 67a327d265e3f4e7d1d4a25b43f3d53c
+SIZE (etf_1.3-english.run) = 263633097
diff --git a/games/linux-enemyterritory-fortress/pkg-plist b/games/linux-enemyterritory-fortress/pkg-plist
index 7c6195a42e12..51f62b4e89b9 100644
--- a/games/linux-enemyterritory-fortress/pkg-plist
+++ b/games/linux-enemyterritory-fortress/pkg-plist
@@ -1,4 +1,5 @@
 bin/et-fortress
+bin/etded-fortress
 lib/enemyterritory/etf/autoexec.cfg
 lib/enemyterritory/etf/cgame.mp.i386.so
 lib/enemyterritory/etf/classconfigs/agent.cfg
@@ -12,39 +13,38 @@ lib/enemyterritory/etf/classconfigs/recon.cfg
 lib/enemyterritory/etf/classconfigs/sniper.cfg
 lib/enemyterritory/etf/classconfigs/soldier.cfg
 lib/enemyterritory/etf/etconfig.cfg
+lib/enemyterritory/etf/etf_dissect.pk3
 lib/enemyterritory/etf/etf_pak0.pk3
 lib/enemyterritory/etf/etf_pak1.pk3
 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/preset_normal.cfg
 lib/enemyterritory/etf/qagame.mp.i386.so
-lib/enemyterritory/etf/sample_server.cfg
 lib/enemyterritory/etf/servercache.dat
-lib/enemyterritory/etf/ui.mp.i386.so
 lib/enemyterritory/etf/ui/usermenu/default_defense.cfg
 lib/enemyterritory/etf/ui/usermenu/default_general.cfg
 lib/enemyterritory/etf/ui/usermenu/default_main.cfg
 lib/enemyterritory/etf/ui/usermenu/default_offense.cfg
 lib/enemyterritory/etf/ui/usermenu/default_team.cfg
+lib/enemyterritory/etf/ui.mp.i386.so
 lib/enemyterritory/etf/video/etintro.roq
-%%PORTDOCS%%%%DOCSDIR%%/12_changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/EULA
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/advanced_server_configs/ACTF.zip
-%%DATADIR%%/advanced_server_configs/DUEL.zip
-%%DATADIR%%/advanced_server_configs/MIXED.zip
-%%DATADIR%%/advanced_server_configs/readme_samples.txt
 %%DATADIR%%/etf.xpm
-%%DATADIR%%/sample_server/ACTF.zip
-%%DATADIR%%/sample_server/DUEL.zip
-%%DATADIR%%/sample_server/MIXED.zip
-%%DATADIR%%/sample_server/readme_samples.txt
+%%EXAMPLESDIR%%/sample_server/ACTF.zip
+%%EXAMPLESDIR%%/sample_server/DUEL.zip
+%%EXAMPLESDIR%%/sample_server/MIXED.zip
+%%EXAMPLESDIR%%/sample_server/README
+%%EXAMPLESDIR%%/sample_server/sample_server.cfg
 @dirrm lib/enemyterritory/etf/classconfigs
 @dirrm lib/enemyterritory/etf/ui/usermenu
 @dirrm lib/enemyterritory/etf/ui
 @dirrm lib/enemyterritory/etf/video
 @dirrm lib/enemyterritory/etf
-@unexec rmdir %D/lib/enemyterritory 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/advanced_server_configs
-@dirrm %%DATADIR%%/sample_server
 @dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%/sample_server
+@dirrm %%EXAMPLESDIR%%