Bug 185651 - [PATCH] games/warsow-data: Update to v1.0.2
Summary: [PATCH] games/warsow-data: Update to v1.0.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jose Alonso Cardenas Marquez
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-11 01:40 UTC by lightside
Modified: 2014-03-09 12:20 UTC (History)
0 users

See Also:


Attachments
file.diff (11.60 KB, patch)
2014-01-11 01:40 UTC, lightside
no flags Details | Diff
patch.txt (11.90 KB, text/plain; charset=UTF-8)
2014-01-14 17:40 UTC, lightside
no flags Details
patch.txt (12.27 KB, text/plain; charset=UTF-8)
2014-02-06 06:47 UTC, lightside
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description lightside 2014-01-11 01:40:00 UTC
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.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-11 01:40:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->acm

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 lightside 2014-01-14 17:40:53 UTC
Returned "community map pack" option to the patch.
Comment 3 lightside 2014-02-06 06:47:17 UTC
Applied the following changes by Jan Kokemüller from ports/185652 followup:
- Added http://www.warsow.net:1337 master site.
- Added license information.
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-03-09 12:11:25 UTC
Author: rene
Date: Sun Mar  9 12:11:17 2014
New Revision: 347565
URL: http://svnweb.freebsd.org/changeset/ports/347565
QAT: https://qat.redports.org/buildarchive/r347565/

Log:
  games/warsow-data:
  - Unexpire
  - Update to 1.0.2
  - Stage support
  - Update master sites
  - Add license information
  - Drop pkg-plist in favor of dynamic plist
  
  Remove NO_PACKAGE while here
  
  Thid port should probably be cleaned up to use USES=zip:infozip
  
  PR:		ports/185651
  Submitted by:	Sender Ghost <lightside@gmx.com>
  Approved by:	maintainer timeout (acm, 2 months for PR + deprecation time)

Deleted:
  head/games/warsow-data/pkg-plist
Modified:
  head/games/warsow-data/Makefile
  head/games/warsow-data/distinfo

Modified: head/games/warsow-data/Makefile
==============================================================================
--- head/games/warsow-data/Makefile	Sun Mar  9 12:01:27 2014	(r347564)
+++ head/games/warsow-data/Makefile	Sun Mar  9 12:11:17 2014	(r347565)
@@ -2,67 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	data
-PORTVERSION=	0.6.2
+PORTVERSION=	1.0.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.zcdn.org/dl/ \
+MASTER_SITES=	SF/warsow.mirror/Warsow%20${PORTVERSION:R}${PORTVERSION:E} \
+		http://www.warsow.net:1337/~warsow/${PORTVERSION:R}${PORTVERSION:E}/ \
 		http://static.warsow.net/release/:mappack \
 		http://rewq.de/scratch/wsw05/:mappack
 PKGNAMEPREFIX=	warsow-
-DISTNAME=	${PKGNAMEPREFIX:S/-//}_0.61_unified
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PKGNAMEPREFIX:S/-//}_0.62_update${EXTRACT_SUFX}
+DISTNAME=	${PKGNAMEPREFIX:S/-//}_${PORTVERSION:R}${PORTVERSION:E}
 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
+LICENSE=	WARSOW GPLv2
+LICENSE_COMB=	multi
+LICENSE_NAME_WARSOW=	Warsow Content License
+LICENSE_FILE_WARSOW=	${WRKSRC}/docs/license.txt
+LICENSE_PERMS_WARSOW=	dist-mirror pkg-mirror auto-accept
 
 # 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}
+
+PORTDATA=	basewsw
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	MAPPACK DOCS
 OPTIONS_DEFAULT=	MAPPACK
 MAPPACK_DESC=		Install community map pack
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMAPPACK}
-DISTFILES+=	warsow_comunity_map_pack_01${EXTRACT_SUFX}:mappack
-PLIST_SUB+=	MAPPACK=""
-.else
-PLIST_SUB+=	MAPPACK="@comment "
+MAPPACK_FILE= warsow_comunity_map_pack_01.zip
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MAPPACK_FILE}:mappack
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+PORTDATA+=	previews
 .endif
 
-do-install:
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} basewsw ${DATADIR}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} basewsw ${DATADIR}
+post-extract:
 .if ${PORT_OPTIONS:MMAPPACK}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} previews ${DATADIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${MAPPACK_FILE} -d ${WRKSRC}
 .endif
 
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>

Modified: head/games/warsow-data/distinfo
==============================================================================
--- head/games/warsow-data/distinfo	Sun Mar  9 12:01:27 2014	(r347564)
+++ head/games/warsow-data/distinfo	Sun Mar  9 12:11:17 2014	(r347565)
@@ -1,6 +1,4 @@
-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_1.02.tar.gz) = fe7e1469347f30822b1919d1f3e36a27b72435067b88df6310d8a65760d8252a
+SIZE (warsow/warsow_1.02.tar.gz) = 531283708
 SHA256 (warsow/warsow_comunity_map_pack_01.zip) = 58b84b10d5fbaa22e29d59194b8c5ebbc633356fbc6545a715e44a73bdd3c7e7
 SIZE (warsow/warsow_comunity_map_pack_01.zip) = 130057143
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Rene Ladan freebsd_committer freebsd_triage 2014-03-09 12:11:43 UTC
State Changed
From-To: open->closed

Committed, thanks