5 files changed, 49 insertions, 162 deletions
diff --git a/games/Makefile b/games/Makefile
index 267b508a007a..8579bed32615 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1026,6 +1026,7 @@
     SUBDIR += xoids
     SUBDIR += xoj
     SUBDIR += xonix
+    SUBDIR += xonotic
     SUBDIR += xorgramana
     SUBDIR += xosmulti
     SUBDIR += xpacman
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index ab2271b01d2d..5a3052d464dc 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -5,111 +5,81 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nexuiz
-PORTVERSION=	2.5.2
-PORTREVISION=	7
+PORTNAME=	xonotic
+PORTVERSION=	0.5.0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \
-		SF/${PORTNAME}/mappack/nexmappack_r2:mappack
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	http://dl.xonotic.org/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-LICENSE=	GPLv2
+LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
+		png.6:${PORTSDIR}/graphics/png \
+		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-# Package size below is for default set of OPTIONS
-NO_PACKAGE=	Package will be 942MB, set FORCE_PACKAGE if you really want it
+MANUAL_PACKAGE_BUILD=	huge
 
 USE_ZIP=	yes
-
-WRKSRC=		${WRKDIR}/Nexuiz/sources/darkplaces
+WRKSRC=		${WRKDIR}/Xonotic/source/darkplaces
 MAKEFILE=	BSDmakefile
-MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \
-		DP_PRELOAD_DEPENDENCIES=yes DP_LINK_TO_LIBJPEG=yes \
-		CFLAGS_LIBJPEG="-I${LOCALBASE}/include" \
+MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" \
+		DP_PRELOAD_DEPENDENCIES=yes \
+		CFLAGS_LIBJPEG="-I${LOCALBASE}/include -DLINK_TO_LIBJPEG" \
 		OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops"
+MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	#
+BINARIES=	#
 
-OPTIONS=	CLIENT		"Build GLX client"		on \
-		SDL_CLIENT	"Build SDL client"		on \
-		SERVER		"Build dedicated server"	on \
-		MAPPACK		"Install community map pack"	on
+OPTIONS=	CLIENT		"Build SDL client"		on \
+		SERVER		"Build dedicated server"	on
 
 .include <bsd.port.pre.mk>
 
-.if !(defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT) || defined(WITH_SERVER))
-IGNORE=		requires at least one of [SDL_]CLIENT or SERVER options
-.endif
-
-.if !defined(WITHOUT_MAPPACK)
-DISTFILES+=	nexmappack_r2${EXTRACT_SUFX}:mappack
-PLIST_SUB+=	MAPPACK=""
-.else
-PLIST_SUB+=	MAPPACK="@comment "
-.endif
-
-LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
-		jpeg.11:${PORTSDIR}/graphics/jpeg
-.if defined(WITH_CLIENT) || defined(WITH_SDL_CLIENT)
-LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug \
-		png.6:${PORTSDIR}/graphics/png \
-		theora.0:${PORTSDIR}/multimedia/libtheora
+.if !(defined(WITH_CLIENT) || defined(WITH_SERVER))
+IGNORE=		requires at least one of CLIENT or SERVER options
 .endif
 
 .if !defined(WITHOUT_CLIENT)
-USE_GL=		glut
-USE_XORG=	x11 xpm xxf86vm xxf86dga xext
-ALL_TARGET+=	cl-release
-PLIST_SUB+=	CLIENT=""
-.else
-PLIST_SUB+=	CLIENT="@comment "
-.endif
-
-.if !defined(WITHOUT_SDL_CLIENT)
+LIB_DEPENDS+=	modplug.1:${PORTSDIR}/audio/libmodplug \
+		theora.0:${PORTSDIR}/multimedia/libtheora \
+		vorbis.4:${PORTSDIR}/audio/libvorbis \
+		ogg.7:${PORTSDIR}/audio/libogg
 USE_SDL=	sdl
 ALL_TARGET+=	sdl-release
