- Update to version 2.3, the latest to date

- Add a knob to install community map pack, default to on
- Utilize pkg-plist due to increased number of files installed

4 files changed, 72 insertions, 16 deletions

diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index 453cecaf1e34..b0b33412cc76 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	nexuiz
-PORTVERSION=	2.2.3
-PORTREVISION=	2
+PORTVERSION=	2.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A fast-paced, chaotic, and intense multiplayer first person shooter
 
-NO_PACKAGE=	Package will be 180MB, set FORCE_PACKAGE if you really want to build it
+NO_PACKAGE=	Package will be 368MB, set FORCE_PACKAGE if you really want to build it
 
 USE_ZIP=	yes
 
@@ -25,17 +25,20 @@ MAKEFILE=	BSDmakefile
 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/data20070123.pk3
-PLIST_DIRS=	%%DATADIR%%/data %%DATADIR%%
-
 OPTIONS=	CLIENT		"Build GLX client"		on \
 		SDL_CLIENT	"Build SDL client"		on \
-		SERVER		"Build dedicated server"	on
+		SERVER		"Build dedicated server"	on \
+		MAPPACK		"Install community map pack"	on
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_MAPPACK)
+DISTFILES+=	nexmappack_r2${EXTRACT_SUFX}
+PLIST_SUB+=	MAPPACK=""
+.else
+PLIST_SUB+=	MAPPACK="@comment "
+.endif
+
 .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 \
@@ -68,13 +71,11 @@ PLIST_SUB+=	SERVER="@comment "
 .endif
 
 post-extract:
-	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20070123.zip \
+	@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20070531.zip \
 		-d ${WRKDIR}/Nexuiz/sources
-	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 88,$$d' \
+	@${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},; 96,$$d' \
 		${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
-	@${REINPLACE_CMD} -e 's,RTLD_LAZY,& | RTLD_GLOBAL,' ${WRKSRC}/vid_glx.c
-	@${REINPLACE_CMD} -E 's,(libcurl\.so)\.3,\1,' ${WRKSRC}/libcurl.c
 
 do-build:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
@@ -85,5 +86,8 @@ do-install:
 		do ${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done'
 	@${MKDIR} ${DATADIR}/data
 	${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/*.pk3 ${DATADIR}/data
+.if !defined(WITHOUT_MAPPACK)
+	${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${DATADIR}/data
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/xonotic/distinfo b/games/xonotic/distinfo
index f7bb6dcf2f21..2cf130f2fabb 100644
--- a/games/xonotic/distinfo
+++ b/games/xonotic/distinfo
@@ -1,3 +1,6 @@
-MD5 (nexuiz-223.zip) = 953fda1555fc1f9ca040bdbb797eb0fd
-SHA256 (nexuiz-223.zip) = fef9d5bb3edf56e4db1e5db2d66150b5d3e619870b5d32df9263f70f8120395a
-SIZE (nexuiz-223.zip) = 199639016
+MD5 (nexuiz-23.zip) = b60c1f5198135463d00261646ae26911
+SHA256 (nexuiz-23.zip) = 232c08f3e0fa67ca3fd63995d3f6c88cbb9f771c96d4159c085151906cc43074
+SIZE (nexuiz-23.zip) = 286217879
+MD5 (nexmappack_r2.zip) = e881e78e02e5e97c7c453192aab58f7d
+SHA256 (nexmappack_r2.zip) = 15088c7632e0b4f487c789fba4296f44ef5a5d83b51adcb9e603e289e5b8241e
+SIZE (nexmappack_r2.zip) = 113533483
diff --git a/games/xonotic/pkg-descr b/games/xonotic/pkg-descr
index 47ce8ee2f5d5..720a0e2fcf49 100644
--- a/games/xonotic/pkg-descr
+++ b/games/xonotic/pkg-descr
@@ -13,4 +13,9 @@ 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/
diff --git a/games/xonotic/pkg-plist b/games/xonotic/pkg-plist
new file mode 100644
index 000000000000..af3e8e0ee04b
--- /dev/null
+++ b/games/xonotic/pkg-plist
@@ -0,0 +1,44 @@
+%%CLIENT%%bin/nexuiz-glx
+%%SDL_CLIENT%%bin/nexuiz-sdl
+%%SERVER%%bin/nexuiz-dedicated
+%%DATADIR%%/data/common-spog.pk3
+%%DATADIR%%/data/data20070531.pk3
+%%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
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%