4 files changed, 20 insertions, 22 deletions

diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index 638c4948c5df..56f91ac2129d 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,12 +21,12 @@ USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
 MAKEFILE=	BSDmakefile
-MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -ffast-math -funroll-loops"
+MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
 ALL_TARGET=	#
 
 PLIST_FILES=	%%CLIENT%%bin/${PORTNAME}-glx %%SDL_CLIENT%%bin/${PORTNAME}-sdl \
 		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/common-spog.pk3 \
-		%%DATADIR%%/data/data20060614.pk3
+		%%DATADIR%%/data/data20060905.pk3
 PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -39,7 +38,8 @@ OPTIONS=	CLIENT		"Build GLX client"		on \
 .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/libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		${LOCALBASE}/lib/libpng.so:${PORTSDIR}/graphics/png
 .endif
 
 .if !defined(WITHOUT_CLIENT)
@@ -66,14 +66,13 @@ PLIST_SUB+=	SERVER="@comment "
 .endif
 
 pre-patch:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20060614.zip \
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20060905.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 	@${REINPLACE_CMD} -E 's,sdl-config,${SDL_CONFIG},g' \
 		${WRKSRC}/makefile.inc
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 81,$$d' \
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 88,$$d' \
 		${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
-	@${REINPLACE_CMD} -e 's,libpng12\.so\.0,libpng\.so,' ${WRKSRC}/image_png.c
 	@${REINPLACE_CMD} -e 's,RTLD_LAZY,& | RTLD_GLOBAL,' ${WRKSRC}/vid_glx.c
 
 do-build:
diff --git a/games/nexuiz/distinfo b/games/nexuiz/distinfo
index 3cbd456dea0e..de5504b455b6 100644
--- a/games/nexuiz/distinfo
+++ b/games/nexuiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (nexuiz-20.zip) = 3cabe44472a848b870685b225b1086c3
-SHA256 (nexuiz-20.zip) = ec530582a8050ddc6f270446994e83a24aa8b664f136132f5764f9a9aa192bf1
-SIZE (nexuiz-20.zip) = 199962978
+MD5 (nexuiz-21.zip) = b614b2e8e9de82085cfe3175a3d26562
+SHA256 (nexuiz-21.zip) = 4374cd921df8cd18260761840da0b83f363060e409f7921d173afaef2bc77ba2
+SIZE (nexuiz-21.zip) = 198728869
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 638c4948c5df..56f91ac2129d 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,12 +21,12 @@ USE_ZIP=	yes
 
 WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
 MAKEFILE=	BSDmakefile
-MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -ffast-math -funroll-loops"
+MAKE_ARGS=	CC="${CC}" OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
 ALL_TARGET=	#
 
 PLIST_FILES=	%%CLIENT%%bin/${PORTNAME}-glx %%SDL_CLIENT%%bin/${PORTNAME}-sdl \
 		%%SERVER%%bin/${PORTNAME}-dedicated %%DATADIR%%/data/common-spog.pk3 \
-		%%DATADIR%%/data/data20060614.pk3
+		%%DATADIR%%/data/data20060905.pk3
 PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
 
 OPTIONS=	CLIENT		"Build GLX client"		on \
@@ -39,7 +38,8 @@ OPTIONS=	CLIENT		"Build GLX client"		on \
 .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/libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		${LOCALBASE}/lib/libpng.so:${PORTSDIR}/graphics/png
 .endif
 
 .if !defined(WITHOUT_CLIENT)
@@ -66,14 +66,13 @@ PLIST_SUB+=	SERVER="@comment "
 .endif
 
 pre-patch:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20060614.zip \
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20060905.zip \
 		-d ${WRKDIR}/Nexuiz/sources
 	@${REINPLACE_CMD} -E 's,sdl-config,${SDL_CONFIG},g' \
 		${WRKSRC}/makefile.inc
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 81,$$d' \
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 88,$$d' \
 		${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
-	@${REINPLACE_CMD} -e 's,libpng12\.so\.0,libpng\.so,' ${WRKSRC}/image_png.c
 	@${REINPLACE_CMD} -e 's,RTLD_LAZY,& | RTLD_GLOBAL,' ${WRKSRC}/vid_glx.c
 
 do-build:
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index 3cbd456dea0e..de5504b455b6 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,3 +1,3 @@
-MD5 (nexuiz-20.zip) = 3cabe44472a848b870685b225b1086c3
-SHA256 (nexuiz-20.zip) = ec530582a8050ddc6f270446994e83a24aa8b664f136132f5764f9a9aa192bf1
-SIZE (nexuiz-20.zip) = 199962978
+MD5 (nexuiz-21.zip) = b614b2e8e9de82085cfe3175a3d26562
+SHA256 (nexuiz-21.zip) = 4374cd921df8cd18260761840da0b83f363060e409f7921d173afaef2bc77ba2
+SIZE (nexuiz-21.zip) = 198728869