diff --git a/games/iortcw/Makefile b/games/iortcw/Makefile
index 9c20425cd256..86dff84e9df0 100644
--- a/games/iortcw/Makefile
+++ b/games/iortcw/Makefile
@@ -1,84 +1,84 @@
 PORTNAME=	iortcw
 PORTVERSION=	1.51c
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	games
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Game engine for Return to Castle Wolfenstein
 WWW=		https://github.com/iortcw/iortcw
 
 LICENSE=	GPLv3
 
 NOT_FOR_ARCHS=		aarch64 armv6 armv7
 NOT_FOR_ARCHS_REASON=	fails to configure: Architecture not supported
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfreetype.so:print/freetype2 \
 		libogg.so:audio/libogg \
 		libopus.so:audio/opus \
 		libopusfile.so:audio/opusfile
 
 USES=		compiler:c++11-lang gl gmake jpeg openal pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_GL=		gl
 USE_SDL=	sdl2
 
 WOLFDIR=	"libexec/${PORTNAME}"
 MAKE_ARGS=	BINDIR="${STAGEDIR}${PREFIX}/bin" \
 		COPYDIR="${STAGEDIR}${PREFIX}/${WOLFDIR}"
 
 LDFLAGS_i386=	-Wl,-znotext
 
-PLIST_SUB=	ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc/ppc/}" \
+PLIST_SUB=	ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/}" \
 		WOLFDIR="${WOLFDIR}"
 
 SUB_FILES=	iowolfded iowolfmp iowolfsp pkg-message
 SUB_LIST=	ARCH="${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc/ppc/}" \
 		DISTVERSION="${DISTVERSION}" \
 		WOLFDIR="${PREFIX}/${WOLFDIR}"
 
 OPTIONS_DEFINE=		MP SP
 OPTIONS_DEFAULT=	MP SP
 OPTIONS_SUB=		yes
 
 MP_DESC=	Build multiplayer support
 SP_DESC=	Build singleplayer support
 
 SP_ALL_TARGET=		sp
 SP_DESKTOP_ENTRIES=	"Return to Castle Wolfenstein" \
 			"Return to Castle Wolfenstein" \
 			"${DATADIR}/wolf512.png" \
 			"iowolfsp" \
 			"Game;" \
 			false
 SP_INSTALL_TARGET=	sp-install
 
 MP_ALL_TARGET=		mp
 MP_DESKTOP_ENTRIES=	"Return to Castle Wolfenstein (MP)" \
 			"Return to Castle Wolfenstein Multiplayer" \
 			"${DATADIR}/wolf512.png" \
 			"iowolfmp" \
 			"Game;" \
 			false
 MP_INSTALL_TARGET=	mp-install
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} '/\.git\/index/d' ${WRKSRC}/SP/Makefile
 	@${REINPLACE_CMD} '/\.git\/index/d' ${WRKSRC}/MP/Makefile
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/MP/misc/wolf512.png ${STAGEDIR}${DATADIR}
 
 post-install-MP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfmp ${STAGEDIR}${PREFIX}/bin/iowolfmp
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfded ${STAGEDIR}${PREFIX}/bin/iowolfded
 
 post-install-SP-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/iowolfsp ${STAGEDIR}${PREFIX}/bin/iowolfsp
 
 .include <bsd.port.mk>
diff --git a/games/iortcw/files/patch-MP_Makefile b/games/iortcw/files/patch-MP_Makefile
index be11bab35ea7..195d8804563a 100644
--- a/games/iortcw/files/patch-MP_Makefile
+++ b/games/iortcw/files/patch-MP_Makefile
@@ -1,73 +1,84 @@
 --- MP/Makefile.orig	2019-03-16 18:09:48 UTC
 +++ MP/Makefile
