diff options
| author | jschauma <jschauma> | 2003-03-09 19:46:51 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-03-09 19:46:51 +0000 |
| commit | 10576c80ee95498de2a7a60ab5691fe174c6f308 (patch) | |
| tree | e0df3922504cc2cdaa78eb3dff75ab1c054ef11f /games/quake/patches | |
| parent | c5ef8bcf675f083a7830417856df33753384318e (diff) | |
| download | pkgsrc-10576c80ee95498de2a7a60ab5691fe174c6f308.tar.gz | |
Bump PKGREVISION due to upgrade of Mesa and friends.
Only include Mesa/buildlink2.mk if the package requires all three of
MesaLib, glu and glut - else only include the necessary buildlink2s.
Diffstat (limited to 'games/quake/patches')
| -rw-r--r-- | games/quake/patches/patch-ae | 10 | ||||
| -rw-r--r-- | games/quake/patches/patch-ai | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae index 3836ca064c9..44687a8cca4 100644 --- a/games/quake/patches/patch-ae +++ b/games/quake/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.6 2002/01/02 10:01:35 hubertf Exp $ +$NetBSD: patch-ae,v 1.7 2003/03/09 19:46:53 jschauma Exp $ --- qw/makefile.linux.orig Wed Apr 21 20:16:24 1999 +++ qw/makefile.linux @@ -42,14 +42,14 @@ $NetBSD: patch-ae,v 1.6 2002/01/02 10:01:35 hubertf Exp $ +GLCFLAGS=-DGLQUAKE -I${MESA_DIR}/include -I/usr/include/glide -LDFLAGS=-lm -+LDFLAGS=-lm -lossaudio ++LDFLAGS+=-lm -lossaudio SVGALDFLAGS=-lvga -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 -+XLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -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 ++XLDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -lX11 -lXext ++GL_SVGA_LDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${MESA_DIR}/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga ++GL_X11_LDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${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 0d3181d07df..3cfd74b5eba 100644 --- a/games/quake/patches/patch-ai +++ b/games/quake/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.5 2002/01/02 10:01:36 hubertf Exp $ +$NetBSD: patch-ai,v 1.6 2003/03/09 19:46:53 jschauma Exp $ --- winquake/makefile.linuxi386.orig Tue Apr 27 17:51:18 1999 +++ winquake/makefile.linuxi386 @@ -25,23 +25,23 @@ $NetBSD: patch-ai,v 1.5 2002/01/02 10:01:36 hubertf Exp $ +#CC=$(EGCS) -BASE_CFLAGS=-Dstricmp=strcasecmp -+BASE_CFLAGS=-Dstricmp=strcasecmp -I${X11BASE}/include ++BASE_CFLAGS=-Dstricmp=strcasecmp -I${X11BASE}/include ${CFLAGS} RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations DEBUG_CFLAGS=$(BASE_CFLAGS) -g -LDFLAGS=-lm -+LDFLAGS=-lm -lossaudio ++LDFLAGS+=-lm -lossaudio SVGALDFLAGS=-lvga -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 ++XLDFLAGS=-L/usr/X11R6/lib ${LDFLAGS} -lX11 -lXext -lXxf86dga ++XCFLAGS=-DX11 -I${X11BASE}/include ${CFLAGS} -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 -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm ++GLLDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${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 $< |