diff --git a/games/netradiant/Makefile b/games/netradiant/Makefile
index 291cd132e49f..f0de93d5e962 100644
--- a/games/netradiant/Makefile
+++ b/games/netradiant/Makefile
@@ -1,73 +1,75 @@
 PORTNAME=	netradiant
 PORTVERSION=	20150621
 PORTREVISION=	5
 CATEGORIES=	games cad
 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=	${_DISTFILES:Nq3map2.6}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Fork of GtkRadiant v1.5 FPS games map editor
 WWW=		http://ingar.intranifty.net/gtkradiant/
 
 LICENSE=	GPLv2
 
 BROKEN_armv6=		fails to build: h2data.armv6: No such file or directory
 BROKEN_armv7=		fails to build: h2data.armv7: No such file or directory
 
 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
 
 USES=		compiler:c++11-lang gl gmake gnome jpeg localbase:ldflags \
 		pkgconfig tar:xz xorg
 USE_GL=		gl glu
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 libxml2 pango pangox-compat
 USE_XORG=	ice sm x11 xmu xt
 MAKE_ENV=	BUILD=release DOWNLOAD_GAMEPACKS=no EXE=${ARCH} \
 		RADIANT_ABOUTMSG="For ${OPSYS} ${OSREL} (${ARCH})"
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	ARCH=${ARCH}
 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,' \
+	@${REINPLACE_CMD} -e 's,register ,,' \
+		${WRKSRC}/libs/container/hashfunc.h
+	@${REINPLACE_CMD} -e '/#include/s,sys/dir,dirent,' \
 		${WRKSRC}/tools/quake2/qdata/qdata.c
 	@${REINPLACE_CMD} -e 's,#ifndef WIN32,#ifdef NeXT,' \
 		${WRKSRC}/tools/quake3/q3data/q3data.c
 	@${GREP} -Rl --null __linux__ ${WRKSRC}/tools | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's,__linux__,__${OPSYS}__,'
 
 pre-install:
 # 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/files/patch-Makefile b/games/netradiant/files/patch-Makefile
index 0b1663707d37..23d78326952e 100644
--- a/games/netradiant/files/patch-Makefile
+++ b/games/netradiant/files/patch-Makefile
@@ -1,73 +1,73 @@
 --- Makefile.orig	2015-06-21 12:05:51 UTC
 +++ Makefile
 @@ -112,7 +112,7 @@ ifeq ($(OS),Windows_NT)
  	OS = Win32
  endif
  
 -CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fno-strict-aliasing
-+CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -fcommon
++CFLAGS_COMMON = -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-implicit-function-declaration -Wno-unused-parameter -fcommon
  CPPFLAGS_COMMON =
  LDFLAGS_COMMON =
  LIBS_COMMON =
 @@ -153,7 +153,7 @@
  else
  
  ifeq ($(BUILD),release)
 -ifeq ($(findstring $(CFLAGS),-O),)
 +ifeq ($(findstring -O,$(CFLAGS)),)
  	CFLAGS_COMMON += -O3
  	# only add -O3 if no -O flag is in $(CFLAGS)
  	# to allow overriding the optimizations
 @@ -170,10 +170,10 @@
  
  INSTALLDIR_BASE := $(INSTALLDIR)
  
 -ifeq ($(OS),Linux)
 +ifneq ($(filter $(OS),Linux FreeBSD),)
  	CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
  	CFLAGS_COMMON += -fPIC
 -	LDFLAGS_DLL = -fPIC -ldl
 +	LDFLAGS_DLL = -fPIC
  	LIBS_COMMON = -lpthread
  	EXE ?= $(shell uname -m)
  	A = a
 @@ -291,15 +291,15 @@
  	checkbinary sed "$(SED)"; \
  	checkbinary findutils "$(FIND)"; \
  	checkbinary diff "$(DIFF)"; \
 -	checkbinary gcc "$(CC)"; \
 -	checkbinary g++ "$(CXX)"; \
 +	checkbinary c\ compiler "$(CC)"; \
 +	checkbinary c++\ compiler "$(CXX)"; \
  	checkbinary binutils "$(RANLIB)"; \
  	checkbinary binutils "$(AR)"; \
  	checkbinary pkg-config "$(PKGCONFIG)"; \
 -	checkbinary unzip "$(UNZIPPER)"; \
 -	checkbinary git-core "$(GIT)"; \
 -	checkbinary subversion "$(SVN)"; \
 -	checkbinary wget "$(WGET)"; \
 +#	checkbinary unzip "$(UNZIPPER)"; \
 +#	checkbinary git-core "$(GIT)"; \
 +#	checkbinary subversion "$(SVN)"; \
 +#	checkbinary wget "$(WGET)"; \
  	[ "$(OS)" = "Win32" ] && checkbinary mingw32 "$(WINDRES)"; \
  	[ -n "$(LDD)" ] && checkbinary libc6 "$(LDD)"; \
  	[ -n "$(OTOOL)" ] && checkbinary xcode "$(OTOOL)"; \
 @@ -437,7 +437,7 @@
  %.$(EXE):
  	file=$@; $(MKDIR) $${file%/*}
  	$(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@
 -	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 +	[ -z "$(LDD)" ] || [ -z "`$(LDD) $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
  
  %.$(A):
  	$(AR) rc $@ $^
 @@ -446,7 +446,7 @@
  %.$(DLL):
  	file=$@; $(MKDIR) $${file%/*}
  	$(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LDFLAGS_DLL) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -shared -o $@
 -	[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
 +	[ -z "$(LDD)" ] || [ -z "`$(LDD) $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
  
  %.rc: %.ico
  	$(ECHO) '1 ICON "$<"' > $@