- Update to 1.30

PR:		ports/139332
Submitted by:	Barbara <barbara.xxx1975@libero.it>

3 files changed, 75 insertions, 32 deletions

diff --git a/games/vavoom-extras/Makefile b/games/vavoom-extras/Makefile
index 6eed4bbe115a..1e5b727c9eb9 100644
--- a/games/vavoom-extras/Makefile
+++ b/games/vavoom-extras/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.25
-PORTREVISION=	1
+PORTVERSION=	1.30
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/vmodels-doom/1.4.2:sf \
 		http://doomtextures.freelanzer.com/:dt
-
 PKGNAMESUFFIX=	-extras
 DISTFILES=	#
 
@@ -23,30 +21,36 @@ RUN_DEPENDS=	vavoom:${PORTSDIR}/games/vavoom
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-NO_PACKAGE=	package will be 665MB; set FORCE_PACKAGE if you really want it
+NO_PACKAGE=	package could be up to 661MB; set FORCE_PACKAGE if you really want it
 
-OPTIONS=	MODELS "Install 3D models (20MB)" on \
-		SOUNDTRACKS "Install enhaced soundtracks (480MB)" on \
-		TEXTURES "Install high resolution textures (165MB)" on
+OPTIONS=	MODELS "Install 3D models (17MB)" on \
+		SOUNDTRACKS "Install enhaced soundtracks (482MB)" on \
+		TEXTURES "Install high resolution textures (157MB)" off \
+		DHTP "Prefer Doom Hires Texture Pack (87MB)" on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_MODELS) && !defined(WITH_SOUNDTRACKS) && \
-    !defined(WITH_TEXTURES)
+.if !defined(WITH_MODELS) && !defined(WITH_SOUNDTRACKS) && !defined(WITH_TEXTURES) && !defined(WITH_DHTP)
 IGNORE=		needs at least one option selected
 .endif
 
 .if defined(WITH_MODELS)
 . for f in doom heretic hexen strife
-DISTFILES+=	vmodels-${f}-1.4.2${EXTRACT_SUFX}:sf
+DISTFILES+=	vmodels-${f}-1.4.3${EXTRACT_SUFX}:sf
 . endfor
 PLIST_SUB+=	MODELS=""
 .else
 PLIST_SUB+=	MODELS="@comment "
 .endif
 
+.if defined(WITH_DHTP)
+DISTFILES+=	vv-dhtp-20080808.pk3:dt
+PLIST_SUB+=	DHTP=""
+.else
+PLIST_SUB+=	DHTP="@comment "
+.endif
+
 .if defined(WITH_TEXTURES)
-DISTFILES+=	vv-dhtp-20071114.pk3:dt
 . for f in heretic hexen strife
 DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}:sf
 . endfor
@@ -55,6 +59,18 @@ PLIST_SUB+=	TEXTURES=""
 PLIST_SUB+=	TEXTURES="@comment "
 .endif
 
+.if defined(WITH_TEXTURES) && !defined(WITH_DHTP)
+. for f in plutonia tnt
+DISTFILES+=	vtextures-${f}-1.0${EXTRACT_SUFX}:sf
+. endfor
+. for f in doom doom1 doom2
+DISTFILES+=	vtextures-${f}-1.1${EXTRACT_SUFX}:sf
+. endfor
+PLIST_SUB+=	NODHTP=""
+.else
+PLIST_SUB+=	NODHTP="@comment "
+.endif
+
 .if defined(WITH_SOUNDTRACKS)
 . for f in doom1 doom2 tnt plutonia heretic hexen
 DISTFILES+=	vmusic-${f}-1.0${EXTRACT_SUFX}:sf
diff --git a/games/vavoom-extras/distinfo b/games/vavoom-extras/distinfo
index c1004bbcfc92..69ae07baba71 100644
--- a/games/vavoom-extras/distinfo
+++ b/games/vavoom-extras/distinfo
@@ -1,24 +1,39 @@
-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 (vmodels-doom-1.4.3.zip) = 6f977e155fe5465924bda6aa442a2a49
+SHA256 (vmodels-doom-1.4.3.zip) = e74ef4c156c746e1a99d8143c474b46424be1cf82d199ece43ec0be763cee3ea
+SIZE (vmodels-doom-1.4.3.zip) = 13060480
+MD5 (vmodels-heretic-1.4.3.zip) = 4d9d6badc9f56399513489bc4daac35f
+SHA256 (vmodels-heretic-1.4.3.zip) = d44c7d7354d0a6f0ed5dc05abc1e38eb7fc61a510824c2069f88a6ce55065451
+SIZE (vmodels-heretic-1.4.3.zip) = 2464540
+MD5 (vmodels-hexen-1.4.3.zip) = 05d59df1a1d6bd00db5327ea3ad72c90
+SHA256 (vmodels-hexen-1.4.3.zip) = 884894817370fba93d67b82396430f73211084292798585ddabc737718b41f2d
+SIZE (vmodels-hexen-1.4.3.zip) = 1683025
+MD5 (vmodels-strife-1.4.3.zip) = 99cee3ff92bb97e47bffd497a784f535
+SHA256 (vmodels-strife-1.4.3.zip) = 61327493252b425cb74248221c53d44913f35d517645c4f9a60fd9c339d386f1
+SIZE (vmodels-strife-1.4.3.zip) = 91158
+MD5 (vv-dhtp-20080808.pk3) = a05d038635efaeedfce74f302a9b29a0
+SHA256 (vv-dhtp-20080808.pk3) = 9fa719592a4d0b87a148d57987163b25311590005b818f240355bf1313a8e0b6
+SIZE (vv-dhtp-20080808.pk3) = 90775211
 MD5 (vtextures-heretic-1.0.zip) = dba7993165285423fc62beb205652b31
 SHA256 (vtextures-heretic-1.0.zip) = e25772370f13ea816e94346e33d3989e9c30ff99b7f9d32101d8e70a52c33ed1
 SIZE (vtextures-heretic-1.0.zip) = 37684265
 MD5 (vtextures-hexen-1.0.zip) = c6e63ca7033f86880b045ab0ad4904eb
 SHA256 (vtextures-hexen-1.0.zip) = fe6f6cf3d2486f3130be43e6dc5c9f29596328279ac26a36426c34fe1730f0d3
 SIZE (vtextures-hexen-1.0.zip) = 35120382
