make buildable on ELF

6 files changed, 45 insertions, 22 deletions

diff --git a/games/quake/Makefile b/games/quake/Makefile
index 262d354224c..4e5a84f22b4 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/05 18:36:19 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/08 12:07:15 jdolecek Exp $
 
 DISTNAME=	q1source
 PKGNAME=	quake-2.30
@@ -16,14 +16,6 @@ DEPENDS+=	Mesa-*:../../graphics/Mesa
 
 ONLY_FOR_PLATFORMS=	NetBSD-1.4.[1-9]-i386
 USE_GMAKE=	yes
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OBJECT_FMT} == "ELF")
-CFLAGS+=-DELF
-.else
-CFLAGS+=-DAOUT
-.endif
-
 EXTRACT_CMD=	${UNZIP} -q ${DISTDIR}/${EXTRACT_ONLY}
 MAKE_ENV+=	MAINDIR=${WRKSRC}
 UNZIP=		${LOCALBASE}/bin/unzip
diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae
index b06d31dd498..9849f88ff7f 100644
--- a/games/quake/patches/patch-ae
+++ b/games/quake/patches/patch-ae
@@ -1,7 +1,5 @@
-$NetBSD: patch-ae,v 1.2 2000/02/01 02:30:33 wiz Exp $
-
---- QW/Makefile.Linux	Wed Apr 21 20:16:24 1999
-+++ ../work/QW/Makefile.Linux	Wed Jan 19 21:37:30 2000
+--- QW/Makefile.Linux.orig	Wed Apr 21 20:16:24 1999
++++ QW/Makefile.Linux	Tue Feb  8 12:16:23 2000
 @@ -27,41 +27,51 @@
  RPMARCH=i386
  endif
@@ -42,11 +40,12 @@ $NetBSD: patch-ae,v 1.2 2000/02/01 02:30:33 wiz Exp $
 -LDFLAGS=-lm
 +LDFLAGS=-lm -lossaudio
  SVGALDFLAGS=-lvga
- XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
+-XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext
 -GL_SVGA_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga
 -GL_X11_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext
-+GL_SVGA_LDFLAGS=-L/usr/X11R6/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga
-+GL_X11_LDFLAGS=-L/usr/X11R6/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext
++XLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -lX11 -lXext
++GL_SVGA_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga
++GL_X11_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext
  
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
 -DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $<
diff --git a/games/quake/patches/patch-ai b/games/quake/patches/patch-ai
index 0b47aaafdc3..5ca870d4b5e 100644
--- a/games/quake/patches/patch-ai
+++ b/games/quake/patches/patch-ai
@@ -1,7 +1,5 @@
-$NetBSD: patch-ai,v 1.1 2000/02/01 02:30:34 wiz Exp $
-
---- WinQuake/Makefile.linuxi386	Tue Apr 27 17:51:18 1999
-+++ ../work/WinQuake/Makefile.linuxi386	Wed Jan 19 21:38:00 2000
+--- WinQuake/Makefile.linuxi386.orig	Tue Apr 27 17:51:18 1999
++++ WinQuake/Makefile.linuxi386	Tue Feb  8 12:06:10 2000
 @@ -25,29 +25,32 @@
  endif
  NOARCH=noarch
@@ -33,15 +31,16 @@ $NetBSD: patch-ai,v 1.1 2000/02/01 02:30:34 wiz Exp $
 -LDFLAGS=-lm
 +LDFLAGS=-lm -lossaudio
  SVGALDFLAGS=-lvga
- XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
+-XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
 -XCFLAGS=-DX11
++XLDFLAGS=-L/usr/X11R6/lib -Wl,-rpath -Wl,${X11BASE}/lib -lX11 -lXext -lXxf86dga
 +XCFLAGS=-DX11 -I${X11BASE}/include
  
 -MESAGLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -L$(MESA_DIR)/lib -lMesaGL -lglide2x -lX11 -lXext -ldl
 +MESAGLLDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib -L$(MESA_DIR)/lib -lMesaGL -lX11 -lXext
  TDFXGLLDFLAGS=-L$(TDFXGL_DIR)/release$(ARCH)$(GLIBC) -l3dfxgl -lglide2x -ldl
 -GLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm -lm
-+GLLDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm
++GLLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-rpath -Wl,"${LOCALBASE}/lib" -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm
  GLCFLAGS=-DGLQUAKE -I$(MESA_DIR)/include -I/usr/include/glide
  
  DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
diff --git a/games/quake/patches/patch-al b/games/quake/patches/patch-al
new file mode 100644
index 00000000000..d21db029e7f
--- /dev/null
+++ b/games/quake/patches/patch-al
@@ -0,0 +1,11 @@
+--- 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__
+ 
+-#ifdef ELF
++#if defined(ELF) || defined(__ELF__)
+ #define C(label) label
+ #else
+ #define C(label) _##label
diff --git a/games/quake/patches/patch-am b/games/quake/patches/patch-am
new file mode 100644
index 00000000000..905fa11c864
--- /dev/null
+++ b/games/quake/patches/patch-am
@@ -0,0 +1,11 @@
+--- 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__
+ 
+-#ifdef ELF
++#if defined(ELF) || defined(__ELF__)
+ #define C(label) label
+ #else
+ #define C(label) _##label
diff --git a/games/quake/patches/patch-an b/games/quake/patches/patch-an
new file mode 100644
index 00000000000..c6da12f47d3
--- /dev/null
+++ b/games/quake/patches/patch-an
@@ -0,0 +1,11 @@
+--- 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__
+ 
+-#ifdef ELF
++#if defined(ELF) || defined(__ELF__)
+ #define C(label) label
+ #else
+ #define C(label) _##label