Update ioquake3 to 1.36.20200125 (latest from Github).

The project seems to no longer do official releases.

8 files changed, 64 insertions, 349 deletions

diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 6d7c11756a2..2fb2ebe153b 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/01/25 16:07:15 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2020/01/25 20:13:49 jmcneill Exp $
 #
 
-DISTNAME=	ioquake3-1.36
-PKGREVISION=	3
+DISTNAME=	ioquake3-1.36.20200125
 CATEGORIES=	games
-MASTER_SITES=	http://ioquake3.org/files/1.36/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ioquake/}
+GITHUB_PROJECT=	ioq3
+GITHUB_TAG=	daae32ddfdab2172a628072ed3ff7dd1fc1563fe
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ioquake3.org/
@@ -21,8 +21,10 @@ do-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE:U} == "evbarm"
+.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
 QUAKE_ARCH!=	uname -m
+.elif ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "aarch64"
+QUAKE_ARCH=	${MACHINE_CPU}
 .else
 QUAKE_ARCH=	${MACHINE_ARCH}
 .endif
@@ -34,6 +36,7 @@ NOT_PAX_MPROTECT_SAFE+=	lib/ioquake3/ioq3ded.${QUAKE_ARCH}
 NOT_PAX_MPROTECT_SAFE+=	lib/ioquake3/ioquake3.${QUAKE_ARCH}
 
 .include "../../audio/openal-soft/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/ioquake3/PLIST b/games/ioquake3/PLIST
index 1f6baab7ef6..4de8db4d16f 100644
--- a/games/ioquake3/PLIST
+++ b/games/ioquake3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/04/18 20:44:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
 lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.so
 lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.so
 lib/ioquake3/baseq3/ui${QUAKE_ARCH}.so
@@ -7,3 +7,5 @@ lib/ioquake3/ioquake3.${QUAKE_ARCH}
 lib/ioquake3/missionpack/cgame${QUAKE_ARCH}.so
 lib/ioquake3/missionpack/qagame${QUAKE_ARCH}.so
 lib/ioquake3/missionpack/ui${QUAKE_ARCH}.so
+lib/ioquake3/renderer_opengl1_${QUAKE_ARCH}.so
+lib/ioquake3/renderer_opengl2_${QUAKE_ARCH}.so
diff --git a/games/ioquake3/distinfo b/games/ioquake3/distinfo
index 0c2ac745430..af740d106f9 100644
--- a/games/ioquake3/distinfo
+++ b/games/ioquake3/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.7 2020/01/25 16:07:15 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2020/01/25 20:13:49 jmcneill Exp $
 
-SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4
-RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293
-SHA512 (ioquake3-1.36.tar.bz2) = fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645
-Size (ioquake3-1.36.tar.bz2) = 3503058 bytes
-SHA1 (patch-aa) = c259a5261704d3b71824de60667cdc4287fe7ae7
-SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
-SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978
-SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800
-SHA1 (patch-code_tools_lcc_cpp_unix.c) = 7d9e4bf34dd0c6df0c0267449d3365604d972fdd
+SHA1 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 791bc69ea853ced457134ed4759a76b40cd0e008
+RMD160 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 10c18309b358b0b091073f96c3ddaeb7c1535aa5
+SHA512 (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 689a0efa6eaf88fcf98616c100df625b77617c55e351455cc25727fea525748855c58e2288f04d86372d392a556f2ef4926e2c808f75e104ac328baa9458c4d1
+Size (ioquake3-1.36.20200125-daae32ddfdab2172a628072ed3ff7dd1fc1563fe.tar.gz) = 7691640 bytes
+SHA1 (patch-aa) = b146df4f36fc7f9e0bfece50bd154c24e507dc2f
+SHA1 (patch-ac) = dc32068082c3493eb503811c2577b8fadb2745d3
+SHA1 (patch-code_tools_lcc_cpp_unix.c) = e80699461d92b9a659c88c0f5d66580ecf237f5f
diff --git a/games/ioquake3/patches/patch-aa b/games/ioquake3/patches/patch-aa
index fd03c579c2a..8aa0388c250 100644
--- a/games/ioquake3/patches/patch-aa
+++ b/games/ioquake3/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2020/01/25 16:07:15 jmcneill Exp $
+$NetBSD: patch-aa,v 1.5 2020/01/25 20:13:49 jmcneill Exp $
 
---- code/qcommon/q_platform.h.orig	2009-03-02 17:29:30.000000000 +0000
+--- code/qcommon/q_platform.h.orig	2019-12-07 13:16:15.000000000 +0000
 +++ code/qcommon/q_platform.h
-@@ -163,6 +163,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
- #define ARCH_STRING "mips"
- #elif defined __sh__
- #define ARCH_STRING "sh"
-+#elif defined __arm__
-+#define ARCH_STRING "arm"
- #endif
- 
- #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
-@@ -177,7 +179,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
  
  //=================================================================== BSD ===
  
@@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2020/01/25 16:07:15 jmcneill Exp $
  
  #include <sys/types.h>
  #include <machine/endian.h>
-@@ -192,6 +194,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
+@@ -216,6 +216,8 @@ Foundation, Inc., 51 Franklin St, Fifth 
  #define OS_STRING "openbsd"
  #elif defined(__NetBSD__)
  #define OS_STRING "netbsd"
@@ -29,12 +20,10 @@ $NetBSD: patch-aa,v 1.4 2020/01/25 16:07:15 jmcneill Exp $
  #endif
  
  #define ID_INLINE inline
-@@ -201,6 +205,12 @@ Foundation, Inc., 51 Franklin St, Fifth 
- #define ARCH_STRING "i386"
+@@ -229,6 +231,10 @@ Foundation, Inc., 51 Franklin St, Fifth 
+ #define ARCH_STRING "x86_64"
  #elif defined __axp__
  #define ARCH_STRING "alpha"
-+#elif defined __x86_64__
-+#define ARCH_STRING "x86_64"
 +#elif defined __arm__
 +#define ARCH_STRING "arm"
 +#elif defined __aarch64__
diff --git a/games/ioquake3/patches/patch-ab b/games/ioquake3/patches/patch-ab
deleted file mode 100644
index c8d789301a1..00000000000
--- a/games/ioquake3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/13 00:12:29 jmcneill Exp $
-
---- code/qcommon/q_shared.h.orig	2009-01-12 12:28:35.000000000 -0500
-+++ code/qcommon/q_shared.h
-@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth 
-   #define GAMENAME_FOR_MASTER		"Quake3Arena"
- #endif
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) || !defined(PRODUCT_VERSION)
-   #define PRODUCT_VERSION "1.35"
- #endif
- 
diff --git a/games/ioquake3/patches/patch-ac b/games/ioquake3/patches/patch-ac
index a3eb64616df..bb7364040b9 100644
--- a/games/ioquake3/patches/patch-ac
+++ b/games/ioquake3/patches/patch-ac
@@ -1,298 +1,58 @@
-$NetBSD: patch-ac,v 1.3 2013/10/28 23:45:59 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2020/01/25 20:13:49 jmcneill Exp $
 
---- Makefile.orig	2009-04-22 18:54:48.000000000 +0000
+--- Makefile.orig	2019-12-07 13:16:15.000000000 +0000
 +++ Makefile
-@@ -261,16 +261,13 @@ ifeq ($(PLATFORM),linux)
-   OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+@@ -11,6 +11,13 @@ ifeq ($(COMPILE_PLATFORM),sunos)
+   COMPILE_ARCH=$(shell uname -p | sed -e 's/i.86/x86/')
+ endif
  