+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 (vtextures-plutonia-1.0.zip) = 5121dcc930d6c213be182f90002603c0
+SHA256 (vtextures-plutonia-1.0.zip) = c2f01e5adefc8d311bd7d4902efc68d5b292c89d6803023d5e7eb1bacb04bb0b
+SIZE (vtextures-plutonia-1.0.zip) = 3540078
+MD5 (vtextures-tnt-1.0.zip) = 3a84352ed42dd6339bcc31d8e818a6bf
+SHA256 (vtextures-tnt-1.0.zip) = 71630fef64ff47aa64a18fc1ed7d8c8bc195f9c49703e200beead23116fa85ce
+SIZE (vtextures-tnt-1.0.zip) = 5786835
 MD5 (vtextures-strife-1.0.zip) = a7d9e49d8fd0a9c633f960a014cb61ca
 SHA256 (vtextures-strife-1.0.zip) = e66cc837a60be9b5d58ac67ae961cacf25b858832383bdf0a70344db0e7dc122
 SIZE (vtextures-strife-1.0.zip) = 4731587
diff --git a/games/vavoom-extras/pkg-plist b/games/vavoom-extras/pkg-plist
index 74b084da95ee..e4b69230c2be 100644
--- a/games/vavoom-extras/pkg-plist
+++ b/games/vavoom-extras/pkg-plist
@@ -1,11 +1,19 @@
-%%TEXTURES%%%%DATADIR%%/basev/doom/flats.pk3
+%%DHTP%%%%DATADIR%%/basev/doom/flats.pk3
+%%TEXTURES%%%%DATADIR%%/basev/doom/xflats.pk3
+%%TEXTURES%%%%DATADIR%%/basev/doom/xgfx.pk3
 %%MODELS%%%%DATADIR%%/basev/doom/xmodels.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom/xmusic.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom/xwalls.pk3
+%%DHTP%%%%DATADIR%%/basev/doom/xwalls.pk3
+%%NODHTP%%%%DATADIR%%/basev/doom/xwalls.pk3
+%%TEXTURES%%%%DATADIR%%/basev/doom1/xgfx.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom1/xmusic.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom1/xwalls.pk3
+%%DHTP%%%%DATADIR%%/basev/doom1/xwalls.pk3
+%%NODHTP%%%%DATADIR%%/basev/doom1/xwalls.pk3
+%%TEXTURES%%%%DATADIR%%/basev/doom2/xflats.pk3
+%%TEXTURES%%%%DATADIR%%/basev/doom2/xgfx.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom2/xmusic.pk3
-%%TEXTURES%%%%DATADIR%%/basev/doom2/xwalls.pk3
+%%DHTP%%%%DATADIR%%/basev/doom2/xwalls.pk3
+%%NODHTP%%%%DATADIR%%/basev/doom2/xwalls.pk3
 %%TEXTURES%%%%DATADIR%%/basev/heretic/xflats.pk3
 %%TEXTURES%%%%DATADIR%%/basev/heretic/xgfx.pk3
 %%MODELS%%%%DATADIR%%/basev/heretic/xmodels.pk3
@@ -16,11 +24,15 @@
 %%MODELS%%%%DATADIR%%/basev/hexen/xmodels.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/hexen/xmusic.pk3
 %%TEXTURES%%%%DATADIR%%/basev/hexen/xwalls.pk3
+%%TEXTURES%%%%DATADIR%%/basev/plutonia/xgfx.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/plutonia/xmusic.pk3
-%%TEXTURES%%%%DATADIR%%/basev/plutonia/xwalls.pk3
+%%DHTP%%%%DATADIR%%/basev/plutonia/xwalls.pk3
+%%NODHTP%%%%DATADIR%%/basev/plutonia/xwalls.pk3
 %%TEXTURES%%%%DATADIR%%/basev/strife/xflats.pk3
 %%TEXTURES%%%%DATADIR%%/basev/strife/xgfx.pk3
 %%MODELS%%%%DATADIR%%/basev/strife/xmodels.pk3
 %%TEXTURES%%%%DATADIR%%/basev/strife/xwalls.pk3
+%%TEXTURES%%%%DATADIR%%/basev/tnt/xgfx.pk3
 %%SOUNDTRACKS%%%%DATADIR%%/basev/tnt/xmusic.pk3
-%%TEXTURES%%%%DATADIR%%/basev/tnt/xwalls.pk3
+%%DHTP%%%%DATADIR%%/basev/tnt/xwalls.pk3
+%%NODHTP%%%%DATADIR%%/basev/tnt/xwalls.pk3