Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jan 2014 01:30:12 GMT
From:      Sender Ghost <lightside@gmx.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/185651: [PATCH] games/warsow-data: Update to v1.0.2
Message-ID:  <201401110130.s0B1UCbq013675@oldred.freebsd.org>
Resent-Message-ID: <201401110140.s0B1e03R056239@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185651
>Category:       ports
>Synopsis:       [PATCH] games/warsow-data: Update to v1.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 11 01:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Sender Ghost
>Release:        FreeBSD 9.2-RELEASE
>Organization:
>Environment:
>Description:
Patch to update games/warsow-data port from 0.6.2 to 1.0.2 version.

- Removed "community map pack" option (because of unknown support for 1.0.2 version).
- Converted to autogenerated PLIST.
- Added STAGEDIR support.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN warsow-data.orig/Makefile warsow-data/Makefile
--- warsow-data.orig/Makefile	2013-11-22 12:24:11.000000000 +0400
+++ warsow-data/Makefile	2014-01-11 02:29:56.000000000 +0400
@@ -2,67 +2,40 @@
 # $FreeBSD: games/warsow-data/Makefile 334555 2013-11-22 08:24:11Z bapt $
 
 PORTNAME=	data
-PORTVERSION=	0.6.2
+PORTVERSION=	1.0.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.zcdn.org/dl/ \
-		http://static.warsow.net/release/:mappack \
-		http://rewq.de/scratch/wsw05/:mappack
+MASTER_SITES=	SF/warsow.mirror/Warsow%201.02
 PKGNAMEPREFIX=	warsow-
-DISTNAME=	${PKGNAMEPREFIX:S/-//}_0.61_unified
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PKGNAMEPREFIX:S/-//}_0.62_update${EXTRACT_SUFX}
+DISTNAME=	${PKGNAMEPREFIX:S/-//}_1.02
 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 574MB, set FORCE_PACKAGE if you really want it
-
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-12-22
-
-BROKEN=		warsow_0.61_unified.zip is unfetchable
+NO_PACKAGE=	Package will be 507MB, set FORCE_PACKAGE if you really want it
 
 # Game port is restricted to these architectures, so it makes no sense to
 # package game data port as well (even it is not being technically built)
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_ZIP=	yes
-
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX:S/-//}
-TXTDOCS=	bots_navigation.txt changelog.txt contact.txt \
-		dedicated_server_quide.txt demoavi.txt democams.txt \
-		features.txt huds.txt license.txt mousefilter.txt \
-		query_protocols.txt
-PORTDOCS=	0.4_renderer_changes.png ${TXTDOCS}
-
-OPTIONS_DEFINE=	MAPPACK DOCS
-OPTIONS_DEFAULT=	MAPPACK
-MAPPACK_DESC=		Install community map pack
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PORTDATA=	basewsw
+PORTDOCS=	*
 
-.if ${PORT_OPTIONS:MMAPPACK}
-DISTFILES+=	warsow_comunity_map_pack_01${EXTRACT_SUFX}:mappack
-PLIST_SUB+=	MAPPACK=""
-.else
-PLIST_SUB+=	MAPPACK="@comment "
-.endif
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 do-install:
 	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} basewsw ${DATADIR}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} basewsw ${DATADIR}
