From dierk@blaxxtarz.de  Sat Mar 17 03:15:21 2007
Return-Path: <dierk@blaxxtarz.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E8F6916A402
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Mar 2007 03:15:21 +0000 (UTC)
	(envelope-from dierk@blaxxtarz.de)
Received: from smtprelay03.ispgateway.de (smtprelay03.ispgateway.de [80.67.18.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 53AAC13C44B
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Mar 2007 03:15:21 +0000 (UTC)
	(envelope-from dierk@blaxxtarz.de)
Received: (qmail 14921 invoked from network); 17 Mar 2007 02:48:40 -0000
Received: from unknown (HELO maxx.evangelion.free) (799978@[88.72.49.230])
          (envelope-sender <dierk@blaxxtarz.de>)
          by smtprelay03.ispgateway.de (qmail-ldap-1.03) with AES256-SHA encrypted SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 17 Mar 2007 02:48:40 -0000
Received: from [192.168.123.1] (helo=blaxxtarz.evangelion.free)
	by maxx.evangelion.free with esmtps (Exim 4.66 #0 (Unix))
	id 1HSOxe-0000MX-7G; Sat, 17 Mar 2007 03:48:04 +0100
Received: from blaxxtarz.evangelion.free (localhost [127.0.0.1])
	by blaxxtarz.evangelion.free (8.13.8/8.13.8) with ESMTP id l2H2m1D1081973;
	Sat, 17 Mar 2007 03:48:01 +0100 (CET)
	(envelope-from dierk@blaxxtarz.evangelion.free)
Received: (from dierk@localhost)
	by blaxxtarz.evangelion.free (8.13.8/8.13.8/Submit) id l2H2m1Uq081972;
	Sat, 17 Mar 2007 03:48:01 +0100 (CET)
	(envelope-from dierk)
Message-Id: <200703170248.l2H2m1Uq081972@blaxxtarz.evangelion.free>
Date: Sat, 17 Mar 2007 03:48:01 +0100 (CET)
From: Dierk Sacher <usenet01@blaxxtarz.de>
Reply-To: Dierk Sacher <usenet01@blaxxtarz.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: danfe@freebsd.org
Subject: games/nexuiz upgrade to 2.2.3 and fixed PATCH_DEPEND
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         110418
>Category:       ports
>Synopsis:       games/nexuiz upgrade to 2.2.3 and fixed PATCH_DEPEND
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 17 03:20:04 GMT 2007
>Closed-Date:    Mon Mar 19 11:35:26 GMT 2007
>Last-Modified:  Mon Mar 19 11:35:26 GMT 2007
>Originator:     Dierk Sacher
>Release:        FreeBSD 6.2-RELEASE-p2 i386
>Organization:
DSITC
>Environment:
System: FreeBSD blaxxtarz.evangelion.free 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Sat Mar 10 19:30:14 CET 2007 root@blaxxtarz.evangelion.free:/usr/obj/usr/src/sys/BLAXXTARZ61 i386


	
>Description:
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
	
>How-To-Repeat:
	
>Fix:

	

--- nexuiz-update.diff begins here ---
diff -u -r nexuiz.old/Makefile nexuiz/Makefile
--- nexuiz.old/Makefile	Fri Sep 22 16:39:32 2006
+++ nexuiz/Makefile	Sat Mar 17 03:31:08 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,13 +26,15 @@
 
 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))
@@ -66,7 +68,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
diff -u -r 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
--- nexuiz-update.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Mar 17 03:20:14 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110418 

From: Dierk Sacher <usenet01@blaxxtarz.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/110418: games/nexuiz upgrade to 2.2.3 and fixed PATCH_DEPEND
Date: Sat, 17 Mar 2007 09:32:42 +0100

 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
 
State-Changed-From-To: open->closed 
State-Changed-By: danfe 
State-Changed-When: Mon Mar 19 11:35:10 UTC 2007 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=110418 
>Unformatted:
