diff options
-rw-r--r-- | games/quake6/Makefile | 9 | ||||
-rw-r--r-- | games/quake6/distinfo | 5 | ||||
-rw-r--r-- | games/quake6/patches/patch-aa | 10 | ||||
-rw-r--r-- | games/quake6/patches/patch-ai | 13 |
4 files changed, 26 insertions, 11 deletions
diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 7a088ba65de..f5bd6b79471 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/24 13:30:56 grant Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/09 03:45:52 snj Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -13,7 +13,7 @@ COMMENT= Quake over IPv6 DEPENDS= quakedata-[0-9]*:../../games/quakedata WRKSRC= ${WRKDIR}/quakeforge -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes post-extract: @@ -33,6 +33,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires IPv6 support" # "bindir" setting is very non-standard for GNU autoconf CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin -.include "../../graphics/MesaLib/buildlink2.mk" -.include "../../graphics/glu/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake6/distinfo b/games/quake6/distinfo index 889e53015ed..f2e8bb214f3 100644 --- a/games/quake6/distinfo +++ b/games/quake6/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.3 2002/01/10 16:43:28 skrll Exp $ +$NetBSD: distinfo,v 1.4 2004/04/09 03:45:52 snj Exp $ SHA1 (quake-v6-bsd-kame.tar.gz) = 09d58eef39f3d8a6b7b7287c88fc66d4dd3feb0b Size (quake-v6-bsd-kame.tar.gz) = 4503326 bytes SHA1 (quake6-00-v6-20000202b.diff.gz) = a4a1cf178e40c5effb3faad0fa744bbbcd0a56ab Size (quake6-00-v6-20000202b.diff.gz) = 3857 bytes -SHA1 (patch-aa) = 4f637a95f6045e616e9602ba0d7f2d609344e339 +SHA1 (patch-aa) = a52444f89a06fd3de78942f6e7de10daf403301b SHA1 (patch-ab) = 418d3f9c1bcc53a68ab7da87a40413eb9adb41da SHA1 (patch-ac) = 26a88941cbc5aaaf1fe4993e7e5143f86a22d96a SHA1 (patch-ad) = c37c599f2e9388fb5caba6228dc2a021149d2320 @@ -12,4 +12,5 @@ SHA1 (patch-ae) = 89328f2f9f8ebe2645b8612ed6b6ca2849494051 SHA1 (patch-af) = 3dd7bf9a44a4e087e09e758b53c69406e1468121 SHA1 (patch-ag) = d7821ab0e335b4e35e9721797b1cd5aa1ab8ee45 SHA1 (patch-ah) = cba95c90176666b302288ff4e9dc1d292c512a2b +SHA1 (patch-ai) = 0d1864f671a8db635564c4ff734c278d9a3989c9 SHA1 (patch-aj) = a754b5c78c5e81d4103276332f4a0bb3160770aa diff --git a/games/quake6/patches/patch-aa b/games/quake6/patches/patch-aa index ad4e4bbcc6e..20f9db31847 100644 --- a/games/quake6/patches/patch-aa +++ b/games/quake6/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2002/01/10 16:43:28 skrll Exp $ +$NetBSD: patch-aa,v 1.3 2004/04/09 03:45:53 snj Exp $ ---- qw_client/Makefile.in.orig Tue Jan 11 15:56:21 2000 -+++ qw_client/Makefile.in -@@ -17,7 +17,7 @@ +--- qw_client/Makefile.in.orig 2000-01-11 07:56:21.000000000 -0800 ++++ qw_client/Makefile.in 2004-04-08 20:22:23.000000000 -0700 +@@ -17,7 +17,7 @@ mandir = @mandir@ BUILD_DIR = ../targets/qw_client -LDFLAGS = -L/usr/local/v6/lib -linet6 @LDFLAGS@ @SND_LIBS@ -lm -+LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm ++LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm ${LIBOSSAUDIO} LIBS = @LIBS@ CC = @CC@ INTEL_ARCH = @INTEL_ARCH@ diff --git a/games/quake6/patches/patch-ai b/games/quake6/patches/patch-ai new file mode 100644 index 00000000000..820be20531a --- /dev/null +++ b/games/quake6/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2004/04/09 03:45:53 snj Exp $ + +--- uquake/Makefile.in.orig 2004-04-08 20:24:45.000000000 -0700 ++++ uquake/Makefile.in 2004-04-08 20:25:06.000000000 -0700 +@@ -16,7 +16,7 @@ mandir = @mandir@ + COMMON_DIR=$(PROJECT_DIR)/common + BUILD_DIR =../targets/uquake + +-LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm ++LDFLAGS = @LDFLAGS@ @SND_LIBS@ -lm ${LIBOSSAUDIO} + LIBS = @LIBS@ + CC = @CC@ + INTEL_ARCH = @INTEL_ARCH@ |