-.if ${PORT_OPTIONS:MMAPPACK}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} previews ${DATADIR}
-.endif
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff -ruN warsow-data.orig/distinfo warsow-data/distinfo
--- warsow-data.orig/distinfo	2012-07-14 17:54:48.000000000 +0400
+++ warsow-data/distinfo	2013-01-18 09:58:05.000000000 +0400
@@ -1,6 +1,2 @@
-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
+SHA256 (warsow/warsow_1.02.tar.gz) = fe7e1469347f30822b1919d1f3e36a27b72435067b88df6310d8a65760d8252a
+SIZE (warsow/warsow_1.02.tar.gz) = 531283708
diff -ruN warsow-data.orig/pkg-plist warsow-data/pkg-plist
--- warsow-data.orig/pkg-plist	2012-07-14 17:54:48.000000000 +0400
+++ warsow-data/pkg-plist	1970-01-01 03:00:00.000000000 +0300
@@ -1,201 +0,0 @@
-%%DATADIR%%/basewsw/configs/jal.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/bomb.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/ca.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/ctf.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/ctftactics.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/da.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/dm.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/duel.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/ffa.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/headhunt.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/race.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/tdm.cfg
-%%DATADIR%%/basewsw/configs/server/gametypes/tdo.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/0x.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/1x.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/2x.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/3x.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/4x.cfg
-%%DATADIR%%/basewsw/configs/timer/bs/5x.cfg
-%%DATADIR%%/basewsw/configs/timer/core.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/0x.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/1x.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/2x.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/3x.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/4x.cfg
-%%DATADIR%%/basewsw/configs/timer/quad/5x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/0x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/1x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/2x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/3x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/4x.cfg
-%%DATADIR%%/basewsw/configs/timer/ra/5x.cfg
-%%DATADIR%%/basewsw/configs/timer/timerconfig.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/0x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/1x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/2x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/3x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/4x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya/5x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya2/0x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya2/1x.cfg
-%%DATADIR%%/basewsw/configs/timer/ya2/2x.cfg
-%%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
-%%DATADIR%%/basewsw/map_wamphi2.pk3
-%%DATADIR%%/basewsw/map_wbomb1.pk3
-%%DATADIR%%/basewsw/map_wbomb2.pk3
-%%DATADIR%%/basewsw/map_wbomb3.pk3
-%%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
-%%DATADIR%%/basewsw/map_wctf5.pk3
-%%DATADIR%%/basewsw/map_wctf6.pk3
-%%DATADIR%%/basewsw/map_wda1.pk3
-%%DATADIR%%/basewsw/map_wda2.pk3
-%%DATADIR%%/basewsw/map_wda3.pk3
-%%DATADIR%%/basewsw/map_wda4.pk3
-%%DATADIR%%/basewsw/map_wdm1.pk3
-%%DATADIR%%/basewsw/map_wdm10.pk3
-%%DATADIR%%/basewsw/map_wdm11.pk3
-%%DATADIR%%/basewsw/map_wdm12.pk3
-%%DATADIR%%/basewsw/map_wdm13.pk3
-%%DATADIR%%/basewsw/map_wdm14.pk3
-%%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
-%%DATADIR%%/basewsw/tex_blx.pk3
-%%DATADIR%%/basewsw/tex_blxbis.pk3
-%%DATADIR%%/basewsw/tex_bricks.pk3
-%%DATADIR%%/basewsw/tex_cha0swsw.pk3
-%%DATADIR%%/basewsw/tex_cleansurface.pk3
-%%DATADIR%%/basewsw/tex_concrete.pk3
-%%DATADIR%%/basewsw/tex_decals.pk3
-%%DATADIR%%/basewsw/tex_env1.pk3
-%%DATADIR%%/basewsw/tex_etr.pk3
-%%DATADIR%%/basewsw/tex_exwsw.pk3
-%%DATADIR%%/basewsw/tex_factory.pk3
-%%DATADIR%%/basewsw/tex_format.pk3
-%%DATADIR%%/basewsw/tex_glass.pk3
-%%DATADIR%%/basewsw/tex_grates.pk3
-%%DATADIR%%/basewsw/tex_hazelh.pk3
-%%DATADIR%%/basewsw/tex_hexagons.pk3
-%%DATADIR%%/basewsw/tex_jewels.pk3
-%%DATADIR%%/basewsw/tex_lights.pk3
-%%DATADIR%%/basewsw/tex_melee.pk3
-%%DATADIR%%/basewsw/tex_metal.pk3
-%%DATADIR%%/basewsw/tex_nature.pk3
-%%DATADIR%%/basewsw/tex_neon.pk3
-%%DATADIR%%/basewsw/tex_plastic.pk3
-%%DATADIR%%/basewsw/tex_refly.pk3
-%%DATADIR%%/basewsw/tex_russus.pk3
-%%DATADIR%%/basewsw/tex_sky.pk3
-%%DATADIR%%/basewsw/tex_solidfake.pk3
-%%DATADIR%%/basewsw/tex_supersymmetry.pk3
-%%DATADIR%%/basewsw/tex_terrain.pk3
-%%DATADIR%%/basewsw/tex_tiles.pk3
-%%DATADIR%%/basewsw/tex_window.pk3
-%%DATADIR%%/basewsw/tex_wood.pk3
-%%DATADIR%%/basewsw/tex_wsw_cave1.pk3
-%%DATADIR%%/basewsw/tex_wsw_city1.pk3
-%%DATADIR%%/basewsw/tex_wsw_flareshalos.pk3
-%%DATADIR%%/basewsw/tex_zone_neutre.pk3
-%%DATADIR%%/basewsw/tvserver_autoexec.cfg
-%%MAPPACK%%%%DATADIR%%/basewsw/cwCTF1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwL1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwL2.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwL3.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwL4.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwL5.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM2.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM3.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM4.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM5.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM6.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwM7.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE2.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE3.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE4.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwRACE5.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwS1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cwS2.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cw_tex1.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/cw_tex2.pk3
-%%MAPPACK%%%%DATADIR%%/basewsw/map_cwBOMB1.pk3
-%%MAPPACK%%%%DATADIR%%/previews/cwBOMB1.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwCTF1.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwL1.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwL2.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwL3.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwL4.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwL5.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM1.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM2.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM3.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM4.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM5.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM6.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwM7.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwRACE1.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwRACE2.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwRACE3.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwRACE4.jpg
-%%MAPPACK%%%%DATADIR%%/previews/cwRACE5.jpg
-%%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
-@dirrm %%DATADIR%%/basewsw/configs/timer/quad
-@dirrm %%DATADIR%%/basewsw/configs/timer/bs
-@dirrm %%DATADIR%%/basewsw/configs/timer
-@dirrm %%DATADIR%%/basewsw/configs/server/gametypes
-@dirrm %%DATADIR%%/basewsw/configs/server
-@dirrm %%DATADIR%%/basewsw/configs
-@dirrm %%DATADIR%%/basewsw
-@dirrm %%DATADIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401110130.s0B1UCbq013675>