2 files changed, 55 insertions, 10 deletions
diff --git a/cad/gnucap/patches/patch-aa b/cad/gnucap/patches/patch-aa
index 67ea5ac9553..24f8902c721 100644
--- a/cad/gnucap/patches/patch-aa
+++ b/cad/gnucap/patches/patch-aa
@@ -1,11 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/15 02:58:50 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/21 03:06:30 dmcmahill Exp $
 
---- src/md.h.orig	Sat Jun 30 03:20:53 2001
-+++ src/md.h	Thu Jul  5 06:40:14 2001
-@@ -46,5 +46,5 @@
- };
- /*--------------------------------------------------------------------------*/
--#if defined(__unix__)
-+#if defined(__unix__) || defined(UNIX)
- /* usual but non-standard collection of includes */
- #include <unistd.h>	  /* chdir, access, getcwd */
+--- src/Make2.g++.orig	Wed Nov  6 02:47:55 2002
++++ src/Make2.g++
+@@ -23,17 +23,17 @@ VPATH = .:..
+ 
+ # Standard base for g++.
+ 
+-CCC = g++
++CCC = ${CXX}
+ 
+ CCFLAGS = \
+ -DHAS_READLINE \
+--DUNIX -O2 -DNDEBUG -I.. -I. -fno-exceptions -W
++-DUNIX ${CXXFLAGS} ${CPPFLAGS} -DNDEBUG -I.. -I. -fno-exceptions -W
+ 
+ LIBS = \
+ -lreadline -ltermcap \
+ 
+ 
+-LDFLAGS =
++#LDFLAGS =
+ 
+ .SUFFIXES : .o .cc
+ .cc.o:; $(CCC) $(CCFLAGS) -c $<
diff --git a/cad/gnucap/patches/patch-ab b/cad/gnucap/patches/patch-ab
new file mode 100644
index 00000000000..849fea647ec
--- /dev/null
+++ b/cad/gnucap/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2003/04/21 03:06:30 dmcmahill Exp $
+
+--- src/bm_tanh.cc.orig	Wed Nov  6 02:47:52 2002
++++ src/bm_tanh.cc
+@@ -65,13 +65,23 @@ void EVAL_BM_TANH::print(OMSTREAM& where
+   print_base(where);
+ }
+ /*--------------------------------------------------------------------------*/
++const double LOGBIGBIG = log(BIGBIG);
+ void EVAL_BM_TANH::tr_eval(ELEMENT* d)const
+ {
+   double x = ioffset(d->_y0.x);
+   double aa = x * _gain/_limit;
+-  double cosine = cosh(aa);
+-  double f1 = _gain / (cosine*cosine);
+-  double f0 = _limit * tanh(aa);
++  double f1, f0;
++  {if (aa > LOGBIGBIG) {
++    f1 = 0;
++    f0 = _limit;
++  }else if (aa < -LOGBIGBIG) {
++    f1 = 0;
++    f0 = -_limit;
++  }else{
++    double cosine = cosh(aa);
++    f1 = _gain / (cosine*cosine);
++    f0 = _limit * tanh(aa);
++  }}
+   d->_y0 = FPOLY1(x, f0, f1);
+   tr_final_adjust(&(d->_y0), d->f_is_value());
+ }