-PLIST_SUB+=	SDL_CLIENT=""
-.else
-PLIST_SUB+=	SDL_CLIENT="@comment "
+BINARIES+=	xonotic-sdl
 .endif
 
 .if !defined(WITHOUT_SERVER)
 ALL_TARGET+=	sv-release
-PLIST_SUB+=	SERVER=""
-.else
-PLIST_SUB+=	SERVER="@comment "
+BINARIES+=	xonotic-dedicated
 .endif
 
-post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20091001.zip \
-		-d ${WRKDIR}/Nexuiz/sources
+.for f in ${BINARIES}
+PLIST_FILES+=	bin/${f}
+.endfor
+
+PORTDATA=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \
 		${WRKSRC}/${MAKEFILE} ${WRKSRC}/makefile.inc
 	@${REINPLACE_CMD} -e '/LDFLAGS_BSDSV/s,$$,-L${LOCALBASE}/lib,' \
 		${WRKSRC}/makefile.inc
-# Fix for libpng 1.4
-	@${REINPLACE_CMD} -e 's,gray_1_2_4_to_8,expand_&,g' \
-		${WRKSRC}/image_png.c
+	@${ECHO_CMD} >> ${WRKSRC}/prvm_offsets.h # silence 'no newline' warnings
 
 do-install:
