- Update to version 0.6.2

- Remove stale master sites

Feature safe:	yes

3 files changed, 28 insertions, 12 deletions

diff --git a/games/warsow-data/Makefile b/games/warsow-data/Makefile
index 499d40918c11..a0ca167ef959 100644
--- a/games/warsow-data/Makefile
+++ b/games/warsow-data/Makefile
@@ -6,30 +6,27 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	0.6
+PORTVERSION=	0.6.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.zcdn.org/dl/ \
-		http://www.derchris.eu/warsow/ \
-		http://www.derchris.eu/warsow/:mappack \
 		http://static.warsow.net/release/:mappack \
-		http://rewq.de/scratch/wsw05/:mappack \
-		http://weseo.de/downloads/:mappack
+		http://rewq.de/scratch/wsw05/:mappack
 PKGNAMEPREFIX=	warsow-
-DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION}_unified
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTNAME=	${PKGNAMEPREFIX:S/-//}_0.61_unified
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PKGNAMEPREFIX:S/-//}_0.62_update${EXTRACT_SUFX}
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Warsow data files
 
 # Package size below is for default set of OPTIONS
-NO_PACKAGE=	Package will be 550MB, set FORCE_PACKAGE if you really want it
+NO_PACKAGE=	Package will be 574MB, set FORCE_PACKAGE if you really want it
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_ZIP=	yes
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX:S/-//}
 TXTDOCS=	bots_navigation.txt changelog.txt contact.txt \
@@ -52,8 +49,9 @@ PLIST_SUB+=	MAPPACK="@comment "
 do-install:
 	@${MKDIR} ${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} basewsw ${DATADIR}
+	cd ${WRKDIR} && ${COPYTREE_SHARE} basewsw ${DATADIR}
 .if defined(WITH_MAPPACK)
-	cd ${WRKSRC} && ${COPYTREE_SHARE} previews ${DATADIR}
+	cd ${WRKDIR} && ${COPYTREE_SHARE} previews ${DATADIR}
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/games/warsow-data/distinfo b/games/warsow-data/distinfo
index 5e4e7a5de173..f2e40c9190d0 100644
--- a/games/warsow-data/distinfo
+++ b/games/warsow-data/distinfo
@@ -1,4 +1,6 @@
-SHA256 (warsow/warsow_0.6_unified.zip) = 43f389e97df976f3dd13832922537bb3f1735f0335b51602c9db1bc4e7018428
-SIZE (warsow/warsow_0.6_unified.zip) = 450797008
+SHA256 (warsow/warsow_0.61_unified.zip) = fbabfd3e531ce5371fb5e8cd5113ed7606d5c89e6c52ec083bf178aa1bd9abac
+SIZE (warsow/warsow_0.61_unified.zip) = 473053649
+SHA256 (warsow/warsow_0.62_update.zip) = d16309bfc39929a47efe71d5dd28a790c16a7de07232f68fc9672407bebda278
+SIZE (warsow/warsow_0.62_update.zip) = 11553787
 SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
 SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
diff --git a/games/warsow-data/pkg-plist b/games/warsow-data/pkg-plist
index 9dc501fc85f7..e0db70be17e2 100644
--- a/games/warsow-data/pkg-plist
+++ b/games/warsow-data/pkg-plist
@@ -43,8 +43,16 @@
 %%DATADIR%%/basewsw/configs/timer/ya2/3x.cfg
 %%DATADIR%%/basewsw/configs/timer/ya2/4x.cfg
 %%DATADIR%%/basewsw/configs/timer/ya2/5x.cfg
+%%DATADIR%%/basewsw/profiles/gfx_contrast.cfg
+%%DATADIR%%/basewsw/profiles/gfx_high+.cfg
+%%DATADIR%%/basewsw/profiles/gfx_high.cfg
+%%DATADIR%%/basewsw/profiles/gfx_low.cfg
+%%DATADIR%%/basewsw/profiles/gfx_medium.cfg
 %%DATADIR%%/basewsw/data0_06.pk3
+%%DATADIR%%/basewsw/data0_06_001.pk3
 %%DATADIR%%/basewsw/data0_06pure.pk3
+%%DATADIR%%/basewsw/data1_06.pk3
+%%DATADIR%%/basewsw/data1_06pure.pk3
 %%DATADIR%%/basewsw/dedicated_autoexec.cfg
 %%DATADIR%%/basewsw/editortextures.pk3
 %%DATADIR%%/basewsw/map_wamphi1.pk3
@@ -55,9 +63,11 @@
 %%DATADIR%%/basewsw/map_wbomb4.pk3
 %%DATADIR%%/basewsw/map_wbomb5.pk3
 %%DATADIR%%/basewsw/map_wca1.pk3
+%%DATADIR%%/basewsw/map_wca1_001.pk3
 %%DATADIR%%/basewsw/map_wca2.pk3
 %%DATADIR%%/basewsw/map_wca3.pk3
 %%DATADIR%%/basewsw/map_wctf1.pk3
+%%DATADIR%%/basewsw/map_wctf1_001.pk3
 %%DATADIR%%/basewsw/map_wctf2.pk3
 %%DATADIR%%/basewsw/map_wctf3.pk3
 %%DATADIR%%/basewsw/map_wctf4.pk3
@@ -76,17 +86,22 @@
 %%DATADIR%%/basewsw/map_wdm15.pk3
 %%DATADIR%%/basewsw/map_wdm18.pk3
 %%DATADIR%%/basewsw/map_wdm19.pk3
+%%DATADIR%%/basewsw/map_wdm19_001.pk3
 %%DATADIR%%/basewsw/map_wdm2.pk3
 %%DATADIR%%/basewsw/map_wdm20.pk3
 %%DATADIR%%/basewsw/map_wdm3.pk3
 %%DATADIR%%/basewsw/map_wdm4.pk3
 %%DATADIR%%/basewsw/map_wdm5.pk3
+%%DATADIR%%/basewsw/map_wdm5_001.pk3
 %%DATADIR%%/basewsw/map_wdm6.pk3
+%%DATADIR%%/basewsw/map_wdm6_001.pk3
 %%DATADIR%%/basewsw/map_wdm7.pk3
 %%DATADIR%%/basewsw/map_wdm8.pk3
 %%DATADIR%%/basewsw/map_wdm9.pk3
 %%DATADIR%%/basewsw/models_nate.pk3
 %%DATADIR%%/basewsw/modules_06.pk3
+%%DATADIR%%/basewsw/modules_06_001.pk3
+%%DATADIR%%/basewsw/modules_06_002.pk3
 %%DATADIR%%/basewsw/tex_36.pk3
 %%DATADIR%%/basewsw/tex_baxandall.pk3
 %%DATADIR%%/basewsw/tex_billboard.pk3
@@ -172,6 +187,7 @@
 %%MAPPACK%%%%DATADIR%%/previews/cwS1.jpg
 %%MAPPACK%%%%DATADIR%%/previews/cwS2.jpg
 %%MAPPACK%%@dirrm %%DATADIR%%/previews
+@dirrm %%DATADIR%%/basewsw/profiles
 @dirrm %%DATADIR%%/basewsw/configs/timer/ya2
 @dirrm %%DATADIR%%/basewsw/configs/timer/ya
 @dirrm %%DATADIR%%/basewsw/configs/timer/ra