ports/134071: [patch] Port update to Nexuiz 2.5

[Mak Kolybabi]

>Number:         134071
>Category:       ports
>Synopsis:       [patch] Port update to Nexuiz 2.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 28 21:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Mak Kolybabi
>Release:        7.2-PRERELEASE
>Organization:
>Environment:
FreeBSD vobster.nepharia.org 7.2-PRERELEASE FreeBSD 7.2-PRERELEASE #0: Wed Apr 15 04:54:46 CDT 2009     root at vobster.nepharia.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
The version of Nexuiz provided in the ports tree (2.4.2) is not the most current.
>How-To-Repeat:
Not Applicable.
>Fix:
Apply the attached patch.

Please note that I have not been able to test the GLX and SDL clients, as I only have a headless server. The dedicated server worked well for me, though.

I have removed one minor sed rewrite that I'm not sure is still needed.


Patch attached with submission follows:

diff -ruN nexuiz24/Makefile nexuiz/Makefile
--- nexuiz24/Makefile	2009-01-23 16:27:28.000000000 +0000
+++ nexuiz/Makefile	2009-04-28 20:51:03.000000000 +0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -73,28 +73,29 @@
 .endif
 
 post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080511.zip \
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20090403.zip \
+		-d ${WRKDIR}/Nexuiz/sources
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/fteqcc-binaries-and-source-rev3148.zip \
+		-d ${WRKDIR}/Nexuiz/sources
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/gamesource20090403.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE} \
-	    ${WRKSRC}/makefile.inc
-# Make Nexuiz' lhnetaddress structure really compatible with FreeBSD's
-# sockaddr_in, and fix value for LHNETADDRESSTYPE_INET6_FAMILY
-	@${REINPLACE_CMD} -e 's,10,28, ; \
-		s,short family,char sin_len; unsigned char family,' \
-			${WRKSRC}/lhnet.h
+		${WRKSRC}/makefile.inc
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*[^vp]" | \
+	${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*" | ${GREP} -v "\." | \
 		while read f ; do ${INSTALL_PROGRAM} $${f} \
 			${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done'
 	@${MKDIR} ${DATADIR}/data
 	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/*.pk3 ${DATADIR}/data
+	@${MKDIR} ${DATADIR}/havoc
+	${INSTALL_DATA} ${WRKDIR}/Nexuiz/havoc/*.pk3 ${DATADIR}/havoc
 .if !defined(WITHOUT_MAPPACK)
 	${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${DATADIR}/data
 .endif
diff -ruN nexuiz24/distinfo nexuiz/distinfo
--- nexuiz24/distinfo	2008-06-18 19:18:44.000000000 +0000
+++ nexuiz/distinfo	2009-04-28 06:47:58.000000000 +0000
@@ -1,6 +1,6 @@
-MD5 (nexuiz-242.zip) = 2ea51368774ca603fd56faebfeac74d7
-SHA256 (nexuiz-242.zip) = ec31db254fd94508f63a5651beff73ce5c9e187e9c91f35f7616f33f082ae52b
-SIZE (nexuiz-242.zip) = 393779967
+MD5 (nexuiz-25.zip) = e9489cf81f6a2ed5776ad98bbf76e57c
+SHA256 (nexuiz-25.zip) = 23d3bc2f0d87db1c0919a0ffcec9a2a6741a724376deb6b829d6834d5a802a79
+SIZE (nexuiz-25.zip) = 666902063
 MD5 (nexmappack_r2.zip) = e881e78e02e5e97c7c453192aab58f7d
 SHA256 (nexmappack_r2.zip) = 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
 SIZE (nexmappack_r2.zip) = 113533483
diff -ruN nexuiz24/pkg-plist nexuiz/pkg-plist
--- nexuiz24/pkg-plist	2008-06-18 19:18:44.000000000 +0000
+++ nexuiz/pkg-plist	2009-04-28 18:52:27.000000000 +0000
@@ -2,7 +2,8 @@
 %%SDL_CLIENT%%bin/nexuiz-sdl
 %%SERVER%%bin/nexuiz-dedicated
 %%DATADIR%%/data/common-spog.pk3
-%%DATADIR%%/data/data20080511.pk3
+%%DATADIR%%/data/data20090403.pk3
+%%DATADIR%%/havoc/data20090403havoc.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drdm5_beta2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drgc2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/CMP1-dm6_nex.pk3
@@ -41,4 +42,5 @@
 %%MAPPACK%%%%DATADIR%%/data/straledm5_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/zpdm01_nex.pk3
 @dirrm %%DATADIR%%/data
+ at dirrm %%DATADIR%%/havoc
 @dirrm %%DATADIR%%


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