Bug 110418 - games/nexuiz upgrade to 2.2.3 and fixed PATCH_DEPEND
Summary: games/nexuiz upgrade to 2.2.3 and fixed PATCH_DEPEND
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: Alexey Dokuchaev
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-03-17 03:20 UTC by Dierk Sacher
Modified: 2007-03-19 11:35 UTC (History)
1 user (show)

See Also:


Attachments
nexuiz-update.diff (1.65 KB, patch)
2007-03-17 03:20 UTC, Dierk Sacher
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Dierk Sacher 2007-03-17 03:20:04 UTC
update to 2.2.3
fixed a missing PATCH_DEPEND for unzip in patch stage which is only triggered in tinderbox build (it's very unlikely that someone will remove extract dependencies directly after extract stage as tinderbox does, which triggers the problem, also FORCE_PACKAGE is required) USE_ZIP only guaranties existance of unzip in extract stage as far is I understand
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-03-17 03:20:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->danfe

Over to maintainer
Comment 2 Dierk Sacher 2007-03-17 08:32:42 UTC
Next try. New patch. This time _with_ working mapdownload. They
hardwired libcurl! The patch will tell you all the gory details. I did
some little testdriving and it did work. To make _really_ shure _all_
the possible implications of changing from libcurl.so.3 to libcurl.so.4
have been dealt with, it would take a much bigger amount of work to
review all their code. I don't think its worth the time - its just a
game.

here comes the patch (which is against orig and not against the former
patch):


diff -d -r -u nexuiz.old/Makefile nexuiz/Makefile
--- nexuiz.old/Makefile	Fri Sep 22 16:39:32 2006
+++ nexuiz/Makefile	Sat Mar 17 09:07:47 2007
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.1
+PORTVERSION=	2.2.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,20 +26,23 @@
 
 PLIST_FILES=	%%CLIENT%%bin/${PORTNAME}-glx %%SDL_CLIENT%%bin/${PORTNAME}-sdl \
 		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/common-spog.pk3 \
-		%%DATADIR%%/data/data20060905.pk3
+		%%DATADIR%%/data/data20070123.pk3
 PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
 		SDL_CLIENT	"Build SDL client"		on \
 		SERVER		"Build dedicated server"	on
 
+PATCH_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
+
 .include <bsd.port.pre.mk>
 
 .if !(defined(WITHOUT_CLIENT) && defined(WITHOUT_SDL_CLIENT))
 # Loads libraries on run-time, thus RUN_DEPENDS
 RUN_DEPENDS=	${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		${LOCALBASE}/lib/libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		${LOCALBASE}/lib/libpng.so:${PORTSDIR}/graphics/png
+		${LOCALBASE}/lib/libpng.so:${PORTSDIR}/graphics/png \
+		${LOCALBASE}/lib/libcurl.so:${PORTSDIR}/ftp/curl
 .endif
 
 .if !defined(WITHOUT_CLIENT)
@@ -66,7 +69,7 @@
 .endif
 
 pre-patch:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20060905.zip \
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20070123.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 	@${REINPLACE_CMD} -E 's,sdl-config,${SDL_CONFIG},g' \
 		${WRKSRC}/makefile.inc
@@ -74,6 +77,7 @@
 		${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
 	@${REINPLACE_CMD} -e 's,RTLD_LAZY,& | RTLD_GLOBAL,' ${WRKSRC}/vid_glx.c
+	@${REINPLACE_CMD} -e 's,libcurl\.so\.3,libcurl\.so\.4,' ${WRKSRC}/libcurl.c
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
diff -d -r -u nexuiz.old/distinfo nexuiz/distinfo
--- nexuiz.old/distinfo	Fri Sep 22 16:39:32 2006
+++ nexuiz/distinfo	Sat Mar 17 01:50:39 2007
@@ -1,3 +1,3 @@
-MD5 (nexuiz-21.zip) = b614b2e8e9de82085cfe3175a3d26562
-SHA256 (nexuiz-21.zip) = 4374cd921df8cd18260761840da0b83f363060e409f7921d173afaef2bc77ba2
-SIZE (nexuiz-21.zip) = 198728869
+MD5 (nexuiz-223.zip) = 953fda1555fc1f9ca040bdbb797eb0fd
+SHA256 (nexuiz-223.zip) = fef9d5bb3edf56e4db1e5db2d66150b5d3e619870b5d32df9263f70f8120395a
+SIZE (nexuiz-223.zip) = 199639016
Comment 3 Alexey Dokuchaev freebsd_committer freebsd_triage 2007-03-19 11:35:10 UTC
State Changed
From-To: open->closed

Committed, thanks.