Make this at least build.

This was obviously not tested at all...! :-(

18 files changed, 99 insertions, 107 deletions

diff --git a/games/quake/Makefile b/games/quake/Makefile
index a0fb5db0c2f..c5958704736 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/09/27 23:18:08 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2002/01/02 10:01:34 hubertf Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -27,28 +27,29 @@ USE_MESA=	yes
 
 EVAL_PREFIX+=	MESA_DIR=Mesa
 MAKE_ENV+=	MESA_DIR=${MESA_DIR}
+MAKE_ENV+=	X11BASE=${X11BASE}
 
 do-configure:
-	cd ${WRKSRC}/QW && ${LN} -fs Makefile.Linux ${MAKEFILE}
-	cd ${WRKSRC}/WinQuake && ${LN} -fs Makefile.linuxi386 ${MAKEFILE}
+	cd ${WRKSRC}/qw && ${LN} -fs makefile.linux ${MAKEFILE}
+	cd ${WRKSRC}/winquake && ${LN} -fs makefile.linuxi386 ${MAKEFILE}
 
 #pre-build:
-#	cd ${WRKSRC}/WinQuake && \
+#	cd ${WRKSRC}/winquake && \
 #		${MV} common.c common.c.orig && \
 #		${SED} "s@GAMENAME, basedir@GAMENAME, \"${PREFIX}/share/quake/\"@" \
 #			< common.c.orig > common.c
 
 do-build:
-	@( cd ${WRKSRC}/QW ; ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" all)
-	@( cd ${WRKSRC}/WinQuake ; ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" \
+	( cd ${WRKSRC}/qw ; ${SETENV} ${MAKE_ENV} ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" all)
+	( cd ${WRKSRC}/winquake ; ${SETENV} ${MAKE_ENV} ${GMAKE} MAINDIR=`pwd` CFLAGS="${CFLAGS}" \
 		WRKSRC="${WRKSRC}" all)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/QW/release_version/qwsv ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/QW/release_version/qwcl.x11 ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/QW/release_version/glqwcl.glx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/WinQuake/release_version/bin/glquake.glx ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/WinQuake/release_version/bin/quake.x11 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwsv ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/qwcl.x11 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/qw/release_version/glqwcl.glx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/glquake.glx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/winquake/release_version/bin/quake.x11 ${PREFIX}/bin
 
 post-install:
 	@ ${ECHO}
diff --git a/games/quake/distinfo b/games/quake/distinfo
index e56ab77c78a..54b15744fae 100644
--- a/games/quake/distinfo
+++ b/games/quake/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:34 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/01/02 10:01:34 hubertf Exp $
 
 SHA1 (q1source.zip) = 1f607e549c6aa3921797e51b7d2038e95116c989
 Size (q1source.zip) = 3211531 bytes
-SHA1 (patch-aa) = 6d6b82b1aa6b1326150ed356cb4ac5a3e4ea6497
-SHA1 (patch-ab) = 26a1565b6680852b246b90a855e92944e4abb211
-SHA1 (patch-ac) = 2be6028d15ede5819791c0809ed937755b144ab4
-SHA1 (patch-ad) = 4a690fad210a74e0406622c25528ebe31c86ad93
-SHA1 (patch-ae) = b3444e1e4a5ad2543e19c222a6eb3e7fd784c8ef
-SHA1 (patch-af) = 62d30603315da47800310e083cee438492db05bf
-SHA1 (patch-ag) = 9659ee164a0012a114f0f1a5a581cce280085311
-SHA1 (patch-ah) = de677bd9b90fe0d1f36abe3b71f66277be351c15
-SHA1 (patch-ai) = e80d3eb00bba4edb15deaf5332cbde29e877f22f
-SHA1 (patch-aj) = 886a35e0039ad1030c9803b4311c9c517c3cf05c
-SHA1 (patch-ak) = 44e5305375e41277e902980f7fd398fb1fcbeba8
-SHA1 (patch-al) = 1e40eb69839753348e023bc31f01331b6d4f51ef
-SHA1 (patch-am) = 0aed65d5a82c99b79630c3955359829857289337
-SHA1 (patch-an) = b769e61777a9f83b8a9c4479e3d70964755ff3d8
-SHA1 (patch-ao) = bc8467d008b88dc04e3a8cfdcbb346139e2ddd7e
-SHA1 (patch-ap) = 41debc2d9e3533f09d55edc007ff397eef666fec
+SHA1 (patch-aa) = 99fd7868c2968bb0214282c35a865119cc33721c
+SHA1 (patch-ab) = b459f48703568180445a35e74290bacf87fea170
+SHA1 (patch-ac) = 595e319415fe22e8115170415a6bd69c9da9d1be
+SHA1 (patch-ad) = 84349e4164ee0b2bc4cffd420e9520ce2619495d
+SHA1 (patch-ae) = 9efe7e9ca9f61b142662f82f1602690b471581a5
+SHA1 (patch-af) = ff7a770648efdbf4bf9f91b4502ad5ca93840bbc
+SHA1 (patch-ag) = 56e3b11afe9d2cccf3136b3cd78419d00c8f7487
+SHA1 (patch-ah) = 23501badb57bf8d11bf75105c1dffb7adf19a64d
+SHA1 (patch-ai) = 3240e65a5d9c8acdd0c21482a7f903a3c361081c
+SHA1 (patch-aj) = 50446164a7ad9085a2e191047f60483885d043c3
+SHA1 (patch-ak) = b7b22a7b01a86522f3dfd510bf31a44c468279b9
+SHA1 (patch-al) = ca76927f36ad4f5f14ec64600bb4d40f0a758b71
+SHA1 (patch-am) = c64a9a46681ad48c4ea2fcca07d33b071f49f6d5
+SHA1 (patch-an) = 03e71dd225ab6ff371b33e51acee46b84a9e0d82
+SHA1 (patch-ao) = 43d50ff9845731bff3171be474129f184a427551
+SHA1 (patch-ap) = 099e308b830738e1754ae634d29dd770f5b4f607
diff --git a/games/quake/patches/patch-aa b/games/quake/patches/patch-aa
index 81f72f183a5..3f45d69d996 100644
--- a/games/quake/patches/patch-aa
+++ b/games/quake/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2000/02/01 02:30:32 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/client/cd_linux.c	Tue Dec 21 18:58:58 1999
-+++ ../work/QW/client/cd_linux.c	Sun Jan 16 19:56:16 2000
-@@ -10,7 +10,7 @@
- but WITHOUT ANY WARRANTY; without even the implied warranty of

- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  

- 

--See the included (GNU.txt) GNU General Public License for more details.

-+See the GNU General Public License for more details.

- 

- You should have received a copy of the GNU General Public License

- along with this program; if not, write to the Free Software

+--- qw/client/cd_linux.c.orig	Tue Dec 21 18:58:58 1999
++++ qw/client/cd_linux.c
 @@ -31,7 +31,19 @@
  #include <time.h>
  #include <errno.h>
diff --git a/games/quake/patches/patch-ab b/games/quake/patches/patch-ab
index 7ef1bcd4f35..73426865de2 100644
--- a/games/quake/patches/patch-ab
+++ b/games/quake/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2000/02/01 02:30:32 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/client/gl_draw.c	Tue Dec 21 15:46:06 1999
+--- qw/client/gl_draw.c	Tue Dec 21 15:46:06 1999
 +++ ../work/QW/client/gl_draw.c	Sat Jan 15 23:08:00 2000
 @@ -1367,7 +1367,7 @@
  {
diff --git a/games/quake/patches/patch-ac b/games/quake/patches/patch-ac
index 432b85b8708..ccc98c6cb80 100644
--- a/games/quake/patches/patch-ac
+++ b/games/quake/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2000/02/01 02:30:33 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/client/gl_vidlinuxglx.c	Tue Dec 21 18:45:54 1999
+--- qw/client/gl_vidlinuxglx.c	Tue Dec 21 18:45:54 1999
 +++ ../work/QW/client/gl_vidlinuxglx.c	Wed Jan 19 21:58:20 2000
 @@ -20,7 +20,6 @@
  #include <termios.h>
diff --git a/games/quake/patches/patch-ad b/games/quake/patches/patch-ad
index 9f29dc2dae9..cdaf54964c9 100644
--- a/games/quake/patches/patch-ad
+++ b/games/quake/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2000/02/01 02:30:33 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/client/snd_linux.c	Mon Jul  7 20:08:00 1997
+--- qw/client/snd_linux.c	Mon Jul  7 20:08:00 1997
 +++ ../work/QW/client/snd_linux.c	Sun Jan 16 19:35:45 2000
 @@ -6,15 +6,33 @@
  #include <sys/mman.h>
diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae
index 9a65483cf32..3836ca064c9 100644
--- a/games/quake/patches/patch-ae
+++ b/games/quake/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2000/10/05 05:53:36 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/Makefile.Linux.orig	Wed Apr 21 20:16:24 1999
-+++ QW/Makefile.Linux
+--- qw/makefile.linux.orig	Wed Apr 21 20:16:24 1999
++++ qw/makefile.linux
 @@ -27,41 +27,51 @@
  RPMARCH=i386
  endif
diff --git a/games/quake/patches/patch-af b/games/quake/patches/patch-af
index 6f3246b38d2..43ec65ef98a 100644
--- a/games/quake/patches/patch-af
+++ b/games/quake/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2000/02/01 02:30:33 wiz Exp $
+$NetBSD: patch-af,v 1.2 2002/01/02 10:01:35 hubertf Exp $
 
---- QW/server/sys_unix.c	Tue Dec 21 18:45:14 1999
+--- qw/server/sys_unix.c	Tue Dec 21 18:45:14 1999
 +++ ../work/QW/server/sys_unix.c	Sat Jan 15 23:02:46 2000
 @@ -24,7 +24,7 @@
  #include <libc.h>
diff --git a/games/quake/patches/patch-ag b/games/quake/patches/patch-ag
index bef8e3539d4..cb23a329102 100644
--- a/games/quake/patches/patch-ag
+++ b/games/quake/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2000/02/01 02:30:34 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2002/01/02 10:01:35 hubertf Exp $
 
---- WinQuake/cd_linux.c	Tue Dec 21 18:40:50 1999
-+++ ../work/WinQuake/cd_linux.c	Sat Jan 15 10:52:27 2000
+--- winquake/cd_linux.c	Tue Dec 21 18:40:50 1999
++++ ../work/winquake/cd_linux.c	Sat Jan 15 10:52:27 2000
 @@ -31,7 +31,19 @@
  #include <time.h>
  #include <errno.h>
diff --git a/games/quake/patches/patch-ah b/games/quake/patches/patch-ah
index 2e5a97bad9b..1173baf8002 100644
--- a/games/quake/patches/patch-ah
+++ b/games/quake/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2000/02/01 02:30:34 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/gl_vidlinuxglx.c	Tue Dec 21 18:39:36 1999
-+++ ../work/WinQuake/gl_vidlinuxglx.c	Thu Jan 13 22:29:03 2000
+--- winquake/gl_vidlinuxglx.c	Tue Dec 21 18:39:36 1999
++++ ../work/winquake/gl_vidlinuxglx.c	Thu Jan 13 22:29:03 2000
 @@ -20,7 +20,9 @@
  #include <termios.h>
  #include <sys/ioctl.h>
diff --git a/games/quake/patches/patch-ai b/games/quake/patches/patch-ai
index b11684dfc79..0d3181d07df 100644
--- a/games/quake/patches/patch-ai
+++ b/games/quake/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.4 2000/10/05 05:53:36 jlam Exp $
+$NetBSD: patch-ai,v 1.5 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/Makefile.linuxi386.orig	Tue Apr 27 17:51:18 1999
-+++ WinQuake/Makefile.linuxi386
+--- winquake/makefile.linuxi386.orig	Tue Apr 27 17:51:18 1999
++++ winquake/makefile.linuxi386
 @@ -25,29 +25,31 @@
  endif
  NOARCH=noarch
  
 -MOUNT_DIR=/grog/Projects/WinQuake
-+MOUNT_DIR=${WRKSRC}/WinQuake
++MOUNT_DIR=${WRKSRC}/winquake
  MASTER_DIR=/grog/Projects/QuakeMaster
 -MESA_DIR=/usr/local/src/Mesa-2.6
 +#MESA_DIR=/usr/local/src/Mesa-2.6
@@ -66,16 +66,16 @@ $NetBSD: patch-ai,v 1.4 2000/10/05 05:53:36 jlam Exp $
 -	$(BUILDDIR)/bin/glquake \
 -	$(BUILDDIR)/bin/glquake.glx \
 -	$(BUILDDIR)/bin/glquake.3dfxgl \
--	$(BUILDDIR)/bin/quake.x11
 +#TARGETS=$(BUILDDIR)/bin/squake \
 +#	$(BUILDDIR)/bin/glquake \
 +#	$(BUILDDIR)/bin/glquake.glx \
 +#	$(BUILDDIR)/bin/glquake.3dfxgl \
 +#	$(BUILDDIR)/bin/quake.x11
- 	# $(BUILDDIR)/bin/unixded
++# $(BUILDDIR)/bin/unixded
 +
 +TARGETS=$(BUILDDIR)/bin/glquake.glx \
-+	$(BUILDDIR)/bin/quake.x11
+ 	$(BUILDDIR)/bin/quake.x11
+-	# $(BUILDDIR)/bin/unixded
 +
 +#TARGETS=$(BUILDDIR)/bin/quake.x11
  
diff --git a/games/quake/patches/patch-aj b/games/quake/patches/patch-aj
index 2c58b3ecf77..50be61af72e 100644
--- a/games/quake/patches/patch-aj
+++ b/games/quake/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.1 2000/02/01 02:30:35 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/snd_linux.c	Tue Dec 21 18:40:36 1999
-+++ ../work/WinQuake/snd_linux.c	Thu Jan 20 21:52:45 2000
+--- winquake/snd_linux.c	Tue Dec 21 18:40:36 1999
++++ ../work/winquake/snd_linux.c	Thu Jan 20 21:52:45 2000
 @@ -25,15 +6,33 @@
  #include <sys/mman.h>
  #include <sys/shm.h>
diff --git a/games/quake/patches/patch-ak b/games/quake/patches/patch-ak
index 9f9f5f238a2..d4c189de9d5 100644
--- a/games/quake/patches/patch-ak
+++ b/games/quake/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1 2000/02/01 02:30:35 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/vid_x.c.orig	Tue Dec 21 18:40:22 1999
-+++ WinQuake/vid_x.c	Fri Jan 28 23:34:06 2000
+--- winquake/vid_x.c.orig	Tue Dec 21 18:40:22 1999
++++ winquake/vid_x.c	Fri Jan 28 23:34:06 2000
 @@ -711,6 +711,9 @@
  void	VID_Shutdown (void)
  {
diff --git a/games/quake/patches/patch-al b/games/quake/patches/patch-al
index 721d6d45b4f..6522e3cce03 100644
--- a/games/quake/patches/patch-al
+++ b/games/quake/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.2 2000/02/08 14:53:46 wiz Exp $
+$NetBSD: patch-al,v 1.3 2002/01/02 10:01:36 hubertf Exp $
 
---- QW/server/asm_i386.h.orig	Tue Feb  8 11:39:20 2000
-+++ QW/server/asm_i386.h	Tue Feb  8 11:39:37 2000
+--- qw/server/asm_i386.h.orig	Tue Feb  8 11:39:20 2000
++++ qw/server/asm_i386.h	Tue Feb  8 11:39:37 2000
 @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #ifndef __ASM_I386__
  #define __ASM_I386__
diff --git a/games/quake/patches/patch-am b/games/quake/patches/patch-am
index f002c77ce97..4c157d4bd4b 100644
--- a/games/quake/patches/patch-am
+++ b/games/quake/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.2 2000/02/08 14:53:46 wiz Exp $
+$NetBSD: patch-am,v 1.3 2002/01/02 10:01:36 hubertf Exp $
 
---- QW/client/asm_i386.h.orig	Tue Feb  8 11:39:49 2000
-+++ QW/client/asm_i386.h	Tue Feb  8 11:40:03 2000
+--- qw/client/asm_i386.h.orig	Tue Feb  8 11:39:49 2000
++++ qw/client/asm_i386.h	Tue Feb  8 11:40:03 2000
 @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #ifndef __ASM_I386__
  #define __ASM_I386__
diff --git a/games/quake/patches/patch-an b/games/quake/patches/patch-an
index b656d6b3572..1b1c9139266 100644
--- a/games/quake/patches/patch-an
+++ b/games/quake/patches/patch-an
@@ -1,7 +1,7 @@
-$NetBSD: patch-an,v 1.2 2000/02/08 14:53:46 wiz Exp $
+$NetBSD: patch-an,v 1.3 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/asm_i386.h.orig	Tue Feb  8 11:40:46 2000
-+++ WinQuake/asm_i386.h	Tue Feb  8 11:40:59 2000
+--- winquake/asm_i386.h.orig	Tue Feb  8 11:40:46 2000
++++ winquake/asm_i386.h	Tue Feb  8 11:40:59 2000
 @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
  #ifndef __ASM_I386__
  #define __ASM_I386__
diff --git a/games/quake/patches/patch-ao b/games/quake/patches/patch-ao
index f6e669c15b8..967f41c6442 100644
--- a/games/quake/patches/patch-ao
+++ b/games/quake/patches/patch-ao
@@ -1,27 +1,27 @@
-$NetBSD: patch-ao,v 1.1 2000/08/07 02:30:43 wiz Exp $
+$NetBSD: patch-ao,v 1.2 2002/01/02 10:01:36 hubertf Exp $
 
---- QW/client/glquake.h.orig	Tue Dec 21 15:49:06 1999
-+++ QW/client/glquake.h	Mon Aug  7 03:08:01 2000
+--- qw/client/glquake.h.orig	Tue Dec 21 15:49:06 1999
++++ qw/client/glquake.h
 @@ -35,15 +35,15 @@
- 

- 

- // Function prototypes for the Texture Object Extension routines

--typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,

-+typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,

-                     const GLboolean *);

--typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);

--typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);

--typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);

--typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint);

--typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,

-+typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);

-+typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);

-+typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);

-+typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint);

-+typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,

-                     const GLclampf *);

--typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);

-+typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);

- 

- extern	BINDTEXFUNCPTR bindTexFunc;

- extern	DELTEXFUNCPTR delTexFunc;

+ 
+ 
+ // Function prototypes for the Texture Object Extension routines
+-typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,
++typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *,
+                     const GLboolean *);
+-typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);
+-typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);
+-typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);
+-typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint);
+-typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,
++typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint);
++typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *);
++typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *);
++typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint);
++typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *,
+                     const GLclampf *);
+-typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);
++typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *);
+ 
+ extern	BINDTEXFUNCPTR bindTexFunc;
+ extern	DELTEXFUNCPTR delTexFunc;
diff --git a/games/quake/patches/patch-ap b/games/quake/patches/patch-ap
index bdff213c0de..a385251b842 100644
--- a/games/quake/patches/patch-ap
+++ b/games/quake/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2000/12/27 03:36:14 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2002/01/02 10:01:36 hubertf Exp $
 
---- WinQuake/net.h.orig	Tue Dec 21 15:54:20 1999
-+++ WinQuake/net.h
+--- winquake/net.h.orig	Tue Dec 21 15:54:20 1999
++++ winquake/net.h
 @@ -238,7 +238,7 @@
  extern int hostCacheCount;
  extern hostcache_t hostcache[HOSTCACHESIZE];