Attachment 146750 Details for Bug 190968 – Proposed patch

[patch] Proposed patch

warsow-data_1.5,1-1.51.diff (text/plain), 10.30 KB, created by lightside on 2014-09-03 20:57:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-09-03 20:57:10 UTC

Size: 10.30 KB

patch

obsolete

>diff -ruN warsow-data.orig/Makefile warsow-data/Makefile
>--- warsow-data.orig/Makefile	2014-06-05 09:03:28.000000000 +0400
>+++ warsow-data/Makefile	2014-09-04 00:11:56.000000000 +0400
>@@ -2,20 +2,13 @@
> # $FreeBSD: head/games/warsow-data/Makefile 356583 2014-06-05 05:03:28Z antoine $
> 
> PORTNAME=	data
>-PORTVERSION=	1.5
>-PORTREVISION=	1
>+PORTVERSION=	1.51
> CATEGORIES=	games
> MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION} \
> 		http://www.warsow.net:1337/~warsow/${PORTVERSION}/ \
> 		http://www.warsow.eu/:mappack \
> 		LOCAL/nemysis/games:mappack
> 
>-PKGNAMEPREFIX=	warsow-
>-DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION:S/.//}_unified
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
>-DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
>-
> MAINTAINER=	games@FreeBSD.org
> COMMENT=	Warsow data files
> 
>@@ -25,7 +18,9 @@
> LICENSE_FILE_WARSOW=	${WRKSRC}/docs/license.txt
> LICENSE_PERMS_WARSOW=	dist-mirror pkg-mirror auto-accept
> 
>-RUN_DEPENDS=	warsow:${PORTSDIR}/games/warsow
>+PKGNAMEPREFIX=	warsow-
>+DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION}_unified
>+DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
> 
> # 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)
>@@ -36,7 +31,8 @@
> DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
> DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX:S/-//}
> 
>-PORTDOCS=	*.txt
>+PORTDATA=	basewsw
>+PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS MAPPACK
> OPTIONS_DEFAULT=	MAPPACK
>@@ -46,8 +42,10 @@
> 
> .if ${PORT_OPTIONS:MMAPPACK}
> MAPPACK_FILE=	warsow_comunity_map_pack_01.zip
>-DISTFILES+=	 ${MAPPACK_FILE}:mappack
>+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MAPPACK_FILE}:mappack
>+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
>+PORTDATA+=	previews
> .endif
> 
> post-extract:
>@@ -56,14 +54,7 @@
> .endif
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} basewsw ${STAGEDIR}${DATADIR}
>-
>-.if ${PORT_OPTIONS:MMAPPACK}
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} previews ${STAGEDIR}${DATADIR}
>-.endif
>-
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
>+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
> 
> .include <bsd.port.mk>
>diff -ruN warsow-data.orig/distinfo warsow-data/distinfo
>--- warsow-data.orig/distinfo	2014-06-04 21:50:43.000000000 +0400
>+++ warsow-data/distinfo	2014-06-12 17:13:41.000000000 +0400
>@@ -1,4 +1,4 @@
>-SHA256 (warsow/warsow_15_unified.tar.gz) = 4b4715d45339bdabfc94d4385df4defac0974743061f63e6a025460ab24668d7
>-SIZE (warsow/warsow_15_unified.tar.gz) = 584507931
>+SHA256 (warsow/warsow_1.51_unified.tar.gz) = 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5
>+SIZE (warsow/warsow_1.51_unified.tar.gz) = 601553865
> SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
> SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
>diff -ruN warsow-data.orig/pkg-plist warsow-data/pkg-plist
>--- warsow-data.orig/pkg-plist	2014-06-05 02:51:12.000000000 +0400
>+++ warsow-data/pkg-plist	1970-01-01 03:00:00.000000000 +0300
>@@ -1,189 +0,0 @@
>-%%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/cwCTF1.pk3
>-%%DATADIR%%/basewsw/cwL1.pk3
>-%%DATADIR%%/basewsw/cwL2.pk3
>-%%DATADIR%%/basewsw/cwL3.pk3
>-%%DATADIR%%/basewsw/cwL4.pk3
>-%%DATADIR%%/basewsw/cwL5.pk3
>-%%DATADIR%%/basewsw/cwM1.pk3
>-%%DATADIR%%/basewsw/cwM2.pk3
>-%%DATADIR%%/basewsw/cwM3.pk3
>-%%DATADIR%%/basewsw/cwM4.pk3
>-%%DATADIR%%/basewsw/cwM5.pk3
>-%%DATADIR%%/basewsw/cwM6.pk3
>-%%DATADIR%%/basewsw/cwM7.pk3
>-%%DATADIR%%/basewsw/cwRACE1.pk3
>-%%DATADIR%%/basewsw/cwRACE2.pk3
>-%%DATADIR%%/basewsw/cwRACE3.pk3
>-%%DATADIR%%/basewsw/cwRACE4.pk3
>-%%DATADIR%%/basewsw/cwRACE5.pk3
>-%%DATADIR%%/basewsw/cwS1.pk3
>-%%DATADIR%%/basewsw/cwS2.pk3
>-%%DATADIR%%/basewsw/cw_tex1.pk3
>-%%DATADIR%%/basewsw/cw_tex2.pk3
>-%%DATADIR%%/basewsw/data0_15.pk3
>-%%DATADIR%%/basewsw/data0_15pure.pk3
>-%%DATADIR%%/basewsw/dedicated_autoexec.cfg
>-%%DATADIR%%/basewsw/editortextures.pk3
>-%%DATADIR%%/basewsw/map_cwBOMB1.pk3
>-%%DATADIR%%/basewsw/map_ui.pk3
>-%%DATADIR%%/basewsw/map_wamphi1.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_wbomb6.pk3
>-%%DATADIR%%/basewsw/map_wca1.pk3
>-%%DATADIR%%/basewsw/map_wca2.pk3
>-%%DATADIR%%/basewsw/map_wctf1.pk3
>-%%DATADIR%%/basewsw/map_wctf2.pk3
>-%%DATADIR%%/basewsw/map_wctf3.pk3
>-%%DATADIR%%/basewsw/map_wctf4.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_wda5.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_wdm16.pk3
>-%%DATADIR%%/basewsw/map_wdm17.pk3
>-%%DATADIR%%/basewsw/map_wdm18.pk3
>-%%DATADIR%%/basewsw/map_wdm19.pk3
>-%%DATADIR%%/basewsw/map_wdm2.pk3
>-%%DATADIR%%/basewsw/map_wdm3.pk3
>-%%DATADIR%%/basewsw/map_wdm4.pk3
>-%%DATADIR%%/basewsw/map_wdm5.pk3
>-%%DATADIR%%/basewsw/map_wdm6.pk3
>-%%DATADIR%%/basewsw/map_wdm7.pk3
>-%%DATADIR%%/basewsw/map_wdm9.pk3
>-%%DATADIR%%/basewsw/map_wrace1.pk3
>-%%DATADIR%%/basewsw/models_nate.pk3
>-%%DATADIR%%/basewsw/modules_15.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_boqu.pk3
>-%%DATADIR%%/basewsw/tex_bricks.pk3
>-%%DATADIR%%/basewsw/tex_cha0swsw.pk3
>-%%DATADIR%%/basewsw/tex_cleansurface.pk3
>-%%DATADIR%%/basewsw/tex_concrete.pk3
>-%%DATADIR%%/basewsw/tex_concrete_techwalls.pk3
>-%%DATADIR%%/basewsw/tex_decals.pk3
>-%%DATADIR%%/basewsw/tex_env.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_noir.pk3
>-%%DATADIR%%/basewsw/tex_plastic.pk3
>-%%DATADIR%%/basewsw/tex_refly.pk3
>-%%DATADIR%%/basewsw/tex_russus.pk3
>-%%DATADIR%%/basewsw/tex_scifi_interior.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_wrace1.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
>-%%DATADIR%%/basewsw/ui_porkui.pk3
>-%%DATADIR%%/previews/cwBOMB1.jpg
>-%%DATADIR%%/previews/cwCTF1.jpg
>-%%DATADIR%%/previews/cwL1.jpg
>-%%DATADIR%%/previews/cwL2.jpg
>-%%DATADIR%%/previews/cwL3.jpg
>-%%DATADIR%%/previews/cwL4.jpg
>-%%DATADIR%%/previews/cwL5.jpg
>-%%DATADIR%%/previews/cwM1.jpg
>-%%DATADIR%%/previews/cwM2.jpg
>-%%DATADIR%%/previews/cwM3.jpg
>-%%DATADIR%%/previews/cwM4.jpg
>-%%DATADIR%%/previews/cwM5.jpg
>-%%DATADIR%%/previews/cwM6.jpg
>-%%DATADIR%%/previews/cwM7.jpg
>-%%DATADIR%%/previews/cwRACE1.jpg
>-%%DATADIR%%/previews/cwRACE2.jpg
>-%%DATADIR%%/previews/cwRACE3.jpg
>-%%DATADIR%%/previews/cwRACE4.jpg
>-%%DATADIR%%/previews/cwRACE5.jpg
>-%%DATADIR%%/previews/cwS1.jpg
>-%%DATADIR%%/previews/cwS2.jpg
>-@dirrmtry %%DATADIR%%/basewsw/configs/server/gametypes
>-@dirrmtry %%DATADIR%%/basewsw/configs/server
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer/bs
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer/quad
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer/ra
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer/ya
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer/ya2
>-@dirrmtry %%DATADIR%%/basewsw/configs/timer
>-@dirrmtry %%DATADIR%%/basewsw/configs
>-@dirrmtry %%DATADIR%%/previews

Actions: View | Diff

Attachments on bug 190968: 143709 | 144867 | 146750 | 146751 | 147342