- Update to version 2.4.2

- Switch back to using BSD make(1)
- Stop patching things at extract phase

6 files changed, 24 insertions, 28 deletions

diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 1404c8664d66..e4d5e4e62d6a 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -16,14 +15,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-NO_PACKAGE=	Package will be 455MB, set FORCE_PACKAGE if you really want to build it
+NO_PACKAGE=	Package will be 468MB, set FORCE_PACKAGE if you really want to build it
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
-MAKEFILE=	makefile
-MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
+MAKEFILE=	BSDmakefile
+MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \
+		OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
 ALL_TARGET=	#
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -72,14 +71,13 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \
+post-patch:
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080511.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
 
 do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
diff --git a/games/nexuiz/distinfo b/games/nexuiz/distinfo
index 5250658e08fd..f24d0812db42 100644
--- a/games/nexuiz/distinfo
+++ b/games/nexuiz/distinfo
@@ -1,6 +1,6 @@
-MD5 (nexuiz-24.zip) = 7ecf1e683c3db02cdbc8d4514e8e33ce
-SHA256 (nexuiz-24.zip) = 35c6972583f872794b8636bf0a0e23b336b70bdd6a6dc2624fb86e2abf6c30f4
-SIZE (nexuiz-24.zip) = 380347457
+MD5 (nexuiz-242.zip) = 2ea51368774ca603fd56faebfeac74d7
+SHA256 (nexuiz-242.zip) = ec31db254fd94508f63a5651beff73ce5c9e187e9c91f35f7616f33f082ae52b
+SIZE (nexuiz-242.zip) = 393779967
 MD5 (nexmappack_r2.zip) = e881e78e02e5e97c7c453192aab58f7d
 SHA256 (nexmappack_r2.zip) = 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
 SIZE (nexmappack_r2.zip) = 113533483
diff --git a/games/nexuiz/pkg-plist b/games/nexuiz/pkg-plist
index 05f4796f22a2..6862eb817889 100644
--- a/games/nexuiz/pkg-plist
+++ b/games/nexuiz/pkg-plist
@@ -2,7 +2,7 @@
 %%SDL_CLIENT%%bin/nexuiz-sdl
 %%SERVER%%bin/nexuiz-dedicated
 %%DATADIR%%/data/common-spog.pk3
-%%DATADIR%%/data/data20080229.pk3
+%%DATADIR%%/data/data20080511.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drdm5_beta2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drgc2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/CMP1-dm6_nex.pk3
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 1404c8664d66..e4d5e4e62d6a 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.4
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -16,14 +15,14 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-NO_PACKAGE=	Package will be 455MB, set FORCE_PACKAGE if you really want to build it
+NO_PACKAGE=	Package will be 468MB, set FORCE_PACKAGE if you really want to build it
 
 USE_ZIP=	yes
-USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
-MAKEFILE=	makefile
-MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
+MAKEFILE=	BSDmakefile
+MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \
+		OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
 ALL_TARGET=	#
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -72,14 +71,13 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \
+post-patch:
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080511.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
 
 do-build:
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index 5250658e08fd..f24d0812db42 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,6 +1,6 @@
-MD5 (nexuiz-24.zip) = 7ecf1e683c3db02cdbc8d4514e8e33ce
-SHA256 (nexuiz-24.zip) = 35c6972583f872794b8636bf0a0e23b336b70bdd6a6dc2624fb86e2abf6c30f4
-SIZE (nexuiz-24.zip) = 380347457
+MD5 (nexuiz-242.zip) = 2ea51368774ca603fd56faebfeac74d7
+SHA256 (nexuiz-242.zip) = ec31db254fd94508f63a5651beff73ce5c9e187e9c91f35f7616f33f082ae52b
+SIZE (nexuiz-242.zip) = 393779967
 MD5 (nexmappack_r2.zip) = e881e78e02e5e97c7c453192aab58f7d
 SHA256 (nexmappack_r2.zip) = 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
 SIZE (nexmappack_r2.zip) = 113533483
diff --git a/games/xonotic/pkg-plist b/games/xonotic/pkg-plist
index 05f4796f22a2..6862eb817889 100644
--- a/games/xonotic/pkg-plist
+++ b/games/xonotic/pkg-plist
@@ -2,7 +2,7 @@
 %%SDL_CLIENT%%bin/nexuiz-sdl
 %%SERVER%%bin/nexuiz-dedicated
 %%DATADIR%%/data/common-spog.pk3
-%%DATADIR%%/data/data20080229.pk3
+%%DATADIR%%/data/data20080511.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drdm5_beta2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/79drgc2_nex.pk3
 %%MAPPACK%%%%DATADIR%%/data/CMP1-dm6_nex.pk3