obey CFLAGS. Among other benefits this should help with non-gcc compilers

6 files changed, 14 insertions, 14 deletions

diff --git a/cad/fastcap/distinfo b/cad/fastcap/distinfo
index 79271f06218..cadf2f6dcfc 100644
--- a/cad/fastcap/distinfo
+++ b/cad/fastcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/05/22 23:24:51 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/03/22 00:29:33 dmcmahill Exp $
 
 SHA1 (fastcap/fastcap-2.0-15Jul92.tar.Z) = 256fa1a09ee41ab2bc59cb72730353605b108793
 Size (fastcap/fastcap-2.0-15Jul92.tar.Z) = 2528677 bytes
@@ -8,6 +8,6 @@ SHA1 (fastcap/mtt.ps.Z) = 3e357c36a0228b70101b858e70918214a40b647e
 Size (fastcap/mtt.ps.Z) = 423783 bytes
 SHA1 (fastcap/tcad.ps.Z) = 9f8e628b33a81dd11f6f0f85f51402ea61c47838
 Size (fastcap/tcad.ps.Z) = 222833 bytes
-SHA1 (patch-aa) = 07fd45c76280c63f822aa6baf3b551957a41c35d
+SHA1 (patch-aa) = 489b5f8716627f9c9297e8d11f1cfb0e1777b3fe
 SHA1 (patch-ab) = 4336ebcb0ba385e6937129735653db20d48d186f
 SHA1 (patch-ac) = d1f207e0921e0a0b4f86234277153a9d6d736ccf
diff --git a/cad/fastcap/patches/patch-aa b/cad/fastcap/patches/patch-aa
index caf67e41b97..254cd86b5fe 100644
--- a/cad/fastcap/patches/patch-aa
+++ b/cad/fastcap/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:26 agc Exp $
+$NetBSD: patch-aa,v 1.3 2004/03/22 00:29:33 dmcmahill Exp $
 
 --- src/Makefile.4.orig	Wed May  6 19:07:58 1998
 +++ src/Makefile.4	Wed May  6 19:08:20 1998
@@ -6,6 +6,6 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:36:26 agc Exp $
  #CFLAGS = -O -DOTHER
  # for most machines running 4.2/3 use (only necessary if timers are needed)
 -CFLAGS = -O -DFOUR
-+CFLAGS = -O2 -DFOUR
++CFLAGS += -DFOUR
  # for most machines running System V use (only necessary if timers are needed)
  #CFLAGS = -O -DFIVE
diff --git a/cad/fasthenry/distinfo b/cad/fasthenry/distinfo
index 3e5306189df..2b7c0098567 100644
--- a/cad/fasthenry/distinfo
+++ b/cad/fasthenry/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2004/03/13 23:21:33 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2004/03/22 00:25:11 dmcmahill Exp $
 
 SHA1 (fasthenry-3.0-12Nov96.tar.Z) = 74d9342efb327f6507e018ead4bd3e6c9e00e7bd
 Size (fasthenry-3.0-12Nov96.tar.Z) = 2108595 bytes
-SHA1 (patch-aa) = 288095b14f1f4a0a71646d98b932e7c0429edfd8
-SHA1 (patch-ab) = 33ef8a70adb751f0fdace87c95ae23eed863999d
+SHA1 (patch-aa) = 59e3ab6b0ef851ba73d847412cabe1392e15fc51
+SHA1 (patch-ab) = cb21ef1b60f051b04e6c801c449b4dc3c11a2d0e
 SHA1 (patch-ac) = cdec9ab450012ce5d3a903e62c1d4b0c2335cb81
-SHA1 (patch-ad) = 8537370fe4258850238bfc3442c7b6e0130f4bdb
+SHA1 (patch-ad) = 1ff1b191f9529e2c3910b3ae5ede2165831860ae
 SHA1 (patch-ae) = 722728a588301fb5c2d4a8213992c3985657a637
 SHA1 (patch-af) = 32103d154e18dd76ac34be10c78898c484067a23
 SHA1 (patch-ag) = 1b77c88172a10aa5a17c2eb05367ec68af249868
diff --git a/cad/fasthenry/patches/patch-aa b/cad/fasthenry/patches/patch-aa
index aba22c353d5..be4a1276268 100644
--- a/cad/fasthenry/patches/patch-aa
+++ b/cad/fasthenry/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2001/02/09 11:29:37 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2004/03/22 00:25:11 dmcmahill Exp $
 
 --- src/fasthenry/Makefile.default.orig	Tue Nov 12 14:18:58 1996
 +++ src/fasthenry/Makefile.default	Thu Feb  8 20:08:41 2001
 @@ -1,3 +1,3 @@
 -CFLAGS = -O -DFOUR
-+CFLAGS = -O2 -DFOUR
++CFLAGS += -DFOUR
  
  SHELL = /bin/sh
 @@ -23,6 +23,8 @@
diff --git a/cad/fasthenry/patches/patch-ab b/cad/fasthenry/patches/patch-ab
index c3b8460e3d5..c9c1a0c068a 100644
--- a/cad/fasthenry/patches/patch-ab
+++ b/cad/fasthenry/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2001/02/09 11:29:37 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2004/03/22 00:25:11 dmcmahill Exp $
 
 --- src/zbuf/Makefile.default.orig	Tue Nov 12 14:18:57 1996
 +++ src/zbuf/Makefile.default	Thu Feb  8 20:08:06 2001
@@ -13,6 +13,6 @@ $NetBSD: patch-ab,v 1.3 2001/02/09 11:29:37 dmcmahill Exp $
  #
  # for generic machine use (timers not supported)
 -CFLAGS = -O -DOTHER
-+CFLAGS = -O2 -DOTHER
++CFLAGS += -DOTHER
  # for most machines running 4.2/3 use (only necessary if timers are needed)
  #CFLAGS = -O -DFOUR
diff --git a/cad/fasthenry/patches/patch-ad b/cad/fasthenry/patches/patch-ad
index 86e5d1fb7fc..fad91663f20 100644
--- a/cad/fasthenry/patches/patch-ad
+++ b/cad/fasthenry/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:27 agc Exp $
+$NetBSD: patch-ad,v 1.3 2004/03/22 00:25:11 dmcmahill Exp $
 
 --- src/fasthenry/sparse/Makefile.orig	Wed May  6 23:42:03 1998
 +++ src/fasthenry/sparse/Makefile	Wed May  6 23:42:12 1998
@@ -6,6 +6,6 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:36:27 agc Exp $
  #  UC Berkeley
  #
 -CFLAGS = -O
-+CFLAGS = -O2 -w
++#CFLAGS = -O
  LINTFLAGS = -lc -lm
  SHELL = /bin/sh