3 files changed, 28 insertions, 56 deletions

diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index bf0df1d4a0f1..c2a79a96ccba 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.24
+PORTVERSION=	1.25
 CATEGORIES=	games
-MASTER_SITES=	SF
+MASTER_SITES=	SF:sf \
+		http://doomtextures.freelanzer.com/:dt
 PKGNAMESUFFIX=	-extras
 DISTFILES=	#
 
@@ -35,7 +36,7 @@ IGNORE=		needs at least one option selected
 
 .if defined(WITH_MODELS)
 . for f in doom heretic hexen strife
-DISTFILES+=	vmodels-${f}-1.4.1${EXTRACT_SUFX}
+DISTFILES+=	vmodels-${f}-1.4.2${EXTRACT_SUFX}:sf
 . endfor
 PLIST_SUB+=	MODELS=""
 .else
@@ -43,11 +44,9 @@ PLIST_SUB+=	MODELS="@comment "
 .endif
 
 .if defined(WITH_TEXTURES)
-. for f in doom doom1 doom2
-DISTFILES+=	vtextures-${f}-1.1${EXTRACT_SUFX}
-. endfor
+DISTFILES+=	vv-dhtp-20071114.pk3:dt
 . for f in heretic hexen strife
-DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}
+DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}:sf
 . endfor
 PLIST_SUB+=	TEXTURES=""
 .else
@@ -56,13 +55,16 @@ PLIST_SUB+=	TEXTURES="@comment "
 
 .if defined(WITH_SOUNDTRACKS)
 . for f in doom1 doom2 tnt plutonia heretic hexen
-DISTFILES+=	vmusic-${f}-1.0${EXTRACT_SUFX}
+DISTFILES+=	vmusic-${f}-1.0${EXTRACT_SUFX}:sf
 . endfor
 PLIST_SUB+=	SOUNDTRACKS=""
 .else
 PLIST_SUB+=	SOUNDTRACKS="@comment "
 .endif
 
+post-extract:
+	@${FIND} ${WRKSRC} -type f -name "*.txt" -delete
+
 do-install:
 	cd ${WRKSRC} && ${FIND} basev -type f \
 		-exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
diff --git a/games/vavoom-extras/distinfo b/games/vavoom-extras/distinfo
index 1210c7144935..c1004bbcfc92 100644
--- a/games/vavoom-extras/distinfo
+++ b/games/vavoom-extras/distinfo
@@ -1,24 +1,18 @@
-MD5 (vmodels-doom-1.4.1.zip) = 1d3f69249a85ac6d938b2ac241a0d6fe
-SHA256 (vmodels-doom-1.4.1.zip) = 8995b1df3c914ec8b856b9d1aff782069beb3098a29661ee248120e991f3677c
-SIZE (vmodels-doom-1.4.1.zip) = 16222865
-MD5 (vmodels-heretic-1.4.1.zip) = e164235771cf9c07312a3fba84335584
-SHA256 (vmodels-heretic-1.4.1.zip) = 6ce0dccfbdc52e422b17d1bd92feb1ffe3d1c37bbf96d173ebcdaad07f636e9a
-SIZE (vmodels-heretic-1.4.1.zip) = 2464963
-MD5 (vmodels-hexen-1.4.1.zip) = 4485471c00e6e34b29cf584ccc97f8bf
-SHA256 (vmodels-hexen-1.4.1.zip) = 799cf50832060c4d4ffb2cf15d6efa47356d86b1cac34aa4ccd1a810cbe1820f
-SIZE (vmodels-hexen-1.4.1.zip) = 1683472
-MD5 (vmodels-strife-1.4.1.zip) = f4101ad5c5364a1d0a11c0c308af63a5
-SHA256 (vmodels-strife-1.4.1.zip) = 4cbf3b7521499302db3df4af5b4e10f7e74b9d696c01368bcca500b96c5d0889
-SIZE (vmodels-strife-1.4.1.zip) = 91158
-MD5 (vtextures-doom-1.1.zip) = ae2d1aa008e7699529e0ff22ec8747b9
-SHA256 (vtextures-doom-1.1.zip) = c12c3a7f678a6b91fa7b5189c7a4254ddc077e2e3045ab6d9d0581ddb5a84b0f
-SIZE (vtextures-doom-1.1.zip) = 34048470
-MD5 (vtextures-doom1-1.1.zip) = 1894ce9bc5bff948db81ed776bc30d0b
-SHA256 (vtextures-doom1-1.1.zip) = 6375aa6eb1cdefa4ed73a4c120e58c3c7d4cf984ace70593801cef5a7323cb92
-SIZE (vtextures-doom1-1.1.zip) = 21498388
-MD5 (vtextures-doom2-1.1.zip) = 9f7347631eec9aa12da69ce530120bac
-SHA256 (vtextures-doom2-1.1.zip) = c9c2b01e0c7ede52a5541c696e254f0e54144e9f1ce59dba9d8780c84e83f1f8
-SIZE (vtextures-doom2-1.1.zip) = 20832664
+MD5 (vmodels-doom-1.4.2.zip) = bf410408f3b98f2f15da39559f5f9133
+SHA256 (vmodels-doom-1.4.2.zip) = 9697c287cdec7f0f8c851b1dda06fad3f57c0f1335e7a7673ddad5bc6559d87d
+SIZE (vmodels-doom-1.4.2.zip) = 16221105
+MD5 (vmodels-heretic-1.4.2.zip) = e0ba09eff844c87aa6e369f746735b0d
+SHA256 (vmodels-heretic-1.4.2.zip) = b84ea42da403902e9caa92086f1c88d39013f1e6503f5e9b61db98e57f9eac01
+SIZE (vmodels-heretic-1.4.2.zip) = 2464784
+MD5 (vmodels-hexen-1.4.2.zip) = f3bfcdf77038648b868ff020fd277259
+SHA256 (vmodels-hexen-1.4.2.zip) = 900f72f951bfe336da9b06974c50ff40560ebeea807a568747ae21c11ca02d19
+SIZE (vmodels-hexen-1.4.2.zip) = 1683299
+MD5 (vmodels-strife-1.4.2.zip) = 99cee3ff92bb97e47bffd497a784f535
+SHA256 (vmodels-strife-1.4.2.zip) = 61327493252b425cb74248221c53d44913f35d517645c4f9a60fd9c339d386f1
+SIZE (vmodels-strife-1.4.2.zip) = 91158
+MD5 (vv-dhtp-20071114.pk3) = ed42200f357d7ee8ac98fcb2d20afed9
+SHA256 (vv-dhtp-20071114.pk3) = f1816cc1f01c503bf7addc759237c72b07b42f07c615ed8109c0c0b3526bc364
+SIZE (vv-dhtp-20071114.pk3) = 87299440
 MD5 (vtextures-heretic-1.0.zip) = dba7993165285423fc62beb205652b31
 SHA256 (vtextures-heretic-1.0.zip) = e25772370f13ea816e94346e33d3989e9c30ff99b7f9d32101d8e70a52c33ed1
 SIZE (vtextures-heretic-1.0.zip) = 37684265
