Index: head/games/q2pro/Makefile
===================================================================
--- head/games/q2pro/Makefile	(revision 547147)
+++ head/games/q2pro/Makefile	(revision 547148)
@@ -1,137 +1,142 @@
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	q2pro
 PORTVERSION=	${SVN_REV}
 PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/alepulver
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II engine modification compatible with R1Q2
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gnu.txt
 
 USES=		dos2unix gmake tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	#
 
 SVN_REV=	142
 
 MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S|${PREFIX}/||}"
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 LDFLAGS_i386=	-Wl,-znotext
 
 OPTIONS_DEFINE=		CLIENT DEDICATED GAME GL SOFT UI
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFAULT=	CLIENT DEDICATED GL SOFT UI
 OPTIONS_DEFAULT_i386=	ASM
 
 CLIENT_DESC=	Build client
 DEDICATED_DESC=	Build dedicated server
 GAME_DESC=	Build main game (default mod)
 GL_DESC=	Build OpenGL renderer
 SOFT_DESC=	Build software renderer
 UI_DESC=	Build user interface (for client menus)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 USES+=		sdl
 USE_SDL+=	sdl
 ALL_TARGET+=	client
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	server
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGAME}
 ALL_TARGET+=	game
 PLIST_SUB+=	GAME=""
 .else
 PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGL}
 LIB_DEPENDS+=	libpng.so:graphics/png
 USES+=		gl jpeg
 USE_GL=		gl
 ALL_TARGET+=	ref_newgl
 PLIST_SUB+=	GL=""
 .else
 PLIST_SUB+=	GL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOFT}
 ALL_TARGET+=	ref_soft
 PLIST_SUB+=	SOFT=""
 .else
 PLIST_SUB+=	SOFT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUI}
 ALL_TARGET+=	ui
 PLIST_SUB+=	UI=""
 .else
 PLIST_SUB+=	UI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MASM}
 MAKE_ENV+=	USE_X86_ASM=yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		-e '/png_set_gray_1_2_4_to_8/s|png_set|&_expand|' \
 			${WRKSRC}/ref_shared/r_images.c
 	@${REINPLACE_CMD} -E 's|[[:digit:]]+|${SVN_REV}|' \
 		${WRKSRC}/include/version.h
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+	@${REINPLACE_CMD} -e '/^unsigned[[:blank:]]*d_8to24table/,+1d' \
+		${WRKSRC}/ref_soft/sw_main.c
+	@${REINPLACE_CMD} -e '/\*cl_paused/,+1d' \
+		${WRKSRC}/source/cl_null.c
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
 .if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2pro \
 		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2proded \
 		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MGAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/game.so \
 		${STAGEDIR}${LIBDIR}/baseq2
 .endif
 .if ${PORT_OPTIONS:MGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_newgl.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MSOFT}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_soft.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MUI}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ui.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 
 generate-distfile:
 	@if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
 		${ECHO_CMD} "ERROR: the distfile already exists."; \
 		${FALSE}; \
 	fi
 	svn export -r${SVN_REV} \
 		https://svn.sourceforge.net/svnroot/q2pro/q2pro q2pro
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} q2pro
 	${RM} -r q2pro
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.mk>
Index: head/games/qstat/Makefile
===================================================================
--- head/games/qstat/Makefile	(revision 547147)
+++ head/games/qstat/Makefile	(revision 547148)
@@ -1,43 +1,45 @@
 # Created by: Daniel O'Connor <darius@dons.net.au>
 # $FreeBSD$
 
 PORTNAME=	qstat
 PORTVERSION=	2.14
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games net
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Command-line program to query game servers on the net
 
 LICENSE=	ART20
 
 CONFLICTS_INSTALL=	torque-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	multiplay
 
 USES=		autoreconf
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/qstat \
 		@sample\ etc/qstat.cfg.sample
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${MV} ${WRKSRC}/qstat.cfg ${WRKSRC}/qstat.cfg.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|qstat\.cfg|&.sample|' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|' ${WRKSRC}/qstat.c
+	@${REINPLACE_CMD} -e 's|__hpux|${OPSYS}|' ${WRKSRC}/qstat.c
+	@${ECHO_CMD} 'int do_dump = 0;' >> ${WRKSRC}/qstat.c
+	@${REINPLACE_CMD} -e 's|^int do_dump|extern &|' ${WRKSRC}/debug.h
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/info ${STAGEDIR}${DOCSDIR}/template
 	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${WRKSRC}/qstatdoc.html \
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/template/*.html ${WRKSRC}/template/*.txt \
 		${STAGEDIR}${DOCSDIR}/template
 	${INSTALL_DATA} ${WRKSRC}/info/*.txt ${STAGEDIR}${DOCSDIR}/info
 
 .include <bsd.port.mk>
Index: head/games/quetoo/files/patch-clang-fixes
===================================================================
--- head/games/quetoo/files/patch-clang-fixes	(revision 547147)
+++ head/games/quetoo/files/patch-clang-fixes	(revision 547148)
@@ -1,88 +1,107 @@
 --- src/sv_user.c.orig	2007-12-28 07:25:47.000000000 +0800
 +++ src/sv_user.c	2013-09-05 14:53:30.000000000 +0800
 @@ -363,7 +363,7 @@ void SV_Info_f(void){
  			continue;  //only print serverinfo cvars
  			
  		snprintf(line, MAX_STRING_CHARS, "%s %s\n", cvar->name, cvar->string);
 -		SV_ClientPrintf(sv_client, PRINT_MEDIUM, line);
 +		SV_ClientPrintf(sv_client, PRINT_MEDIUM, "%s", line);
  	}
  }
  
 --- src/cl_main.c.orig	2007-12-28 07:25:47.000000000 +0800
 +++ src/cl_main.c	2013-09-05 14:53:30.000000000 +0800
+@@ -23,7 +23,7 @@
+ 
+ #include "client.h"
+ 
+-cvar_t *rcon_password;
++extern cvar_t *rcon_password;
+ cvar_t *rcon_address;
+ 
+ cvar_t *cl_noskins;
+@@ -43,9 +43,6 @@ cvar_t *cl_shownet;
+ cvar_t *cl_showmiss;
+ cvar_t *cl_showclamp;
+ 
+-cvar_t *paused;
+-cvar_t *timedemo;
+-
+ cvar_t *cl_vwep;
+ 
+ cvar_t *cl_railtrailcolor;
 @@ -691,7 +691,7 @@ void CL_Ping_f(void){
  		}
  		
  		if(!adr.port) adr.port = BigShort(PORT_SERVER);
 -		Netchan_OutOfBandPrint(NS_CLIENT, adr, va("info %i", PROTOCOL_34));
 +		Netchan_OutOfBandPrint(NS_CLIENT, adr, "info %i", PROTOCOL_34);
  		return;
  	}
  	
 @@ -700,7 +700,7 @@ void CL_Ping_f(void){
  	
  	adr.type = NA_IP_BROADCAST;
  	adr.port = BigShort(PORT_SERVER);
 -	Netchan_OutOfBandPrint(NS_CLIENT, adr, va("info %i", PROTOCOL_34));
 +	Netchan_OutOfBandPrint(NS_CLIENT, adr, "info %i", PROTOCOL_34);
  }
  
  
 --- src/cl_keys.c.orig	2007-12-28 07:25:47.000000000 +0800
 +++ src/cl_keys.c	2013-09-05 14:53:30.000000000 +0800
 @@ -143,7 +143,7 @@ void CompleteCommand(void){
  	cvar = Cvar_CompleteVariable(partial, &cvars);  //partial cvar lookup
  	if(cvar && !strcmp(cvar, partial)) goto append;  //exact match
  	
 -	if(cmds == 1 && cvars == 0) cmd = cmd;
 +	if(cmds == 1 && cvars == 0);
  	else if(cmds == 0 && cvars == 1) cmd = cvar;
  	else cmd = NULL;
  	
 --- src/cl_ents.c.orig	2007-12-28 07:25:47.000000000 +0800
 +++ src/cl_ents.c	2014-11-30 22:57:36.000000000 +0800
 @@ -168,9 +168,9 @@ void CL_DeltaEntity(frame_t *frame, int 
  			|| state->modelindex2 != ent->current.modelindex2
  			|| state->modelindex3 != ent->current.modelindex3
  			|| state->modelindex4 != ent->current.modelindex4
 -			|| abs(state->origin[0] - ent->current.origin[0]) > 512
 -			|| abs(state->origin[1] - ent->current.origin[1]) > 512
 -			|| abs(state->origin[2] - ent->current.origin[2]) > 512
 +			|| fabsf(state->origin[0] - ent->current.origin[0]) > 512
 +			|| fabsf(state->origin[1] - ent->current.origin[1]) > 512
 +			|| fabsf(state->origin[2] - ent->current.origin[2]) > 512
  			|| state->event == EV_PLAYER_TELEPORT
  			|| state->event == EV_OTHER_TELEPORT
  	  ){
 @@ -912,7 +912,7 @@ void CL_CalcViewValues(void){
  	ops = &oldframe->playerstate;
  	
  	// see if the player entity was teleported this frame
 -	if(fabs(ops->pmove.origin[0] - ps->pmove.origin[0]) > 256 * 8
 +	if(abs(ops->pmove.origin[0] - ps->pmove.origin[0]) > 256 * 8
  			|| abs(ops->pmove.origin[1] - ps->pmove.origin[1]) > 256 * 8
  			|| abs(ops->pmove.origin[2] - ps->pmove.origin[2]) > 256 * 8)
  		ops = ps;  // don't interpolate
 --- src/vanctf/m_move.c.orig	2007-12-28 07:25:45.000000000 +0800
 +++ src/vanctf/m_move.c	2014-11-30 22:58:47.000000000 +0800
 @@ -370,7 +370,7 @@ void SV_NewChaseDir(edict_t *actor, edic
  	}
  	
  // try other directions
 -	if(((rand()&3) & 1) ||  abs(deltay) > abs(deltax)){
 +	if(((rand()&3) & 1) ||  fabsf(deltay) > fabsf(deltax)){
  		tdir = d[1];
  		d[1] = d[2];
  		d[2] = tdir;
 --- src/qmass/g_cmds.c.orig	2007-12-28 07:25:44.000000000 +0800
 +++ src/qmass/g_cmds.c	2013-09-05 14:53:30.000000000 +0800
 @@ -724,7 +724,7 @@ void Cmd_Say_f(edict_t *ent, qboolean te
  	
  	if(chatlog != NULL){  //write chatlog
  		
 -		fprintf(chatlog, text);
 +		fprintf(chatlog, "%s", text);
  		
  		fflush(chatlog);
  	}
Index: head/games/r1q2/files/patch-client_client.h
===================================================================
--- head/games/r1q2/files/patch-client_client.h	(nonexistent)
+++ head/games/r1q2/files/patch-client_client.h	(revision 547148)
@@ -0,0 +1,11 @@
+--- client/client.h.orig	2010-05-09 09:20:28 UTC
++++ client/client.h
+@@ -136,8 +136,6 @@ struct localent_s
+ //yummmm splash gibs death blood
+ #define MAX_LOCAL_ENTS 1024
+ 
+-localent_t cl_localents[MAX_LOCAL_ENTS];
+-
+ void Le_Reset (void);
+ 
+ #ifdef USE_CURL

Property changes on: head/games/r1q2/files/patch-client_client.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
Index: head/games/r1q2/files/patch-client_le__util.c
===================================================================
--- head/games/r1q2/files/patch-client_le__util.c	(nonexistent)
+++ head/games/r1q2/files/patch-client_le__util.c	(revision 547148)
@@ -0,0 +1,10 @@
+--- client/le_util.c.orig	2005-01-12 05:19:36 UTC
++++ client/le_util.c
+@@ -4,6 +4,7 @@
+ 
+ int	localent_count = 0;
+ 
++localent_t cl_localents[MAX_LOCAL_ENTS];
+ cvar_t	*cl_lents;
+ 
+ void LE_RunEntity (localent_t *ent);

Property changes on: head/games/r1q2/files/patch-client_le__util.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