- Update to version 20150621 and unbreak

- Remove judgemental wording from COMMENT
- Fix the code to avoid using `sys/dir.h'
- Install more popular games' gamepacks
- Fix some Makefile QA warnings while here

4 files changed, 168 insertions, 57 deletions

diff --git a/games/netradiant/Makefile b/games/netradiant/Makefile
index 5f90b4b8da04..a8dd29f3c82f 100644
--- a/games/netradiant/Makefile
+++ b/games/netradiant/Makefile
@@ -2,55 +2,75 @@
 # $FreeBSD$
 
 PORTNAME=	netradiant
-PORTVERSION=	20130630
-PORTREVISION=	8
+PORTVERSION=	20150621
 CATEGORIES=	games cad
-MASTER_SITES=	http://ingar.satgnu.net/gtkradiant/files/ \
-		http://freebsd.nsu.ru/distfiles/
+MASTER_SITES=	http://ingar.intranifty.net/gtkradiant/files/ LOCAL/danfe \
+		http://ingar.intranifty.net/gtkradiant/files/gamepacks/:gp
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} q3map2.6
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${_DISTFILES:Nq3map2.6}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Fork of the well-known GtkRadiant 1.5 FPS games map editor
+COMMENT=	Fork of GtkRadiant v1.5 FPS games map editor
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
-		libwebp.so:graphics/webp
-
-BROKEN=		No more public distfiles and uses sys/dir.h
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libwebp.so:graphics/webp \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 
 BROKEN_aarch64=		fails to link: ldd: install/modules/archivepak.so: not a FreeBSD ELF shared object
 BROKEN_armv6=		fails to build: h2data.armv6: No such file or directory
 BROKEN_armv7=		fails to build: h2data.armv7: No such file or directory
 
 USES=		compiler:c++11-lang gl gmake gnome jpeg localbase:ldflags \
-		pkgconfig tar:bzip2
-USE_GL=		glu
-MAKE_ENV=	BUILD=release DOWNLOAD_GAMEPACKS=no LIBS_DL="" \
+		pkgconfig tar:xz
+USE_GL=		gl glu
+USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango pangox-compat
+USE_XORG=	x11
+MAKE_ENV=	BUILD=release DOWNLOAD_GAMEPACKS=no EXE=${ARCH} \
 		RADIANT_ABOUTMSG="For ${OPSYS} ${OSREL} (${ARCH})"
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	ARCH=${ARCH:S/powerpc64/powerpc/}
 PLIST_SUB:=	${SUB_LIST}
 
+OPTIONS_DEFINE=	GAMEPACK
+OPTIONS_DEFAULT=	GAMEPACK
+GAMEPACK_DESC=	Install gamepacks for some popular games
+OPTIONS_SUB=	yes
+
+GAMES=	DarkPlaces Doom3 ET Neverball Nexuiz OpenArena Osirion Quake1 \
+	Quake2 Quake2World Quake3 Quake4 Quake Quetoo Tremulous UFOAI \
+	Unvanquished Warsow Xonotic
+GAMEPACK_DISTFILES= ${GAMES:S/$/Pack.zip:gp/}
+
 post-patch:
+	@${REINPLACE_CMD} -e '/#include/s,<sys/dir,&ent,' \
+		${WRKSRC}/tools/quake2/qdata/qdata.c
+	@${REINPLACE_CMD} -e 's,#ifndef WIN32,#ifdef NeXT,' \
+		${WRKSRC}/tools/quake3/q3data/q3data.c
 # Add missing checks for __FreeBSD__
 	@${FIND} ${WRKSRC}/tools -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's/__linux__/__${OPSYS}__ ) || defined ( &/'
 
 pre-install:
-# Fix permissions of some files (drop bogus execute bit)
-	@${FIND} ${WRKSRC}/install/osirion.game -type f | ${XARGS} ${CHMOD} a-x
-	@${CHMOD} a-x ${WRKSRC}/install/games/osirion.game
 # Remove a copy of GNU GPL from what we are going to install
 	@${RM} ${WRKSRC}/install/GPL.txt
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
+	@${RMDIR} ${WRKSRC}/install/games
 	${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${DISTDIR}/q3map2.6 ${STAGEDIR}${MANPREFIX}/man/man6
 
+do-install-GAMEPACK-on:
+.for g in ${GAMES}
+	${CP} -a ${WRKDIR}/${g}Pack/games ${WRKDIR}/${g}Pack/*.game \
+		${STAGEDIR}${DATADIR}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/games/netradiant/distinfo b/games/netradiant/distinfo
index 63149fd88b26..1fde7363bf6a 100644
--- a/games/netradiant/distinfo
+++ b/games/netradiant/distinfo
@@ -1,4 +1,43 @@
-SHA256 (netradiant-20130630-src.tar.bz2) = 798877df6d5aeb9c9f18dc15d91d31d0c08f18bc1baf1aa2b4d959afd89ef2be
-SIZE (netradiant-20130630-src.tar.bz2) = 2639725
+TIMESTAMP = 1434888414
+SHA256 (netradiant-20150621-src.tar.xz) = 4bfe3188f65f9283d0f394949868abf142b5e0966a06ac81dd6f2b815d7fce95
+SIZE (netradiant-20150621-src.tar.xz) = 2025200
 SHA256 (q3map2.6) = 104e5180547f1c55997b744559f66d860d4693a79e1ad0ab70c17346636b5a99
 SIZE (q3map2.6) = 17143
+SHA256 (DarkPlacesPack.zip) = c72c01af13474cfce9c3c09910ae84ea8aba927d77081401fd84158d2221fa85
+SIZE (DarkPlacesPack.zip) = 17386
+SHA256 (Doom3Pack.zip) = 3744f53bddf4fa7fabf1a00543d664dc7d2b090222ead4ec123053f51eec4c2b
+SIZE (Doom3Pack.zip) = 1938
+SHA256 (ETPack.zip) = 5f63cd4fc6c95ed10bf3f94eb62ce9a535c4c73971bd38b8390f16751ebc8e79
+SIZE (ETPack.zip) = 192922
+SHA256 (NeverballPack.zip) = 712e991b2937f6e612e73789eaeb839023d7af9a268b2a2ca81a8216c9ddcfd9
+SIZE (NeverballPack.zip) = 5458
+SHA256 (NexuizPack.zip) = 38ff583b46bd2bf7de6e8724f20869ec43cd839c930c0dd6dfae08893f8168a7
+SIZE (NexuizPack.zip) = 36874
+SHA256 (OpenArenaPack.zip) = 2a4e87743e268e8ba7dc66e4e9304f743b2242f7ad04ef01fddfd2f1261cf3ce
+SIZE (OpenArenaPack.zip) = 46745
+SHA256 (OsirionPack.zip) = b8abe7b7a17616b0102adac3d87e71b57f6893d5a1ecf7133982a8ed610655e9
+SIZE (OsirionPack.zip) = 3780
+SHA256 (Quake1Pack.zip) = 10865d21acb8d1e3b7c1f389254d2e2bc0a46a732e0523ce0531f2addf6c7473
+SIZE (Quake1Pack.zip) = 16463
+SHA256 (Quake2Pack.zip) = 4361d6fa1bc6024486ad9d89fa19cf22b68993327108b75525932cba48eacc08
+SIZE (Quake2Pack.zip) = 10878
+SHA256 (Quake2WorldPack.zip) = d2b3c924bcb42aed47694e0b7031b7b6e5a78d3e8bca4cead2efa0fb86a797e1
+SIZE (Quake2WorldPack.zip) = 7404
+SHA256 (Quake3Pack.zip) = 6c1bd7ced5d6b39e33479fd5fd507afd21b6dce375c071cc424bd471168b76b6
+SIZE (Quake3Pack.zip) = 26081
+SHA256 (Quake4Pack.zip) = 40f3ac4d76d9fda432fa127d85c94afa358e5e0aade78836ce315511ad03b1c0
+SIZE (Quake4Pack.zip) = 1649
+SHA256 (QuakePack.zip) = f45d7b6a1094c44f4fe6cb1bb9586599096f5401047fa8aae14c10d452d9ecb2
+SIZE (QuakePack.zip) = 16447
+SHA256 (QuetooPack.zip) = 6a68ff3c3d84c0d082597185dd479d186fad4bfcfeee7193d7e6658581fd65ac
+SIZE (QuetooPack.zip) = 9912
+SHA256 (TremulousPack.zip) = 099a50ba2b30fb61289e64ef435f581cdb4bd28a7f0e1f80388b33254d36e375
+SIZE (TremulousPack.zip) = 17153
+SHA256 (UFOAIPack.zip) = abce5185d995a68419b80df64d928c40a52acabd2a6e4b0d85852a26e914a373
+SIZE (UFOAIPack.zip) = 4291
+SHA256 (UnvanquishedPack.zip) = 91bfcc4f2f1ccbcc2877988f69c5a178b5f8339498dfa50e4e7794996fd24aae
+SIZE (UnvanquishedPack.zip) = 32989
+SHA256 (WarsowPack.zip) = 3ffa5c482f0c49ab7d8b9c1844d51cfcfc87e0180f8551a920bdc0dd91730c51
+SIZE (WarsowPack.zip) = 17855
+SHA256 (XonoticPack.zip) = 03429db4590b709aee909306586ddf36542166e33b1a67539dbf2aa53c8fdec8
+SIZE (XonoticPack.zip) = 45309
diff --git a/games/netradiant/files/patch-more-clang-fixes b/games/netradiant/files/patch-more-clang-fixes
index 3d97b8a17bb9..a814e6f68e16 100644
--- a/games/netradiant/files/patch-more-clang-fixes
+++ b/games/netradiant/files/patch-more-clang-fixes
@@ -30,17 +30,6 @@
  #include <gtk/gtk.h>
  #include "gtkutil/pointer.h"
  
---- contrib/bobtoolz/misc.cpp.orig	2013-06-30 14:04:35 UTC
-+++ contrib/bobtoolz/misc.cpp
-@@ -31,7 +31,7 @@
- 
- #include "funchandlers.h"
- 
--#ifdef __linux__
-+#if defined (__linux__) || defined(__FreeBSD__)
- #include <sys/types.h>
- #include <unistd.h>
- #endif
 --- contrib/bobtoolz/shapes.cpp.orig	2013-06-30 14:04:35 UTC
 +++ contrib/bobtoolz/shapes.cpp
 @@ -40,6 +40,7 @@
diff --git a/games/netradiant/pkg-plist b/games/netradiant/pkg-plist
index ed37ad94f1d5..43a7111e911e 100644
--- a/games/netradiant/pkg-plist
+++ b/games/netradiant/pkg-plist
@@ -72,17 +72,38 @@ man/man6/q3map2.6.gz
 %%DATADIR%%/bitmaps/window2.png
 %%DATADIR%%/bitmaps/window3.png
 %%DATADIR%%/bitmaps/window4.png
-%%DATADIR%%/darkplaces.game/default_build_menu.xml
-%%DATADIR%%/darkplaces.game/game.xlink
-%%DATADIR%%/darkplaces.game/id1/default_shaderlist.txt
-%%DATADIR%%/darkplaces.game/id1/entities.ent
+%%GAMEPACK%%%%DATADIR%%/darkplaces.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/darkplaces.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/darkplaces.game/id1/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/darkplaces.game/id1/entities.ent
 %%DATADIR%%/docs/index.html
-%%DATADIR%%/games/darkplaces.game
-%%DATADIR%%/games/nexuiz.game
-%%DATADIR%%/games/osirion.game
-%%DATADIR%%/games/q1.game
-%%DATADIR%%/games/warsow.game
-%%DATADIR%%/games/xonotic.game
+%%GAMEPACK%%%%DATADIR%%/doom3.game/base/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/doom3.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/et.game/bitmaps/splash.bmp
+%%GAMEPACK%%%%DATADIR%%/et.game/default_build_menu.txt
+%%GAMEPACK%%%%DATADIR%%/et.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/et.game/etmain/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/et.game/etmain/et_entities.ent
+%%GAMEPACK%%%%DATADIR%%/et.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/et.game/shadertags.xml
+%%GAMEPACK%%%%DATADIR%%/games/darkplaces.game
+%%GAMEPACK%%%%DATADIR%%/games/doom3.game
+%%GAMEPACK%%%%DATADIR%%/games/et.game
+%%GAMEPACK%%%%DATADIR%%/games/neverball.game
+%%GAMEPACK%%%%DATADIR%%/games/nexuiz.game
+%%GAMEPACK%%%%DATADIR%%/games/oa.game
+%%GAMEPACK%%%%DATADIR%%/games/osirion.game
+%%GAMEPACK%%%%DATADIR%%/games/q1.game
+%%GAMEPACK%%%%DATADIR%%/games/q2.game
+%%GAMEPACK%%%%DATADIR%%/games/q2w.game
+%%GAMEPACK%%%%DATADIR%%/games/q3.game
+%%GAMEPACK%%%%DATADIR%%/games/q4.game
+%%GAMEPACK%%%%DATADIR%%/games/quetoo.game
+%%GAMEPACK%%%%DATADIR%%/games/trem.game
+%%GAMEPACK%%%%DATADIR%%/games/ufoai.game
+%%GAMEPACK%%%%DATADIR%%/games/unvanquished.game
+%%GAMEPACK%%%%DATADIR%%/games/warsow.game
+%%GAMEPACK%%%%DATADIR%%/games/xonotic.game
 %%DATADIR%%/gl/lighting_DBS_XY_Z_arbfp1.cg
 %%DATADIR%%/gl/lighting_DBS_XY_Z_arbvp1.cg
 %%DATADIR%%/gl/lighting_DBS_omni_fp.glp
@@ -113,14 +134,25 @@ man/man6/q3map2.6.gz
 %%DATADIR%%/modules/model.so
 %%DATADIR%%/modules/shaders.so
 %%DATADIR%%/modules/vfspk3.so
-%%DATADIR%%/nexuiz.game/data/default_shaderlist.txt
-%%DATADIR%%/nexuiz.game/data/entities.def
-%%DATADIR%%/nexuiz.game/data/turrets.def
-%%DATADIR%%/nexuiz.game/default_build_menu.xml
-%%DATADIR%%/nexuiz.game/game.xlink
-%%DATADIR%%/osirion.game/base/entities.def
-%%DATADIR%%/osirion.game/default_build_menu.xml
-%%DATADIR%%/osirion.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/neverball.game/data/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/neverball.game/data/entities.ent
+%%GAMEPACK%%%%DATADIR%%/neverball.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/neverball.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/nexuiz.game/data/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/nexuiz.game/data/entities.def
+%%GAMEPACK%%%%DATADIR%%/nexuiz.game/data/turrets.def
+%%GAMEPACK%%%%DATADIR%%/nexuiz.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/nexuiz.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/oa.game/baseoa/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/oa.game/baseoa/entities-ta.def
+%%GAMEPACK%%%%DATADIR%%/oa.game/baseoa/entities-ta.ent
+%%GAMEPACK%%%%DATADIR%%/oa.game/baseoa/entities.def
+%%GAMEPACK%%%%DATADIR%%/oa.game/baseoa/entities.ent
+%%GAMEPACK%%%%DATADIR%%/oa.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/oa.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/osirion.game/base/entities.def
+%%GAMEPACK%%%%DATADIR%%/osirion.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/osirion.game/game.xlink
 %%DATADIR%%/plugins/bitmaps/bobtoolz_caulk.png
 %%DATADIR%%/plugins/bitmaps/bobtoolz_cleanup.png
 %%DATADIR%%/plugins/bitmaps/bobtoolz_dropent.png
@@ -155,19 +187,50 @@ man/man6/q3map2.6.gz
 %%DATADIR%%/plugins/shaderplug.so
 %%DATADIR%%/plugins/sunplug.so
 %%DATADIR%%/plugins/ufoaiplug.so
-%%DATADIR%%/q1.game/default_build_menu.xml
-%%DATADIR%%/q1.game/id1/entities.ent
+%%GAMEPACK%%%%DATADIR%%/q1.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/q1.game/id1/entities.ent
+%%GAMEPACK%%%%DATADIR%%/q2.game/baseq2/entities.def
+%%GAMEPACK%%%%DATADIR%%/q2.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/q2.game/game.xlink
 %%DATADIR%%/q2map.%%ARCH%%
+%%GAMEPACK%%%%DATADIR%%/q2w.game/default/entities.def
+%%GAMEPACK%%%%DATADIR%%/q2w.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/q2w.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/q3.game/baseq3/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/q3.game/baseq3/entities.ent
+%%GAMEPACK%%%%DATADIR%%/q3.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/q3.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/q3.game/missionpack/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/q3.game/missionpack/entities-ta.ent
 %%DATADIR%%/q3data.%%ARCH%%
 %%DATADIR%%/q3data.qdt
 %%DATADIR%%/q3map2.%%ARCH%%
+%%GAMEPACK%%%%DATADIR%%/q4.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/q4.game/q4base/default_shaderlist.txt
 %%DATADIR%%/qdata3.%%ARCH%%
+%%GAMEPACK%%%%DATADIR%%/quetoo.game/default/common.shader
+%%GAMEPACK%%%%DATADIR%%/quetoo.game/default/entities.def
+%%GAMEPACK%%%%DATADIR%%/quetoo.game/default/shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/quetoo.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/quetoo.game/game.xlink
 %%DATADIR%%/radiant.%%ARCH%%
-%%DATADIR%%/warsow.game/basewsw/default_shaderlist.txt
-%%DATADIR%%/warsow.game/basewsw/entities.def
-%%DATADIR%%/warsow.game/default_build_menu.xml
-%%DATADIR%%/warsow.game/game.xlink
-%%DATADIR%%/xonotic.game/data/default_shaderlist.txt
-%%DATADIR%%/xonotic.game/data/entities.ent
-%%DATADIR%%/xonotic.game/default_build_menu.xml
-%%DATADIR%%/xonotic.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/trem.game/base/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/trem.game/base/entities.def
+%%GAMEPACK%%%%DATADIR%%/trem.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/trem.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/ufoai.game/base/entities.def
+%%GAMEPACK%%%%DATADIR%%/ufoai.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/ufoai.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/unvanquished.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/unvanquished.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/unvanquished.game/main/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/unvanquished.game/main/entities.def
+%%GAMEPACK%%%%DATADIR%%/unvanquished.game/pkg/entities.def
+%%GAMEPACK%%%%DATADIR%%/warsow.game/basewsw/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/warsow.game/basewsw/entities.def
+%%GAMEPACK%%%%DATADIR%%/warsow.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/warsow.game/game.xlink
+%%GAMEPACK%%%%DATADIR%%/xonotic.game/data/default_shaderlist.txt
+%%GAMEPACK%%%%DATADIR%%/xonotic.game/data/entities.ent
+%%GAMEPACK%%%%DATADIR%%/xonotic.game/default_build_menu.xml
+%%GAMEPACK%%%%DATADIR%%/xonotic.game/game.xlink