Refresh the vavoom-extras port. Resynch PORTVERSION with vavoom. Pick new versions for some distfiles. WITH_TEXTURES installs textures from sourceforge for doom*/plutonia/tnt too. WITH_DHTP installs just the textures from doomtextures dot freelanzer dot com (which should be manually downloaded or hosted somewhere else). Selecting both the above options should install textures from sf for heretic/hexen/strife and the Doom Hires Texture Pack as the current port does. The update patch also includes (hence supercedes) ports/139175 Fix: Patch attached with submission follows:
Sorry, I've attached a wrong patch. I'll try attaching the correct one. Thanks
Trying again. Sorry. ----------------------------------------------------------------------- --- Makefile.orig 2009-08-22 02:22:36.000000000 +0200 +++ Makefile 2009-10-02 00:56:43.000000000 +0200 @@ -6,13 +6,13 @@ # PORTNAME=3D vavoom -PORTVERSION=3D 1.25 -PORTREVISION=3D 1 +PORTVERSION=3D 1.30 CATEGORIES=3D games MASTER_SITES=3D SF/${PORTNAME}/vmodels-doom/1.4.2:sf \ http://doomtextures.freelanzer.com/:dt PKGNAMESUFFIX=3D -extras +LATEST_LINK=3D ${PORTNAME}${PKGNAMESUFFIX} DISTFILES=3D # MAINTAINER=3D ports@FreeBSD.org @@ -23,30 +23,38 @@ USE_ZIP=3D yes NO_BUILD=3D yes NO_WRKSUBDIR=3D yes -NO_PACKAGE=3D package will be 665MB; set FORCE_PACKAGE if you really wan= t it +NO_PACKAGE=3D package could be up to 661MB; set FORCE_PACKAGE if you rea= lly want it + +OPTIONS=3D 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 -OPTIONS=3D MODELS "Install 3D models (20MB)" on \ - SOUNDTRACKS "Install enhaced soundtracks (480MB)" on \ - TEXTURES "Install high resolution textures (165MB)" on .include <bsd.port.pre.mk> .if !defined(WITH_MODELS) && !defined(WITH_SOUNDTRACKS) && \ - !defined(WITH_TEXTURES) + !defined(WITH_TEXTURES) && !defined(WITH_DHTP) IGNORE=3D needs at least one option selected .endif .if defined(WITH_MODELS) . for f in doom heretic hexen strife -DISTFILES+=3D vmodels-${f}-1.4.2${EXTRACT_SUFX}:sf +DISTFILES+=3D vmodels-${f}-1.4.3${EXTRACT_SUFX}:sf . endfor PLIST_SUB+=3D MODELS=3D"" .else PLIST_SUB+=3D MODELS=3D"@comment " .endif +.if defined(WITH_DHTP) +DISTFILES+=3D vv-dhtp-20080808.pk3:dt +PLIST_SUB+=3D DHTP=3D"" +.else +PLIST_SUB+=3D DHTP=3D"@comment " +.endif + .if defined(WITH_TEXTURES) -DISTFILES+=3D vv-dhtp-20071114.pk3:dt . for f in heretic hexen strife DISTFILES+=3D vtextures-${f}-1.0${EXTRACT_SUFX}:sf . endfor @@ -55,6 +63,18 @@ PLIST_SUB+=3D TEXTURES=3D"@comment " .endif +.if defined(WITH_TEXTURES) && !defined(WITH_DHTP) +. for f in plutonia tnt +DISTFILES+=3D vtextures-${f}-1.0${EXTRACT_SUFX}:sf +. endfor +. for f in doom doom1 doom2 +DISTFILES+=3D vtextures-${f}-1.1${EXTRACT_SUFX}:sf +. endfor +PLIST_SUB+=3D NODHTP=3D"" +.else +PLIST_SUB+=3D NODHTP=3D"@comment " +.endif + .if defined(WITH_SOUNDTRACKS) . for f in doom1 doom2 tnt plutonia heretic hexen DISTFILES+=3D vmusic-${f}-1.0${EXTRACT_SUFX}:sf --- distinfo.orig 2007-12-12 06:24:02.000000000 +0100 +++ distinfo 2009-10-01 23:36:11.000000000 +0200 @@ -1,24 +1,39 @@ -MD5 (vmodels-doom-1.4.2.zip) =3D bf410408f3b98f2f15da39559f5f9133 -SHA256 (vmodels-doom-1.4.2.zip) =3D 9697c287cdec7f0f8c851b1dda06fad3f57c= 0f1335e7a7673ddad5bc6559d87d -SIZE (vmodels-doom-1.4.2.zip) =3D 16221105 -MD5 (vmodels-heretic-1.4.2.zip) =3D e0ba09eff844c87aa6e369f746735b0d -SHA256 (vmodels-heretic-1.4.2.zip) =3D b84ea42da403902e9caa92086f1c88d39= 013f1e6503f5e9b61db98e57f9eac01 -SIZE (vmodels-heretic-1.4.2.zip) =3D 2464784 -MD5 (vmodels-hexen-1.4.2.zip) =3D f3bfcdf77038648b868ff020fd277259 -SHA256 (vmodels-hexen-1.4.2.zip) =3D 900f72f951bfe336da9b06974c50ff40560= ebeea807a568747ae21c11ca02d19 -SIZE (vmodels-hexen-1.4.2.zip) =3D 1683299 -MD5 (vmodels-strife-1.4.2.zip) =3D 99cee3ff92bb97e47bffd497a784f535 -SHA256 (vmodels-strife-1.4.2.zip) =3D 61327493252b425cb74248221c53d44913= f35d517645c4f9a60fd9c339d386f1 -SIZE (vmodels-strife-1.4.2.zip) =3D 91158 -MD5 (vv-dhtp-20071114.pk3) =3D ed42200f357d7ee8ac98fcb2d20afed9 -SHA256 (vv-dhtp-20071114.pk3) =3D f1816cc1f01c503bf7addc759237c72b07b42f= 07c615ed8109c0c0b3526bc364 -SIZE (vv-dhtp-20071114.pk3) =3D 87299440 +MD5 (vmoels-doom-1.4.3.zip) =3D 6f977e155fe5465924bda6aa442a2a49 +SHA256 (vmodels-doom-1.4.3.zip) =3D e74ef4c156c746e1a99d8143c474b46424be= 1cf82d199ece43ec0be763cee3ea +SIZE (vmodels-doom-1.4.3.zip) =3D 13060480 +MD5 (vmodels-heretic-1.4.3.zip) =3D 4d9d6badc9f56399513489bc4daac35f +SHA256 (vmodels-heretic-1.4.3.zip) =3D d44c7d7354d0a6f0ed5dc05abc1e38eb7= fc61a510824c2069f88a6ce55065451 +SIZE (vmodels-heretic-1.4.3.zip) =3D 2464540 +MD5 (vmodels-hexen-1.4.3.zip) =3D 05d59df1a1d6bd00db5327ea3ad72c90 +SHA256 (vmodels-hexen-1.4.3.zip) =3D 884894817370fba93d67b82396430f73211= 084292798585ddabc737718b41f2d +SIZE (vmodels-hexen-1.4.3.zip) =3D 1683025 +MD5 (vmodels-strife-1.4.3.zip) =3D 99cee3ff92bb97e47bffd497a784f535 +SHA256 (vmodels-strife-1.4.3.zip) =3D 61327493252b425cb74248221c53d44913= f35d517645c4f9a60fd9c339d386f1 +SIZE (vmodels-strife-1.4.3.zip) =3D 91158 +MD5 (vv-dhtp-20080808.pk3) =3D a05d038635efaeedfce74f302a9b29a0 +SHA256 (vv-dhtp-20080808.pk3) =3D 9fa719592a4d0b87a148d57987163b25311590= 005b818f240355bf1313a8e0b6 +SIZE (vv-dhtp-20080808.pk3) =3D 90775211 MD5 (vtextures-heretic-1.0.zip) =3D dba7993165285423fc62beb205652b31 SHA256 (vtextures-heretic-1.0.zip) =3D e25772370f13ea816e94346e33d3989e9= c30ff99b7f9d32101d8e70a52c33ed1 SIZE (vtextures-heretic-1.0.zip) =3D 37684265 MD5 (vtextures-hexen-1.0.zip) =3D c6e63ca7033f86880b045ab0ad4904eb SHA256 (vtextures-hexen-1.0.zip) =3D fe6f6cf3d2486f3130be43e6dc5c9f29596= 328279ac26a36426c34fe1730f0d3 SIZE (vtextures-hexen-1.0.zip) =3D 35120382 +MD5 (vtextures-doom-1.1.zip) =3D ae2d1aa008e7699529e0ff22ec8747b9 +SHA256 (vtextures-doom-1.1.zip) =3D c12c3a7f678a6b91fa7b5189c7a4254ddc07= 7e2e3045ab6d9d0581ddb5a84b0f +SIZE (vtextures-doom-1.1.zip) =3D 34048470 +MD5 (vtextures-doom1-1.1.zip) =3D 1894ce9bc5bff948db81ed776bc30d0b +SHA256 (vtextures-doom1-1.1.zip) =3D 6375aa6eb1cdefa4ed73a4c120e58c3c7d4= cf984ace70593801cef5a7323cb92 +SIZE (vtextures-doom1-1.1.zip) =3D 21498388 +MD5 (vtextures-doom2-1.1.zip) =3D 9f7347631eec9aa12da69ce530120bac +SHA256 (vtextures-doom2-1.1.zip) =3D c9c2b01e0c7ede52a5541c696e254f0e541= 44e9f1ce59dba9d8780c84e83f1f8 +SIZE (vtextures-doom2-1.1.zip) =3D 20832664 +MD5 (vtextures-plutonia-1.0.zip) =3D 5121dcc930d6c213be182f90002603c0 +SHA256 (vtextures-plutonia-1.0.zip) =3D c2f01e5adefc8d311bd7d4902efc68d5= b292c89d6803023d5e7eb1bacb04bb0b +SIZE (vtextures-plutonia-1.0.zip) =3D 3540078 +MD5 (vtextures-tnt-1.0.zip) =3D 3a84352ed42dd6339bcc31d8e818a6bf +SHA256 (vtextures-tnt-1.0.zip) =3D 71630fef64ff47aa64a18fc1ed7d8c8bc195f= 9c49703e200beead23116fa85ce +SIZE (vtextures-tnt-1.0.zip) =3D 5786835 MD5 (vtextures-strife-1.0.zip) =3D a7d9e49d8fd0a9c633f960a014cb61ca SHA256 (vtextures-strife-1.0.zip) =3D e66cc837a60be9b5d58ac67ae961cacf25= b858832383bdf0a70344db0e7dc122 SIZE (vtextures-strife-1.0.zip) =3D 4731587 --- pkg-plist.orig 2007-12-12 06:24:02.000000000 +0100 +++ pkg-plist 2009-10-02 00:06:23.000000000 +0200 @@ -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
I'm unable to send it correctly. You can find it here: http://pastebin.com/fbd85835
State Changed From-To: open->closed Committed, thanks!
pav 2009-10-14 13:34:38 UTC FreeBSD ports repository Modified files: games/vavoom-extras Makefile distinfo pkg-plist Log: - Update to 1.30 PR: ports/139332 Submitted by: Barbara <barbara.xxx1975@libero.it> Revision Changes Path 1.7 +27 -11 ports/games/vavoom-extras/Makefile 1.4 +30 -15 ports/games/vavoom-extras/distinfo 1.4 +18 -6 ports/games/vavoom-extras/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"