diff --git a/games/vavoom-extras/pkg-plist b/games/vavoom-extras/pkg-plist
index 8cd2e144ebbe..74b084da95ee 100644
--- a/games/vavoom-extras/pkg-plist
+++ b/games/vavoom-extras/pkg-plist
@@ -1,50 +1,26 @@
-%%TEXTURES%%%%DATADIR%%/basev/doom/xflats.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom/xflats.txt
-%%TEXTURES%%%%DATADIR%%/basev/doom/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom/xgfx.txt
+%%TEXTURES%%%%DATADIR%%/basev/doom/flats.pk3
 %%MODELS%%%%DATADIR%%/basev/doom/xmodels.pk3
-%%MODELS%%%%DATADIR%%/basev/doom/xmodels.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom/xmusic.pk3
 %%TEXTURES%%%%DATADIR%%/basev/doom/xwalls.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom/xwalls.txt
-%%TEXTURES%%%%DATADIR%%/basev/doom1/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom1/xgfx.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom1/xmusic.pk3
-%%SOUNDTRACKS%%%%DATADIR%%/basev/doom1/xmusic.txt
 %%TEXTURES%%%%DATADIR%%/basev/doom1/xwalls.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom1/xwalls.txt
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xflats.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xflats.txt
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xgfx.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom2/xmusic.pk3
-%%SOUNDTRACKS%%%%DATADIR%%/basev/doom2/xmusic.txt
 %%TEXTURES%%%%DATADIR%%/basev/doom2/xwalls.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xwalls.txt
 %%TEXTURES%%%%DATADIR%%/basev/heretic/xflats.pk3
 %%TEXTURES%%%%DATADIR%%/basev/heretic/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/heretic/xgfx.txt
 %%MODELS%%%%DATADIR%%/basev/heretic/xmodels.pk3
-%%MODELS%%%%DATADIR%%/basev/heretic/xmodels.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/heretic/xmusic.pk3
-%%SOUNDTRACKS%%%%DATADIR%%/basev/heretic/xmusic.txt
 %%TEXTURES%%%%DATADIR%%/basev/heretic/xwalls.pk3
 %%TEXTURES%%%%DATADIR%%/basev/hexen/xflats.pk3
 %%TEXTURES%%%%DATADIR%%/basev/hexen/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/hexen/xgfx.txt
 %%MODELS%%%%DATADIR%%/basev/hexen/xmodels.pk3
-%%MODELS%%%%DATADIR%%/basev/hexen/xmodels.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/hexen/xmusic.pk3
-%%SOUNDTRACKS%%%%DATADIR%%/basev/hexen/xmusic.txt
 %%TEXTURES%%%%DATADIR%%/basev/hexen/xwalls.pk3
-%%TEXTURES%%%%DATADIR%%/basev/hexen/xwalls.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/plutonia/xmusic.pk3
+%%TEXTURES%%%%DATADIR%%/basev/plutonia/xwalls.pk3
 %%TEXTURES%%%%DATADIR%%/basev/strife/xflats.pk3
 %%TEXTURES%%%%DATADIR%%/basev/strife/xgfx.pk3
-%%TEXTURES%%%%DATADIR%%/basev/strife/xgfx.txt
 %%MODELS%%%%DATADIR%%/basev/strife/xmodels.pk3
-%%MODELS%%%%DATADIR%%/basev/strife/xmodels.txt
 %%TEXTURES%%%%DATADIR%%/basev/strife/xwalls.pk3
-%%TEXTURES%%%%DATADIR%%/basev/strife/xwalls.txt
 %%SOUNDTRACKS%%%%DATADIR%%/basev/tnt/xmusic.pk3
-%%SOUNDTRACKS%%%%DATADIR%%/basev/tnt/xmusic.txt
+%%TEXTURES%%%%DATADIR%%/basev/tnt/xwalls.pk3