Date: Mon, 9 Sep 2013 22:09:38 +0000 (UTC) From: Barbara Guida <bar@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326844 - head/games/vavoom-extras Message-ID: <201309092209.r89M9cEV058128@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bar Date: Mon Sep 9 22:09:37 2013 New Revision: 326844 URL: http://svnweb.freebsd.org/changeset/ports/326844 Log: - Revert r325962 and set MODELS as default option - Remove DHTP option as distfile is no more fetchable Approved by: flo (mentor) Modified: head/games/vavoom-extras/Makefile head/games/vavoom-extras/distinfo head/games/vavoom-extras/pkg-plist Modified: head/games/vavoom-extras/Makefile ============================================================================== --- head/games/vavoom-extras/Makefile Mon Sep 9 21:51:58 2013 (r326843) +++ head/games/vavoom-extras/Makefile Mon Sep 9 22:09:37 2013 (r326844) @@ -11,8 +11,7 @@ MASTER_SITES= SF/vavoom/Resources/vmodel SF/vavoom/Resources/vmodels-strife/1.4.3:vms \ SF/vavoom/Resources/vmusic/1.0:vmu \ SF/vavoom/Resources/vtextures/1.0:vt10 \ - SF/vavoom/Resources/vtextures/1.1:vt11 \ - http://doomtextures.freelanzer.com/:dt + SF/vavoom/Resources/vtextures/1.1:vt11 MAINTAINER= bar@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen, and Strife source port (extras) @@ -24,15 +23,15 @@ DATADIR= ${PREFIX}/share/vavoom USE_ZIP= yes NO_BUILD= yes NO_WRKSUBDIR= yes -NO_PACKAGE= package could be up to 661MB; set FORCE_PACKAGE if you really want it +NO_PACKAGE= package could be up to 655MB; set FORCE_PACKAGE if you really want it -OPTIONS_GROUP= EXTRA -OPTIONS_GROUP_EXTRA= MODELS SOUNDTRACKS TEXTURES DHTP +OPTIONS_MULTI= EXTRA +OPTIONS_MULTI_EXTRA= MODELS SOUNDTRACKS TEXTURES +OPTIONS_DEFAULT= MODELS MODELS_DESC= Install 3D models (17MB) SOUNDTRACKS_DESC= Install enhanced soundtracks (482MB) TEXTURES_DESC= Install high resolution textures (157MB) -DHTP_DESC= Prefer Doom Hires Texture Pack (87MB) .include <bsd.port.options.mk> @@ -46,15 +45,11 @@ PLIST_SUB+= MODELS="" PLIST_SUB+= MODELS="@comment " .endif -.if ${PORT_OPTIONS:MDHTP} -DISTFILES+= vv-dhtp-20080808.pk3:dt -PLIST_SUB+= DHTP="" -.else -PLIST_SUB+= DHTP="@comment " -.endif - .if ${PORT_OPTIONS:MTEXTURES} -. for f in heretic hexen strife +. for f in doom doom1 doom2 +DISTFILES+= vtextures-${f}-1.1${EXTRACT_SUFX}:vt11 +. endfor +. for f in heretic hexen plutonia strife tnt DISTFILES+= vtextures-${f}-1.0${EXTRACT_SUFX}:vt10 . endfor PLIST_SUB+= TEXTURES="" @@ -62,20 +57,8 @@ PLIST_SUB+= TEXTURES="" PLIST_SUB+= TEXTURES="@comment " .endif -.if ${PORT_OPTIONS:MTEXTURES} && empty(PORT_OPTIONS:MDHTP) -. for f in plutonia tnt -DISTFILES+= vtextures-${f}-1.0${EXTRACT_SUFX}:vt10 -. endfor -. for f in doom doom1 doom2 -DISTFILES+= vtextures-${f}-1.1${EXTRACT_SUFX}:vt11 -. endfor -PLIST_SUB+= NODHTP="" -.else -PLIST_SUB+= NODHTP="@comment " -.endif - .if ${PORT_OPTIONS:MSOUNDTRACKS} -. for f in doom1 doom2 tnt plutonia heretic hexen +. for f in doom1 doom2 heretic hexen tnt plutonia DISTFILES+= vmusic-${f}-1.0${EXTRACT_SUFX}:vmu . endfor PLIST_SUB+= SOUNDTRACKS="" Modified: head/games/vavoom-extras/distinfo ============================================================================== --- head/games/vavoom-extras/distinfo Mon Sep 9 21:51:58 2013 (r326843) +++ head/games/vavoom-extras/distinfo Mon Sep 9 22:09:37 2013 (r326844) @@ -6,33 +6,31 @@ SHA256 (vmodels-hexen-1.4.3.zip) = 88489 SIZE (vmodels-hexen-1.4.3.zip) = 1683025 SHA256 (vmodels-strife-1.4.3.zip) = 61327493252b425cb74248221c53d44913f35d517645c4f9a60fd9c339d386f1 SIZE (vmodels-strife-1.4.3.zip) = 91158 -SHA256 (vv-dhtp-20080808.pk3) = 9fa719592a4d0b87a148d57987163b25311590005b818f240355bf1313a8e0b6 -SIZE (vv-dhtp-20080808.pk3) = 90775211 -SHA256 (vtextures-heretic-1.0.zip) = e25772370f13ea816e94346e33d3989e9c30ff99b7f9d32101d8e70a52c33ed1 -SIZE (vtextures-heretic-1.0.zip) = 37684265 -SHA256 (vtextures-hexen-1.0.zip) = fe6f6cf3d2486f3130be43e6dc5c9f29596328279ac26a36426c34fe1730f0d3 -SIZE (vtextures-hexen-1.0.zip) = 35120382 SHA256 (vtextures-doom-1.1.zip) = c12c3a7f678a6b91fa7b5189c7a4254ddc077e2e3045ab6d9d0581ddb5a84b0f SIZE (vtextures-doom-1.1.zip) = 34048470 SHA256 (vtextures-doom1-1.1.zip) = 6375aa6eb1cdefa4ed73a4c120e58c3c7d4cf984ace70593801cef5a7323cb92 SIZE (vtextures-doom1-1.1.zip) = 21498388 SHA256 (vtextures-doom2-1.1.zip) = c9c2b01e0c7ede52a5541c696e254f0e54144e9f1ce59dba9d8780c84e83f1f8 SIZE (vtextures-doom2-1.1.zip) = 20832664 +SHA256 (vtextures-heretic-1.0.zip) = e25772370f13ea816e94346e33d3989e9c30ff99b7f9d32101d8e70a52c33ed1 +SIZE (vtextures-heretic-1.0.zip) = 37684265 +SHA256 (vtextures-hexen-1.0.zip) = fe6f6cf3d2486f3130be43e6dc5c9f29596328279ac26a36426c34fe1730f0d3 +SIZE (vtextures-hexen-1.0.zip) = 35120382 SHA256 (vtextures-plutonia-1.0.zip) = c2f01e5adefc8d311bd7d4902efc68d5b292c89d6803023d5e7eb1bacb04bb0b SIZE (vtextures-plutonia-1.0.zip) = 3540078 -SHA256 (vtextures-tnt-1.0.zip) = 71630fef64ff47aa64a18fc1ed7d8c8bc195f9c49703e200beead23116fa85ce -SIZE (vtextures-tnt-1.0.zip) = 5786835 SHA256 (vtextures-strife-1.0.zip) = e66cc837a60be9b5d58ac67ae961cacf25b858832383bdf0a70344db0e7dc122 SIZE (vtextures-strife-1.0.zip) = 4731587 +SHA256 (vtextures-tnt-1.0.zip) = 71630fef64ff47aa64a18fc1ed7d8c8bc195f9c49703e200beead23116fa85ce +SIZE (vtextures-tnt-1.0.zip) = 5786835 SHA256 (vmusic-doom1-1.0.zip) = c00bc5068a447fcd8c1d24f4049d5fbb8dea444e426cdee96580c4b467f50040 SIZE (vmusic-doom1-1.0.zip) = 93739946 SHA256 (vmusic-doom2-1.0.zip) = 38c6911cf8e19a7be5b14c6fa5f8a152c2952d8300654a473f8676830c8e5afc SIZE (vmusic-doom2-1.0.zip) = 128469154 -SHA256 (vmusic-tnt-1.0.zip) = 2426e0725765e559755cae28dfac68d2680538ac6339417b27f71edf6bb4b3e3 -SIZE (vmusic-tnt-1.0.zip) = 51473678 -SHA256 (vmusic-plutonia-1.0.zip) = fb34396768228d996f7b96abf5b540385693ed8e31daa2b7bc860551af5d518b -SIZE (vmusic-plutonia-1.0.zip) = 660 SHA256 (vmusic-heretic-1.0.zip) = 6b3ecd86363f08ad49d40bfb33b7c0386a964fcad104b95aba7af89b90908e14 SIZE (vmusic-heretic-1.0.zip) = 56202602 SHA256 (vmusic-hexen-1.0.zip) = ae2b357db58cdc80212b956a221f62d905598c2962317cf10fbe29e813ca8d25 SIZE (vmusic-hexen-1.0.zip) = 174840338 +SHA256 (vmusic-tnt-1.0.zip) = 2426e0725765e559755cae28dfac68d2680538ac6339417b27f71edf6bb4b3e3 +SIZE (vmusic-tnt-1.0.zip) = 51473678 +SHA256 (vmusic-plutonia-1.0.zip) = fb34396768228d996f7b96abf5b540385693ed8e31daa2b7bc860551af5d518b +SIZE (vmusic-plutonia-1.0.zip) = 660 Modified: head/games/vavoom-extras/pkg-plist ============================================================================== --- head/games/vavoom-extras/pkg-plist Mon Sep 9 21:51:58 2013 (r326843) +++ head/games/vavoom-extras/pkg-plist Mon Sep 9 22:09:37 2013 (r326844) @@ -1,38 +1,32 @@ -%%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 -%%DHTP%%%%DATADIR%%/basev/doom/xwalls.pk3 -%%NODHTP%%%%DATADIR%%/basev/doom/xwalls.pk3 -%%TEXTURES%%%%DATADIR%%/basev/doom1/xgfx.pk3 +%%TEXTURES%%%%DATADIR%%/basev/doom/xflats.pk3 +%%TEXTURES%%%%DATADIR%%/basev/doom/xgfx.pk3 +%%TEXTURES%%%%DATADIR%%/basev/doom/xwalls.pk3 %%SOUNDTRACKS%%%%DATADIR%%/basev/doom1/xmusic.pk3 -%%DHTP%%%%DATADIR%%/basev/doom1/xwalls.pk3 -%%NODHTP%%%%DATADIR%%/basev/doom1/xwalls.pk3 +%%TEXTURES%%%%DATADIR%%/basev/doom1/xgfx.pk3 +%%TEXTURES%%%%DATADIR%%/basev/doom1/xwalls.pk3 +%%SOUNDTRACKS%%%%DATADIR%%/basev/doom2/xmusic.pk3 %%TEXTURES%%%%DATADIR%%/basev/doom2/xflats.pk3 %%TEXTURES%%%%DATADIR%%/basev/doom2/xgfx.pk3 -%%SOUNDTRACKS%%%%DATADIR%%/basev/doom2/xmusic.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 +%%TEXTURES%%%%DATADIR%%/basev/doom2/xwalls.pk3 %%MODELS%%%%DATADIR%%/basev/heretic/xmodels.pk3 %%SOUNDTRACKS%%%%DATADIR%%/basev/heretic/xmusic.pk3 +%%TEXTURES%%%%DATADIR%%/basev/heretic/xflats.pk3 +%%TEXTURES%%%%DATADIR%%/basev/heretic/xgfx.pk3 %%TEXTURES%%%%DATADIR%%/basev/heretic/xwalls.pk3 -%%TEXTURES%%%%DATADIR%%/basev/hexen/xflats.pk3 -%%TEXTURES%%%%DATADIR%%/basev/hexen/xgfx.pk3 %%MODELS%%%%DATADIR%%/basev/hexen/xmodels.pk3 %%SOUNDTRACKS%%%%DATADIR%%/basev/hexen/xmusic.pk3 +%%TEXTURES%%%%DATADIR%%/basev/hexen/xflats.pk3 +%%TEXTURES%%%%DATADIR%%/basev/hexen/xgfx.pk3 %%TEXTURES%%%%DATADIR%%/basev/hexen/xwalls.pk3 -%%TEXTURES%%%%DATADIR%%/basev/plutonia/xgfx.pk3 %%SOUNDTRACKS%%%%DATADIR%%/basev/plutonia/xmusic.pk3 -%%DHTP%%%%DATADIR%%/basev/plutonia/xwalls.pk3 -%%NODHTP%%%%DATADIR%%/basev/plutonia/xwalls.pk3 +%%TEXTURES%%%%DATADIR%%/basev/plutonia/xgfx.pk3 +%%TEXTURES%%%%DATADIR%%/basev/plutonia/xwalls.pk3 +%%MODELS%%%%DATADIR%%/basev/strife/xmodels.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 -%%DHTP%%%%DATADIR%%/basev/tnt/xwalls.pk3 -%%NODHTP%%%%DATADIR%%/basev/tnt/xwalls.pk3 +%%TEXTURES%%%%DATADIR%%/basev/tnt/xgfx.pk3 +%%TEXTURES%%%%DATADIR%%/basev/tnt/xwalls.pk3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309092209.r89M9cEV058128>