Index: head/games/gtkradiant/Makefile
===================================================================
--- head/games/gtkradiant/Makefile	(revision 552405)
+++ head/games/gtkradiant/Makefile	(revision 552406)
@@ -1,74 +1,87 @@
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gtkradiant
 PORTVERSION=	1.5.0
 PORTREVISION=	16
 CATEGORIES=	games cad
 MASTER_SITES=	IDSOFTWARE/source/:id \
 		http://www.bsd-geek.de/FreeBSD/distfiles/:fb
 DISTNAME=	GtkRadiant-GPL
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:id \
 		${PORTNAME}_gamepacks${EXTRACT_SUFX}:fb
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Map editor for FPS games, by id Software and Loki Software
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libmhash.so:security/mhash \
 		libpng.so:graphics/png
 
 USES=		compiler:c++11-lang gnome pkgconfig python:build scons:python2 zip
 USE_GNOME=	gtk20 libxml2
 MAKE_ARGS=	${MAKE_ENV} BUILD=release
 SSP_UNSAFE=	yes
 
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 WRKSRC=		${WRKDIR}/GPL/GtkRadiant
 
 SUB_FILES=	${PORTNAME}
 
 post-patch:
 	@${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \
 		${XARGS} ${REINPLACE_CMD} -e \
 		's/\(defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)\)/\1 || defined (__FreeBSD__)/'
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/libs/os/dir.h \
 		${WRKSRC}/libs/gtkutil/idledraw.h \
 		${WRKSRC}/libs/gtkutil/cursor.h \
 		${WRKSRC}/libs/convert.h \
 		${WRKSRC}/plugins/shaders/shaders.cpp \
 		${WRKSRC}/plugins/vfspk3/vfs.cpp \
 		${WRKSRC}/radiant/feedback.h \
 		${WRKSRC}/radiant/environment.cpp \
 		${WRKSRC}/radiant/patch.cpp \
 		${WRKSRC}/radiant/watchbsp.cpp \
 		${WRKSRC}/tools/quake3/common/inout.c
 # Fix the build against Clang
 	@${REINPLACE_CMD} -e '/#include "generic\/reference\.h"/x ; 318G' \
 		${WRKSRC}/libs/scenelib.h
 	@${REINPLACE_CMD} -e '/#include "generic\/referencecounted\.h/ { \
 		x ; s/^/#include "scenelib.h"/ ; G ; }' \
 			${WRKSRC}/plugins/mapq3/parse.h
 # Fix warnings of "GtkSpinButton: setting an adjustment with non-zero
 # page size is deprecated" (very annoying)
 	@${GREP} -Rl --null gtk_adjustment_new ${WRKSRC} | ${XARGS} -0 \
 		${REINPLACE_CMD} -E 's|(gtk_adjustment_new[^)]*,)[^)]*|\1 0|'
 # Do not #include <sys/dir.h> header which is deprecated
 	@${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
+# Cope with -fno-common being the default in some new compilers
+	@${REINPLACE_CMD} -e '/\*CalcTextureReflectivity/s,^void,extern &,' \
+		${WRKSRC}/tools/quake2/q2map/qrad.h
+	@${REINPLACE_CMD} -E 's,^char[[:blank:]]+outbase,extern &,' \
+		${WRKSRC}/tools/quake2/q2map/qvis.c
+	@${REINPLACE_CMD} -e '/materialtypes/s,^materialtype_t,extern &,' \
+		${WRKSRC}/tools/quake2/qdata_heretic2/common/qfiles.h
+	@${REINPLACE_CMD} -e '/\*byteimage, \*lbmpalette/,+5d' \
+		${WRKSRC}/tools/quake2/qdata_heretic2/book.c
+	@${REINPLACE_CMD} -e '/g_frames/s,^frame_t,extern &,' \
+		${WRKSRC}/tools/quake2/qdata_heretic2/models.c
+	@${REINPLACE_CMD} -e '/verbose;/d' \
+		${WRKSRC}/tools/quake3/q3map2/q3map2.h
+	@${REINPLACE_CMD} -e '/c_portalskip, c_leafskip/,+1d' \
+		${WRKSRC}/tools/quake3/q3map2/visflow.c
 
 pre-install:
 	cd ${WRKSRC} && ${PYTHON_CMD} install.py
 	${CP} -a ${WRKDIR}/${PORTNAME}_gamepacks/* ${WRKSRC}/install
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/games/gtkradiant/files/patch-tools__quake2__q2map__qrad.c
===================================================================
--- head/games/gtkradiant/files/patch-tools__quake2__q2map__qrad.c	(nonexistent)
+++ head/games/gtkradiant/files/patch-tools__quake2__q2map__qrad.c	(revision 552406)
@@ -0,0 +1,27 @@
+--- tools/quake2/q2map/qrad.c.orig	2006-02-10 22:01:20 UTC
++++ tools/quake2/q2map/qrad.c
+@@ -44,7 +44,7 @@
+ vec3_t		face_offset[MAX_MAP_FACES];		// for rotating bmodels
+ dplane_t	backplanes[MAX_MAP_PLANES];
+ 
+-char		inbase[32], outbase[32];
++extern char		inbase[32], outbase[32];
+ 
+ int			fakeplanes;					// created planes for origin offset 
+ 
+@@ -64,11 +64,13 @@
+ 
+ float	lightscale = 1.0;
+ 
+-qboolean	glview;
++extern qboolean	glview;
+ 
+ qboolean	nopvs;
+ 
+-char		source[1024];
++extern char		source[1024];
++
++void (*CalcTextureReflectivity) (void);
+ 
+ float	direct_scale =	0.4;
+ float	entity_scale =	1.0;

Property changes on: head/games/gtkradiant/files/patch-tools__quake2__q2map__qrad.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/gtkradiant/files/patch-tools__quake2__qdata_heretic2__sprites.c
===================================================================
--- head/games/gtkradiant/files/patch-tools__quake2__qdata_heretic2__sprites.c	(nonexistent)
+++ head/games/gtkradiant/files/patch-tools__quake2__qdata_heretic2__sprites.c	(revision 552406)
@@ -0,0 +1,27 @@
+--- tools/quake2/qdata_heretic2/sprites.c.orig	2006-02-10 22:01:20 UTC
++++ tools/quake2/qdata_heretic2/sprites.c
+@@ -25,15 +25,8 @@
+ #define MAX_SPRFRAMES			MAX_MD2SKINS
+ 
+ dsprite_t		sprite;
+-dsprframe_t		frames[MAX_SPRFRAMES];
++extern dsprframe_t		frames[MAX_SPRFRAMES];
+ 
+-byte			*byteimage, *lbmpalette;
+-int				byteimagewidth, byteimageheight;
+-
+-qboolean		TrueColorImage;
+-unsigned		*longimage;
+-int				longimagewidth, longimageheight;
+-
+ char			spritename[1024];
+ 
+ 
+@@ -41,7 +34,6 @@
+ void Cmd_Spritename (void);
+ 
+ char spr_prefix[1024];
+-char pic_prefix[1024];
+ 
+ extern 	char		*g_outputDir;
+ 

Property changes on: head/games/gtkradiant/files/patch-tools__quake2__qdata_heretic2__sprites.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/gtkradiant/files/patch-tools__quake3__q3data__q3data.c
===================================================================
--- head/games/gtkradiant/files/patch-tools__quake3__q3data__q3data.c	(nonexistent)
+++ head/games/gtkradiant/files/patch-tools__quake3__q3data__q3data.c	(revision 552406)
@@ -0,0 +1,20 @@
+--- tools/quake3/q3data/q3data.c.orig	2006-02-10 22:01:20 UTC
++++ tools/quake3/q3data/q3data.c
+@@ -37,8 +37,6 @@
+ 
+ // bogus externs for some TA hacks (common/ using them against q3map)
+ char *moddir = NULL;
+-// some old defined that was in cmdlib lost during merge
+-char writedir[1024];
+ 
+ #if defined (__linux__) || defined (__APPLE__)
+ #define strlwr strlower
+@@ -341,7 +339,7 @@
+ #else
+ 
+ #include <sys/types.h>
+-#ifndef WIN32
++#ifdef NeXT
+ #include <sys/dir.h>
+ #else
+ #include <sys/dirent.h>

Property changes on: head/games/gtkradiant/files/patch-tools__quake3__q3data__q3data.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/gtkradiant/files/patch-tools__quake3__q3map2__q3map2.h
===================================================================
--- head/games/gtkradiant/files/patch-tools__quake3__q3map2__q3map2.h	(nonexistent)
+++ head/games/gtkradiant/files/patch-tools__quake3__q3map2__q3map2.h	(revision 552406)
@@ -0,0 +1,13 @@
+--- tools/quake3/q3map2/q3map2.h.orig	2006-02-10 22:01:20 UTC
++++ tools/quake3/q3map2/q3map2.h
+@@ -939,6 +939,10 @@
+ }
+ surfaceType_t;
+ 
++// Q_EXTERN is defined only later :(
++#ifndef MAIN_C
++extern
++#endif
+ char			*surfaceTypes[ NUM_SURFACE_TYPES ]
+ #ifndef MAIN_C
+ 				;

Property changes on: head/games/gtkradiant/files/patch-tools__quake3__q3map2__q3map2.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property