- Update to version 1.2.1

- Remove now inaccurate numbers from pkg-descr

6 files changed, 32 insertions, 38 deletions

diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 95b94380846a..ebbba21f6211 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}${EXTRACT_SUFX} \
-		patch${PORTVERSION:S/.//g}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-NO_PACKAGE=	Package will be 156MB, set FORCE_PACKAGE if you really want to build it
+NO_PACKAGE=	Package will be 159MB, set FORCE_PACKAGE if you really want to build it
 
 USE_REINPLACE=	yes
 USE_ZIP=	yes
 
-WRKSRC=		${WRKDIR}/sources/darkplaces
+WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
 MAKEFILE=	makefile.bsd
 MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -ffast-math -funroll-loops"
 ALL_TARGET=	#
 
 PLIST_FILES=	%%CLIENT%%bin/${PORTNAME}-glx %%SDL_CLIENT%%bin/${PORTNAME}-sdl \
-		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/data20050531.pk3 \
-		%%DATADIR%%/data/data20050629.pk3
+		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/data20050905-full.pk3
 PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -66,9 +64,11 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g' \
-		${WRKSRC}/makefile.inc
+pre-patch:
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/${PORTNAME}enginesource20050911.zip \
+		-d ${WRKDIR}/Nexuiz/sources
+	@${REINPLACE_CMD} -E 's,sdl-config,sdl11-config,g; 161,165d; \
+		s,^#(LDFLAGS_UNIXCL),\1,' ${WRKSRC}/makefile.inc
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 74,$$d' \
 		${WRKSRC}/${MAKEFILE}
 	@${ECHO_CMD} 'LDFLAGS_SDL=$$(LDFLAGS_BSDSDL)' >> ${WRKSRC}/${MAKEFILE}
@@ -79,9 +79,9 @@ do-build:
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nexuiz-* ${PREFIX}/bin
+	${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*[^vp]" | while read f ; \
+		do ${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done'
 	@${MKDIR} ${DATADIR}/data
-	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/data20050531.pk3 \
-		${WRKDIR}/data/data20050629.pk3 ${DATADIR}/data
+	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/data20050905-full.pk3 ${DATADIR}/data
 
 .include <bsd.port.post.mk>
diff --git a/games/nexuiz/distinfo b/games/nexuiz/distinfo
index 3c228c67d22f..eca8fc5f1925 100644
--- a/games/nexuiz/distinfo
+++ b/games/nexuiz/distinfo
@@ -1,4 +1,2 @@
-MD5 (nexuiz.zip) = 43fbe6322931460b69ff257df1eb0bee
-SIZE (nexuiz.zip) = 161541758
-MD5 (patch11.zip) = b94642ca4932682e400ef79c5edef5ec
-SIZE (patch11.zip) = 15013902
+MD5 (nexuiz121.zip) = d5f31c9e1199abbe3a89ea9bf6b7515e
+SIZE (nexuiz121.zip) = 171720620
diff --git a/games/nexuiz/pkg-descr b/games/nexuiz/pkg-descr
index 38731f1e1f01..47ce8ee2f5d5 100644
--- a/games/nexuiz/pkg-descr
+++ b/games/nexuiz/pkg-descr
@@ -1,6 +1,5 @@
 Nexuiz is a fast-paced, chaotic, and intense multiplayer first person
-shooter, focused on providing basic, old style deathmatch.  This release
-includes 17 maps, 28 playable characters, and 10 music tracks.
+shooter, focused on providing basic, old style deathmatch.
 
 Nexuiz is built on the power of the Darkplaces engine, which is a heavily
 modified version of the original Quake.  Darkplaces features realtime
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 95b94380846a..ebbba21f6211 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${PORTNAME}${EXTRACT_SUFX} \
-		patch${PORTVERSION:S/.//g}${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-NO_PACKAGE=	Package will be 156MB, set FORCE_PACKAGE if you really want to build it
+NO_PACKAGE=	Package will be 159MB, set FORCE_PACKAGE if you really want to build it
 
 USE_REINPLACE=	yes
 USE_ZIP=	yes
 
-WRKSRC=		${WRKDIR}/sources/darkplaces
+WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
 MAKEFILE=	makefile.bsd
 MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -ffast-math -funroll-loops"
 ALL_TARGET=	#
 
 PLIST_FILES=	%%CLIENT%%bin/${PORTNAME}-glx %%SDL_CLIENT%%bin/${PORTNAME}-sdl \
-		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/data20050531.pk3 \
-		%%DATADIR%%/data/data20050629.pk3
+		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/data20050905-full.pk3
 PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -66,9 +64,11 @@ PLIST_SUB+=	SERVER=""
 PLIST_SUB+=	SERVER="@comment "
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -e 's,sdl-config,sdl11-config,g' \
-		${WRKSRC}/makefile.inc
+pre-patch:
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/${PORTNAME}enginesource20050911.zip \
+		-d ${WRKDIR}/Nexuiz/sources
+	@${REINPLACE_CMD} -E 's,sdl-config,sdl11-config,g; 161,165d; \
+		s,^#(LDFLAGS_UNIXCL),\1,' ${WRKSRC}/makefile.inc
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 74,$$d' \
 		${WRKSRC}/${MAKEFILE}
 	@${ECHO_CMD} 'LDFLAGS_SDL=$$(LDFLAGS_BSDSDL)' >> ${WRKSRC}/${MAKEFILE}
@@ -79,9 +79,9 @@ do-build:
 		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nexuiz-* ${PREFIX}/bin
+	${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*[^vp]" | while read f ; \
+		do ${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done'
 	@${MKDIR} ${DATADIR}/data
-	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/data20050531.pk3 \
-		${WRKDIR}/data/data20050629.pk3 ${DATADIR}/data
+	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/data20050905-full.pk3 ${DATADIR}/data
 
 .include <bsd.port.post.mk>
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index 3c228c67d22f..eca8fc5f1925 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,4 +1,2 @@
-MD5 (nexuiz.zip) = 43fbe6322931460b69ff257df1eb0bee
-SIZE (nexuiz.zip) = 161541758
-MD5 (patch11.zip) = b94642ca4932682e400ef79c5edef5ec
-SIZE (patch11.zip) = 15013902
+MD5 (nexuiz121.zip) = d5f31c9e1199abbe3a89ea9bf6b7515e
+SIZE (nexuiz121.zip) = 171720620
diff --git a/games/xonotic/pkg-descr b/games/xonotic/pkg-descr
index 38731f1e1f01..47ce8ee2f5d5 100644
--- a/games/xonotic/pkg-descr
+++ b/games/xonotic/pkg-descr
@@ -1,6 +1,5 @@
 Nexuiz is a fast-paced, chaotic, and intense multiplayer first person
-shooter, focused on providing basic, old style deathmatch.  This release
-includes 17 maps, 28 playable characters, and 10 music tracks.
+shooter, focused on providing basic, old style deathmatch.
 
 Nexuiz is built on the power of the Darkplaces engine, which is a heavily
 modified version of the original Quake.  Darkplaces features realtime