+@@ -5,8 +5,8 @@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr
+ #
+ 
+ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g')
+-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
+-ARM_VER_CHECK=$(shell uname -m)
++COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
++ARM_VER_CHECK=$(shell uname -p)
+ 
+ ifeq ($(COMPILE_PLATFORM),sunos)
+   # Solaris uname and GNU uname differ
 @@ -101,14 +101,6 @@ export ARCH
  endif
  export ARCH
  
 -# For historical compatibility reasons on non-windows
 -# platform output files use i386 instead of x86
 -ifeq ($(ARCH),x86)
 -  ifndef MINGW
 -    FILE_ARCH=i386
 -  endif
 -endif
 -
  ifndef FILE_ARCH
  FILE_ARCH=$(ARCH)
  endif
 @@ -369,7 +361,7 @@ CLIENT_EXTRA_FILES=
  EXTRA_FILES=
  CLIENT_EXTRA_FILES=
  
 -ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
 +ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd"))
    TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
  endif
  
 @@ -752,7 +744,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
  ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd"))
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing \
 -    -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
 +    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON
    CLIENT_CFLAGS += $(SDL_CFLAGS)
  
    OPTIMIZEVM = -O3
 @@ -761,7 +753,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
    ifeq ($(ARCH),x86_64)
      OPTIMIZEVM = -O3
      OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 -    FILE_ARCH = amd64
    endif
    ifeq ($(ARCH),x86)
      OPTIMIZEVM = -O3 -march=i586
 @@ -787,13 +778,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
      OPTIMIZE = $(OPTIMIZEVM)
    endif
  
 -  ifeq ($(USE_CURL),1)
 -    CLIENT_CFLAGS += $(CURL_CFLAGS)
 -    USE_CURL_DLOPEN=0
 -  endif
 -
    SHLIBEXT=so
 -  SHLIBCFLAGS=-fPIC
 +  SHLIBCFLAGS=-fPIC -fvisibility=hidden
    SHLIBLDFLAGS=-shared $(LDFLAGS)
  
    THREAD_LIBS=-lpthread
 @@ -805,12 +791,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
    RENDERER_LIBS = $(SDL_LIBS)
  
    ifeq ($(USE_OPENAL),1)
 +    CLIENT_CFLAGS += $(OPENAL_CFLAGS)
      ifneq ($(USE_OPENAL_DLOPEN),1)
        CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
      endif
    endif
  
    ifeq ($(USE_CURL),1)
 +    CLIENT_CFLAGS += $(CURL_CFLAGS)
      ifneq ($(USE_CURL_DLOPEN),1)
        CLIENT_LIBS += $(CURL_LIBS)
      endif
diff --git a/games/iortcw/files/patch-SP_Makefile b/games/iortcw/files/patch-SP_Makefile
index 294a9b7c76d6..40cd99e00098 100644
--- a/games/iortcw/files/patch-SP_Makefile
+++ b/games/iortcw/files/patch-SP_Makefile
@@ -1,73 +1,84 @@
 --- SP/Makefile.orig	2019-03-16 18:09:48 UTC
 +++ SP/Makefile
+@@ -5,8 +5,8 @@ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr
+ #
+ 
+ COMPILE_PLATFORM=$(shell uname | sed -e 's/_.*//' | tr '[:upper:]' '[:lower:]' | sed -e 's/\//_/g')
+-COMPILE_ARCH=$(shell uname -m | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
+-ARM_VER_CHECK=$(shell uname -m)
++COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/' | sed -e 's/^arm.*/arm/')
++ARM_VER_CHECK=$(shell uname -p)
+ 
+ ifeq ($(COMPILE_PLATFORM),sunos)
+   # Solaris uname and GNU uname differ
 @@ -98,14 +98,6 @@ export ARCH
  endif
  export ARCH
  
 -# For historical compatibility reasons on non-windows
 -# platform output files use i386 instead of x86
 -ifeq ($(ARCH),x86)
 -  ifndef MINGW
 -    FILE_ARCH=i386
 -  endif
 -endif
 -
  ifndef FILE_ARCH
  FILE_ARCH=$(ARCH)
  endif
 @@ -358,7 +350,7 @@ CLIENT_EXTRA_FILES=
  EXTRA_FILES=
  CLIENT_EXTRA_FILES=
  
 -ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
 +ifneq (,$(findstring "$(COMPILE_PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu" "freebsd" "netbsd" "openbsd"))
    TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\"
  endif
  
 @@ -741,7 +733,7 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
  ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd"))
  
    BASE_CFLAGS = -Wall -fno-strict-aliasing \
 -    -pipe -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
 +    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(FILE_ARCH)\\\" -DMAP_ANONYMOUS=MAP_ANON
    CLIENT_CFLAGS += $(SDL_CFLAGS)
  
    OPTIMIZEVM = -O3
 @@ -750,7 +742,6 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
    ifeq ($(ARCH),x86_64)
      OPTIMIZEVM = -O3
      OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 -    FILE_ARCH = amd64
    endif
    ifeq ($(ARCH),x86)
      OPTIMIZEVM = -O3 -march=i586
 @@ -776,13 +767,8 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
      OPTIMIZE = $(OPTIMIZEVM)
    endif
  
 -  ifeq ($(USE_CURL),1)
 -    CLIENT_CFLAGS += $(CURL_CFLAGS)
 -    USE_CURL_DLOPEN=0
 -  endif
 -
    SHLIBEXT=so
 -  SHLIBCFLAGS=-fPIC
 +  SHLIBCFLAGS=-fPIC -fvisibility=hidden
    SHLIBLDFLAGS=-shared $(LDFLAGS)
  
    THREAD_LIBS=-lpthread
 @@ -794,12 +780,14 @@ ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd
    RENDERER_LIBS = $(SDL_LIBS)
  
    ifeq ($(USE_OPENAL),1)
 +    CLIENT_CFLAGS += $(OPENAL_CFLAGS)
      ifneq ($(USE_OPENAL_DLOPEN),1)
        CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
      endif
    endif
  
    ifeq ($(USE_CURL),1)
 +    CLIENT_CFLAGS += $(CURL_CFLAGS)
      ifneq ($(USE_CURL_DLOPEN),1)
        CLIENT_LIBS += $(CURL_LIBS)
      endif