-   ifeq ($(ARCH),x86_64)
--    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
--      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--      -fstrength-reduce
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
-     # experimental x86_64 jit compiler! you need GNU as
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),i386)
-     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
--      -funroll-loops -falign-loops=2 -falign-jumps=2 \
--      -falign-functions=2 -fstrength-reduce
-+      -funroll-loops
-     HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
-@@ -457,10 +454,7 @@ ifeq ($(PLATFORM),mingw32)
-     BASE_CFLAGS += -DUSE_CODEC_VORBIS
-   endif
- 
--  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math \
--    -falign-loops=2 -funroll-loops -falign-jumps=2 -falign-functions=2 \
--    -fstrength-reduce
--
-+  OPTIMIZE = -O3 -march=i586 -fno-omit-frame-pointer -ffast-math
-   HAVE_VM_COMPILED = true
- 
-   SHLIBEXT=dll
-@@ -550,8 +544,7 @@ ifeq ($(PLATFORM),freebsd)
-   ifeq ($(ARCH),i386)
-     RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-       -march=pentium -fomit-frame-pointer -pipe -ffast-math \
--      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--      -funroll-loops -fstrength-reduce
-+      -funroll-loops
-     HAVE_VM_COMPILED=true
-   else
-     BASE_CFLAGS += -DNO_VM_COMPILED
-@@ -611,8 +604,7 @@ ifeq ($(PLATFORM),openbsd)
-   BASE_CFLAGS += -DNO_VM_COMPILED -I/usr/X11R6/include -I/usr/local/include
-   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
-     -march=pentium -fomit-frame-pointer -pipe -ffast-math \
--    -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
--    -funroll-loops -fstrength-reduce
-+    -funroll-loops
-   HAVE_VM_COMPILED=false
- 
-   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-@@ -648,28 +640,211 @@ ifeq ($(PLATFORM),netbsd)
- 
-   ifeq ($(shell uname -m),i386)
-     ARCH=i386
-+  else
-+  ifeq ($(shell uname -m),amd64)
-+    ARCH=x86_64
-+  endif
-+  endif
-+
-+  USE_MUMBLE=0
-+
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+    -pipe -DUSE_ICON $(shell sdl-config --cflags)
-+
-+  ifeq ($(USE_OPENAL),1)
-+    BASE_CFLAGS += -DUSE_OPENAL
-+    ifeq ($(USE_OPENAL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
-+    endif
++ifeq ($(COMPILE_PLATFORM),netbsd)
++  COMPILE_CPU=$(shell uname -p)
++  ifeq ($(COMPILE_CPU),aarch64)
++    COMPILE_ARCH=$(COMPILE_CPU)
 +  endif
++endif
 +
-+  ifeq ($(USE_CURL),1)
-+    BASE_CFLAGS += -DUSE_CURL
-+    ifeq ($(USE_CURL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_CURL_DLOPEN
-+    endif
-+  endif
-+
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    BASE_CFLAGS += -DUSE_CODEC_VORBIS
-+  endif
-+
-+  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
+ ifndef BUILD_STANDALONE
+   BUILD_STANDALONE =
+ endif
+@@ -850,11 +857,38 @@ ifeq ($(PLATFORM),netbsd)
+ 
+   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+ 
++  OPTIMIZEVM = -O3
++  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
 +
 +  ifeq ($(ARCH),x86_64)
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
-+    # experimental x86_64 jit compiler! you need GNU as
-+    HAVE_VM_COMPILED = true
-+  else
-+  ifeq ($(ARCH),i386)
-+    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-+      -funroll-loops
 +    HAVE_VM_COMPILED=true
 +  else
-+  ifeq ($(ARCH),ppc)
-+    BASE_CFLAGS += -maltivec
-+    HAVE_VM_COMPILED=true
-+  endif
-+  ifeq ($(ARCH),ppc64)
-+    BASE_CFLAGS += -maltivec
-+    HAVE_VM_COMPILED=true
-+  endif
-+  endif
-+  endif
-+
-+  ifneq ($(HAVE_VM_COMPILED),true)
-+    BASE_CFLAGS += -DNO_VM_COMPILED
+   ifeq ($(ARCH),x86)
+     HAVE_VM_COMPILED=true
    endif
- 
--  LIBS=-lm
-   SHLIBEXT=so
-   SHLIBCFLAGS=-fPIC
-   SHLIBLDFLAGS=-shared $(LDFLAGS)
++  endif
 +
-   THREAD_LIBS=-lpthread
-+  LIBS=-lm
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
-+  CLIENT_LIBS=$(shell sdl-config --libs) -lGL
- 
--  ifneq ($(ARCH),i386)
--    BASE_CFLAGS += -DNO_VM_COMPILED
-+  ifeq ($(USE_OPENAL),1)
-+    ifneq ($(USE_OPENAL_DLOPEN),1)
-+      CLIENT_LIBS += -lopenal
-+    endif
-   endif
- 
--  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 +  ifeq ($(USE_CURL),1)
-+    ifneq ($(USE_CURL_DLOPEN),1)
-+      CLIENT_LIBS += -lcurl
-+    endif
++    CLIENT_CFLAGS += $(CURL_CFLAGS)
++    USE_CURL_DLOPEN=0
 +  endif
  
 -  BUILD_CLIENT = 0
--  BUILD_GAME_QVM = 0
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
-+  endif
++  CLIENT_LIBS =
 +
-+  ifeq ($(USE_MUMBLE),1)
-+    CLIENT_LIBS += -lrt
-+  endif
-+
-+  ifeq ($(USE_LOCAL_HEADERS),1)
-+    BASE_CFLAGS += -I$(SDLHDIR)/include
-+  endif
-+
-+  ifeq ($(ARCH),i386)
-+    # linux32 make ...
-+    BASE_CFLAGS += -m32
-+  else
-+  ifeq ($(ARCH),ppc64)
-+    BASE_CFLAGS += -m64
-+  endif
-+  endif
-+
-+  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-+  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
- 
- else # ifeq netbsd
- 
- #############################################################################
-+# SETUP AND BUILD -- DRAGONFLY
-+#############################################################################
-+
-+ifeq ($(PLATFORM),dragonfly)
-+
-+  ifeq ($(shell uname -m),i386)
-+    ARCH=i386
-+  else
-+  ifeq ($(shell uname -m),amd64)
-+    ARCH=x86_64
-+  endif
-+  endif
-+
-+  USE_MUMBLE=0
-+
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-+    -pipe -DUSE_ICON $(shell sdl-config --cflags)
-+
-+  ifeq ($(USE_OPENAL),1)
-+    BASE_CFLAGS += -DUSE_OPENAL
-+    ifeq ($(USE_OPENAL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_OPENAL_DLOPEN
-+    endif
-+  endif
-+
-+  ifeq ($(USE_CURL),1)
-+    BASE_CFLAGS += -DUSE_CURL
-+    ifeq ($(USE_CURL_DLOPEN),1)
-+      BASE_CFLAGS += -DUSE_CURL_DLOPEN
-+    endif
-+  endif
-+
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    BASE_CFLAGS += -DUSE_CODEC_VORBIS
-+  endif
-+
-+  OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+
-+  ifeq ($(ARCH),x86_64)
-+    OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops
-+    # experimental x86_64 jit compiler! you need GNU as
-+    HAVE_VM_COMPILED = true
-+  else
-+  ifeq ($(ARCH),i386)
-+    OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-+      -funroll-loops
-+    HAVE_VM_COMPILED=true
-+  endif
-+  endif
-+
-+  ifneq ($(HAVE_VM_COMPILED),true)
-+    BASE_CFLAGS += -DNO_VM_COMPILED
-+  endif
-+
-+  SHLIBEXT=so
-+  SHLIBCFLAGS=-fPIC
-+  SHLIBLDFLAGS=-shared $(LDFLAGS)
-+
-+  THREAD_LIBS=-lpthread
-+  LIBS=-lm
-+  CLIENT_LIBS = $(shell sdl-config --libs) -lGL
++  CLIENT_LIBS += $(SDL_LIBS)
++  RENDERER_LIBS = $(SDL_LIBS)
 +
 +  ifeq ($(USE_OPENAL),1)
 +    ifneq ($(USE_OPENAL_DLOPEN),1)
-+      CLIENT_LIBS += -lopenal
++      CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS)
 +    endif
 +  endif
 +
 +  ifeq ($(USE_CURL),1)
 +    ifneq ($(USE_CURL_DLOPEN),1)
-+      CLIENT_LIBS += -lcurl
++      CLIENT_LIBS += $(CURL_LIBS)
 +    endif
 +  endif
-+
-+  ifeq ($(USE_CODEC_VORBIS),1)
-+    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
-+  endif
-+
-+  ifeq ($(USE_MUMBLE),1)
-+    CLIENT_LIBS += -lrt
-+  endif
-+
-+  ifeq ($(USE_LOCAL_HEADERS),1)
-+    BASE_CFLAGS += -I$(SDLHDIR)/include
-+  endif
-+
-+  ifeq ($(ARCH),i386)
-+    # linux32 make ...
-+    BASE_CFLAGS += -m32
-+  else
-+  ifeq ($(ARCH),ppc64)
-+    BASE_CFLAGS += -m64
-+  endif
-+  endif
-+
-+  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-+  RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-+
-+else # ifeq dragonfly
-+
-+#############################################################################
- # SETUP AND BUILD -- IRIX
- #############################################################################
- 
-@@ -727,14 +902,12 @@ ifeq ($(PLATFORM),sunos)
- 
-   ifeq ($(ARCH),sparc)
-     OPTIMIZE = -O3 -ffast-math \
--      -fstrength-reduce -falign-functions=2 \
-       -mtune=ultrasparc3 -mv8plus -mno-faster-structs \
-       -funroll-loops #-mv8plus
-   else
-   ifeq ($(ARCH),i386)
-     OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
--      -funroll-loops -falign-loops=2 -falign-jumps=2 \
--      -falign-functions=2 -fstrength-reduce
-+      -funroll-loops
-     HAVE_VM_COMPILED=true
-     BASE_CFLAGS += -m32
-     BASE_CFLAGS += -I/usr/X11/include/NVIDIA
-@@ -780,6 +953,7 @@ endif #mingw32
- endif #FreeBSD
- endif #OpenBSD
- endif #NetBSD
-+endif #DragonFly
- endif #IRIX
- endif #SunOS
+ else # ifeq netbsd
  
+ #############################################################################
diff --git a/games/ioquake3/patches/patch-ad b/games/ioquake3/patches/patch-ad
deleted file mode 100644
index ce2f2e935ae..00000000000
--- a/games/ioquake3/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/06/06 22:04:50 wiz Exp $
-
---- code/qcommon/vm_x86_64.c.orig	2008-08-06 16:09:29.000000000 +0000
-+++ code/qcommon/vm_x86_64.c
-@@ -58,6 +58,10 @@ void assemble_line(const char* input, si
- #endif
- #endif // USE_GAS
- 
-+#ifndef MAP_ANONYMOUS
-+#define MAP_ANONYMOUS MAP_ANON
-+#endif
-+
- static void VM_Destroy_Compiled(vm_t* self);
- 
- /*
-@@ -246,7 +250,7 @@ void emit(const char* fmt, ...)
- #else
- #define JMPIARG \
- 	emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
--	emit("jmpq *%rax");
-+	emit("jmpq *%%rax");
- #endif
-  
- // integer compare and jump
diff --git a/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c b/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c
index 3351bd0a207..b79d8f80c69 100644
--- a/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c
+++ b/games/ioquake3/patches/patch-code_tools_lcc_cpp_unix.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-code_tools_lcc_cpp_unix.c,v 1.1 2020/01/25 16:07:15 jmcneill Exp $
+$NetBSD: patch-code_tools_lcc_cpp_unix.c,v 1.2 2020/01/25 20:13:50 jmcneill Exp $
 
 Use built-in memmove on NetBSD.
 
---- code/tools/lcc/cpp/unix.c.orig	2008-04-23 17:39:39.000000000 +0000
+--- code/tools/lcc/cpp/unix.c.orig	2020-01-25 19:19:26.823146950 +0000
 +++ code/tools/lcc/cpp/unix.c
-@@ -99,7 +99,7 @@ char *basepath( char *fname )
- /* memmove is defined here because some vendors don't provide it at
+@@ -106,7 +106,7 @@ char *basepath( char *fname )
     all and others do a terrible job (like calling malloc) */
  // -- ouch, that hurts -- ln
--#ifndef MACOS_X   /* always use the system memmove() on Mac OS X. --ryan. */
-+#if !defined(MACOS_X) && !defined(__NetBSD__)   /* always use the system memmove() */
+ /* always use the system memmove() on Mac OS X. --ryan. */
+-#if !defined(__APPLE__) && !defined(_MSC_VER)
++#if !defined(__APPLE__) && !defined(_MSC_VER) && !defined(__NetBSD__)
  #ifdef memmove
  #undef memmove
  #endif