summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/CHANGES3
-rw-r--r--graphics/MesaDemos/Makefile4
-rw-r--r--graphics/MesaDemos/distinfo4
-rw-r--r--graphics/MesaDemos/patches/patch-ab4
4 files changed, 8 insertions, 7 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 629db42c4fd..357775ef249 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5258 2004/03/15 17:17:08 kleink Exp $
+$NetBSD: CHANGES,v 1.5259 2004/03/15 18:04:36 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -1470,3 +1470,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated postfix to 2.0.19 [martti 2004-03-14]
Updated fprot-workstation-bin to 4.4.0 [wiz 2004-03-15]
Updated jwhois to 3.2.2nb3 [kleink 2004-03-15]
+ Updated MesaDemos to 6.0nb1 [jlam 2004-03-15]
diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 3a7b4730038..51f76f7f68b 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/02/11 02:05:14 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.16 2004/03/15 18:04:34 jlam Exp $
PKGNAME= MesaDemos-${MESA_VERSION}
+PKGREVISION= 1
COMMENT= OpenGL examples and Demos
PATCHDIR= ${.CURDIR}/patches
diff --git a/graphics/MesaDemos/distinfo b/graphics/MesaDemos/distinfo
index e187680aebb..30855b4ef90 100644
--- a/graphics/MesaDemos/distinfo
+++ b/graphics/MesaDemos/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/01/22 13:02:33 adam Exp $
+$NetBSD: distinfo,v 1.9 2004/03/15 18:04:34 jlam Exp $
SHA1 (Mesa-6.0/MesaLib-6.0.tar.bz2) = 00f0ac27fbc3eddfdbc84de482f16b64b904d60c
Size (Mesa-6.0/MesaLib-6.0.tar.bz2) = 1487379 bytes
SHA1 (Mesa-6.0/MesaDemos-6.0.tar.bz2) = f57a76d0b9b4f70197860eda15f5241a02017a91
Size (Mesa-6.0/MesaDemos-6.0.tar.bz2) = 915060 bytes
SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
-SHA1 (patch-ab) = 19ec1a6d36654185ae57abddc1bd00b62d6ad4fc
+SHA1 (patch-ab) = 3d53af4d2036259bb23979ad0b411af63eacbbd1
SHA1 (patch-ac) = 97d7257c14998706f725bc8420bd4b34ee27dba4
SHA1 (patch-ad) = 41a417d37ad82a99a3b1e7ef4c54f052947a8a1b
SHA1 (patch-ae) = 1cc774b4c012fa6a53b80968f94cc99780d5733b
diff --git a/graphics/MesaDemos/patches/patch-ab b/graphics/MesaDemos/patches/patch-ab
index 0cc9cd47b9f..9b79706c0ba 100644
--- a/graphics/MesaDemos/patches/patch-ab
+++ b/graphics/MesaDemos/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2004/01/22 13:02:33 adam Exp $
+$NetBSD: patch-ab,v 1.8 2004/03/15 18:04:34 jlam Exp $
--- Make-config.orig 2004-01-15 09:23:54.000000000 -0500
+++ Make-config 2004-01-19 18:29:14.000000000 -0500
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.7 2004/01/22 13:02:33 adam Exp $
- "CXXFLAGS = -O2 -fPIC" \
- "GLUT_CFLAGS = -fexceptions" \
- "APP_LIB_DEPS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm"
-+ "APP_LIB_DEPS = -L${PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${PREFIX}/lib -Wl,-R${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm"
++ "APP_LIB_DEPS = ${LDFLAGS} -lXext -lXmu -lXi -lX11 -lm"
openbsd:
$(MAKE) $(MFLAGS) -f Makefile.X11 targets \