-	${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*[^vpj]" | \
-		while read f ; do ${INSTALL_PROGRAM} $${f} \
-			${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done'
-	@${MKDIR} ${DATADIR}/data ${DATADIR}/havoc
-	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/*.pk3 ${DATADIR}/data
-	${INSTALL_DATA} ${WRKDIR}/Nexuiz/havoc/*.pk3 ${DATADIR}/havoc
-.if !defined(WITHOUT_MAPPACK)
-	${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${DATADIR}/data
-.endif
+.for f in ${BINARIES}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f:C/xonotic/darkplaces/} ${PREFIX}/bin/${f}
+.endfor
+.if !defined(NOPORTDATA)
+	${MKDIR} ${DATADIR}/data
+	${INSTALL_DATA} ${WRKDIR}/Xonotic/data/*.pk3 ${DATADIR}/data/
 .if !defined(WITHOUT_SERVER)
-	cd ${WRKDIR}/Nexuiz && ${COPYTREE_SHARE} server ${DATADIR}
+	cd ${WRKDIR}/Xonotic && ${COPYTREE_SHARE} server ${DATADIR}
 # Fixup lost +x permissions on scripts after COPYTREE_SHARE
 	${FIND} ${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \
 		${XARGS} ${CHMOD} +x
 .endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index 044abf4a7918..c78764937516 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,4 +1,2 @@
-SHA256 (nexuiz-252.zip) = a5e27ebcc9775c4a490d0d3536c32e4a8f8f96b038c0b6a78d1823c37a962000
-SIZE (nexuiz-252.zip) = 931253731
-SHA256 (nexmappack_r2.zip) = 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
-SIZE (nexmappack_r2.zip) = 113533483
+SHA256 (xonotic-0.5.0.zip) = 58e7226a8b534858f8161c378071f4dab168e2c683f1f986e6e65be75a5b730f
+SIZE (xonotic-0.5.0.zip) = 988512100
diff --git a/games/xonotic/pkg-descr b/games/xonotic/pkg-descr
index a982bdf33472..8be1e5ab0a5d 100644
--- a/games/xonotic/pkg-descr
+++ b/games/xonotic/pkg-descr
@@ -1,21 +1,9 @@
-Nexuiz is a fast-paced, chaotic, and intense multiplayer first person
-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
-lighting and stencil shadows, bumpmapping, gloss, bloom, and totally
-rewritten network code that supports up to 64 players on a single server.
-While quality gameplay was our primary goal, its graphics technology and
-artwork allows the game to compete with the current quality of commercial
-games.
-
-Any online deathmatch fan will instantly feel at home with Nexuiz' weapons
-and movement style.  The fast server browser and quick loading time allows
-you to jump right into a game at a moments notice and play a quick game.
-
-Now it also comes with community map pack compiled by Strahlemann.  It
-includes 35 maps, and a campaign mode for the user to fight through.  The
-map pack includes Quake3 community maps, Nexuiz community maps, and some
-new maps from Nexuiz developers.
-
-WWW: http://www.nexuiz.com/classic.php
+Xonotic is a free (GPL), fast-paced first-person shooter that works
+on Windows, OS X and Linux. The project is geared towards providing
+addictive arena shooter gameplay which is all spawned and driven
+by the community itself. Xonotic is a direct successor of the Nexuiz
+project with years of development between them, and it aims to
+become the best possible open-source FPS (first-person-shooter) of
+its kind.
+
+WWW:	http://www.xonotic.org/
diff --git a/games/xonotic/pkg-plist b/games/xonotic/pkg-plist
deleted file mode 100644
index 64f4ea3e28c3..000000000000
--- a/games/xonotic/pkg-plist
+++ /dev/null
@@ -1,70 +0,0 @@
-%%CLIENT%%bin/nexuiz-glx
-%%SDL_CLIENT%%bin/nexuiz-sdl
-%%SERVER%%bin/nexuiz-dedicated
-%%DATADIR%%/data/common-spog.pk3
-%%DATADIR%%/data/data20091001.pk3
-%%DATADIR%%/havoc/data20091001havoc.pk3
-@dirrm %%DATADIR%%/havoc
-%%MAPPACK%%%%DATADIR%%/data/79drdm5_beta2_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/79drgc2_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/CMP1-dm6_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/HandsOfGod_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/acid3dm5_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/af3hex_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/ame7q3dm3_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/ame7q3tny1_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/apocalyptica_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/bal3dm3_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/bal3dm5_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/batcula_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/chronic_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/cttourney1_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/distonic_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/dubneoc_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/geo-core_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/hal_palindrome_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/ikzdm1_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/jaxtourney2_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/klzegypt_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/ktsdm4_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/mIKEctf2_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/map-gleeb_geocomp3_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/mappack.pk3
-%%MAPPACK%%%%DATADIR%%/data/monolith_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/pukka3dm2_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/puma3tourney4_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/q3skoredm1_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/qbeast_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/qdolphin_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/quimera_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/quintdm3_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/redm04_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/storm3dm3_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/straledm5_nex.pk3
-%%MAPPACK%%%%DATADIR%%/data/zpdm01_nex.pk3
-%%SERVER%%%%DATADIR%%/server/rcon2irc/echo-rcon.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/fastest_lap.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/irc_nick_change.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/joinmessage.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/joinsparts.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/ping-pl.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/raw.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/rbiserver.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/rcon2irc-example.conf
-%%SERVER%%%%DATADIR%%/server/rcon2irc/rcon2irc.pl
-%%SERVER%%%%DATADIR%%/server/rcon2irc/rcon2irc.txt
-%%SERVER%%%%DATADIR%%/server/rcon2irc/suggestmap.pl
-%%SERVER%%@dirrm %%DATADIR%%/server/rcon2irc
-%%SERVER%%%%DATADIR%%/server/help.cfg
-%%SERVER%%%%DATADIR%%/server/rcon.pl
-%%SERVER%%%%DATADIR%%/server/readme.txt
-%%SERVER%%%%DATADIR%%/server/server.cfg
-%%SERVER%%%%DATADIR%%/server/server_havoc_linux.sh
-%%SERVER%%%%DATADIR%%/server/server_havoc_mac.sh
-%%SERVER%%%%DATADIR%%/server/server_havoc_windows.bat
-%%SERVER%%%%DATADIR%%/server/server_linux.sh
-%%SERVER%%%%DATADIR%%/server/server_mac.sh
-%%SERVER%%%%DATADIR%%/server/server_windows.bat
-%%SERVER%%@dirrm %%DATADIR%%/server
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%