diff options
author | jlam <jlam@pkgsrc.org> | 2000-10-05 05:53:35 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2000-10-05 05:53:35 +0000 |
commit | e99e7432bfb55c85a5b608893e5938d80d16634f (patch) | |
tree | a374a6db49bbec1353f33627874b3505ea0e635c /games/quake | |
parent | ed8bfabafbdb9313d86c055e7220140f3f900c7b (diff) | |
download | pkgsrc-e99e7432bfb55c85a5b608893e5938d80d16634f.tar.gz |
Make this compile if xpkgwedge is installed.
Diffstat (limited to 'games/quake')
-rw-r--r-- | games/quake/Makefile | 5 | ||||
-rw-r--r-- | games/quake/files/patch-sum | 6 | ||||
-rw-r--r-- | games/quake/patches/patch-ae | 14 | ||||
-rw-r--r-- | games/quake/patches/patch-ai | 11 |
4 files changed, 20 insertions, 16 deletions
diff --git a/games/quake/Makefile b/games/quake/Makefile index 0bf888d32b8..ba50b80ff90 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/10/05 04:44:59 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2000/10/05 05:53:35 jlam Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -22,6 +22,9 @@ MAKE_ENV+= MAINDIR=${WRKSRC} NO_WRKSUBDIR= yes USE_X11BASE= yes +EVAL_PREFIX+= MESA_DIR=Mesa +MAKE_ENV+= MESA_DIR=${MESA_DIR} + do-configure: cd ${WRKSRC}/QW && ${LN} -fs Makefile.Linux ${MAKEFILE} cd ${WRKSRC}/WinQuake && ${LN} -fs Makefile.linuxi386 ${MAKEFILE} diff --git a/games/quake/files/patch-sum b/games/quake/files/patch-sum index daef71025a5..23d5e6e970f 100644 --- a/games/quake/files/patch-sum +++ b/games/quake/files/patch-sum @@ -1,14 +1,14 @@ -$NetBSD: patch-sum,v 1.5 2000/08/07 02:30:45 wiz Exp $ +$NetBSD: patch-sum,v 1.6 2000/10/05 05:53:35 jlam Exp $ MD5 (patch-aa) = ca8929f5c8caf73b43b48fa14c09b281 MD5 (patch-ab) = 39706631f63064d4299b7ccd6767bc0a MD5 (patch-ac) = 1dad1922b2ea70fd119b132d36358142 MD5 (patch-ad) = 3a81e2a769af2835c972e702c4345b63 -MD5 (patch-ae) = fbb72654e263481a158c19d2ee96adde +MD5 (patch-ae) = 3eecc3fa54304a3d2de4caf875c4b80c MD5 (patch-af) = 827982b68b784dfcfe124deb6ba3ac69 MD5 (patch-ag) = 814d77ae3065fbb3f3411da64e3fd176 MD5 (patch-ah) = 6201cef494a01730ae5a1d500bc46ed1 -MD5 (patch-ai) = 75a11225cc87e2a18377f9aebf714403 +MD5 (patch-ai) = b2665f6d36b50ea71e4d086500edef6c MD5 (patch-aj) = de649d1277ee2426491bd6a4f7ed5eba MD5 (patch-ak) = 293084381e6cafe33d7c79cb1571880b MD5 (patch-al) = c61b7e85d2744e5a9f76d94fe67a7ee9 diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae index 98a390c5ee9..9a65483cf32 100644 --- a/games/quake/patches/patch-ae +++ b/games/quake/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.4 2000/02/08 14:53:45 wiz Exp $ +$NetBSD: patch-ae,v 1.5 2000/10/05 05:53:36 jlam Exp $ --- QW/Makefile.Linux.orig Wed Apr 21 20:16:24 1999 -+++ QW/Makefile.Linux Tue Feb 8 12:16:23 2000 ++++ QW/Makefile.Linux @@ -27,41 +27,51 @@ RPMARCH=i386 endif @@ -17,7 +17,8 @@ $NetBSD: patch-ae,v 1.4 2000/02/08 14:53:45 wiz Exp $ CLIENT_DIR=$(MAINDIR)/client SERVER_DIR=$(MAINDIR)/server - MESA_DIR=/usr/local/src/Mesa-3.0 +-MESA_DIR=/usr/local/src/Mesa-3.0 ++#MESA_DIR=/usr/local/src/Mesa-3.0 CC=gcc -BASE_CFLAGS=-Wall -Dstricmp=strcasecmp -I$(CLIENT_DIR) -I$(SERVER_DIR) @@ -37,7 +38,8 @@ $NetBSD: patch-ae,v 1.4 2000/02/08 14:53:45 wiz Exp $ -fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \ -malign-jumps=2 -malign-functions=2 endif - GLCFLAGS=-DGLQUAKE -I/usr/local/src/Mesa-3.0/include -I/usr/include/glide +-GLCFLAGS=-DGLQUAKE -I/usr/local/src/Mesa-3.0/include -I/usr/include/glide ++GLCFLAGS=-DGLQUAKE -I${MESA_DIR}/include -I/usr/include/glide -LDFLAGS=-lm +LDFLAGS=-lm -lossaudio @@ -46,8 +48,8 @@ $NetBSD: patch-ae,v 1.4 2000/02/08 14:53:45 wiz Exp $ -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 +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 ++GL_SVGA_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga ++GL_X11_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/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 876ad706894..b11684dfc79 100644 --- a/games/quake/patches/patch-ai +++ b/games/quake/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.3 2000/02/08 14:53:45 wiz Exp $ +$NetBSD: patch-ai,v 1.4 2000/10/05 05:53:36 jlam Exp $ --- 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 @@ ++++ WinQuake/Makefile.linuxi386 +@@ -25,29 +25,31 @@ endif NOARCH=noarch @@ -11,7 +11,6 @@ $NetBSD: patch-ai,v 1.3 2000/02/08 14:53:45 wiz Exp $ MASTER_DIR=/grog/Projects/QuakeMaster -MESA_DIR=/usr/local/src/Mesa-2.6 +#MESA_DIR=/usr/local/src/Mesa-2.6 -+MESA_DIR=${X11BASE} TDFXGL_DIR = /home/zoid/3dfxgl -BUILD_DEBUG_DIR=debug$(ARCH)$(GLIBC) @@ -42,11 +41,11 @@ $NetBSD: patch-ai,v 1.3 2000/02/08 14:53:45 wiz Exp $ +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 -Wl,-rpath -Wl,${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-rpath -Wl,"${LOCALBASE}/lib" -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm ++GLLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm GLCFLAGS=-DGLQUAKE -I$(MESA_DIR)/include -I/usr/include/glide DO_CC=$(CC) $(CFLAGS) -o $@ -c $< -@@ -57,19 +60,28 @@ +@@ -57,19 +59,28 @@ DO_X11_CC=$(CC) $(CFLAGS) $(XCFLAGS) -o $@ -c $< DO_X11_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(XCFLAGS) -o $@ -c $< DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $< |