- homepage has moved

- distfile has moved
- license has changed.  Patches are the result of de-fuzzing the
  old patches since the new source files have the new (less restrictive)
  license.

26 files changed, 348 insertions, 308 deletions

diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 8e0f22db20f..bcbf7630e6a 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,23 +1,16 @@
-# $NetBSD: Makefile,v 1.22 2004/08/27 06:29:06 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2004/09/20 02:08:58 dmcmahill Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
 PKGNAME=	fasthenry-3.0.19961112
 CATEGORIES=	cad
-MASTER_SITES=	ftp://rle-vlsi.mit.edu/pub/fasthenry/
+MASTER_SITES=	http://www.rle.mit.edu/cpg/codes/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	dmcmahill@NetBSD.org
-HOMEPAGE=	http://kontiki.mit.edu/rle/research/info_research_proj.html
+HOMEPAGE=	http://www.rle.mit.edu/cpg/research_codes.htm
 COMMENT=	Three-dimensional inductance extraction program
 
-LICENSE=		no-commercial-use
-RESTRICTED=		"No redistribution allowed"
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_FTP=		${RESTRICTED}
-
 WRKSRC=			${WRKDIR}/fasthenry-3.0
 USE_BUILDLINK3=		yes
 HAS_CONFIGURE=		yes
diff --git a/cad/fasthenry/distinfo b/cad/fasthenry/distinfo
index 25fee32b31b..e51b070769f 100644
--- a/cad/fasthenry/distinfo
+++ b/cad/fasthenry/distinfo
@@ -1,28 +1,28 @@
-$NetBSD: distinfo,v 1.5 2004/05/07 01:44:45 danw Exp $
+$NetBSD: distinfo,v 1.6 2004/09/20 02:08:58 dmcmahill Exp $
 
-SHA1 (fasthenry-3.0-12Nov96.tar.Z) = 74d9342efb327f6507e018ead4bd3e6c9e00e7bd
-Size (fasthenry-3.0-12Nov96.tar.Z) = 2108595 bytes
-SHA1 (patch-aa) = 59e3ab6b0ef851ba73d847412cabe1392e15fc51
-SHA1 (patch-ab) = cb21ef1b60f051b04e6c801c449b4dc3c11a2d0e
-SHA1 (patch-ac) = cdec9ab450012ce5d3a903e62c1d4b0c2335cb81
-SHA1 (patch-ad) = 1ff1b191f9529e2c3910b3ae5ede2165831860ae
-SHA1 (patch-ae) = 722728a588301fb5c2d4a8213992c3985657a637
-SHA1 (patch-af) = 32103d154e18dd76ac34be10c78898c484067a23
-SHA1 (patch-ag) = 1b77c88172a10aa5a17c2eb05367ec68af249868
-SHA1 (patch-ah) = 2357e305f18a25af2e176c76ad205d49315f3f88
-SHA1 (patch-ai) = ce473e27a0f8fbb251e5af7168923461df1555d6
-SHA1 (patch-aj) = be2681ad2aca6d5d7d11fb3b1bfa267892f7e3d8
-SHA1 (patch-ak) = 6c388e5d7a3df63be78a4d1d1a2f35d15c6720bd
-SHA1 (patch-al) = 019fe5566f9a60680d3733b57288f6b52a2480d8
-SHA1 (patch-am) = ab291f38a8e4141c854a398d79f974edcaeb780e
-SHA1 (patch-an) = 9a151a937744109f423ff5874e4fe23e57de5a4e
-SHA1 (patch-ao) = 9cc1bd8086e5dc5c889aaf058eb29092d002866d
-SHA1 (patch-ap) = a4bbc32bfce5d838b773888fc2a5877a8d0cf9b4
-SHA1 (patch-aq) = 987afb7e6126aefe5e97da3bcfef3209d7fe5c66
-SHA1 (patch-ar) = a57aefa75fceff95b0aad74e81c5a9ae4fdc522e
-SHA1 (patch-as) = acb1d01556e626e9c0a801f757d7e343c4e815b1
-SHA1 (patch-at) = e8b2d997954f6ad7827483f75a3fa94185d7be00
-SHA1 (patch-au) = e9393719fd7338417b3864ac2a55fe876a8e6476
-SHA1 (patch-av) = a70857353bc554da8ca5a58bfa5ab2301f98eea7
-SHA1 (patch-aw) = f573b8e614cf46eb69f8bc382855ad40f898cbb2
-SHA1 (patch-ax) = bb69f3a3cbbe15c86b5f9ecc714fa0bc2feb6735
+SHA1 (fasthenry-3.0-12Nov96.tar.Z) = 7117fdbaad95929a8d98944dced48cfb3a9e39d0
+Size (fasthenry-3.0-12Nov96.tar.Z) = 1175247 bytes
+SHA1 (patch-aa) = 91667d5dc882f6d2a0654d7d875f81e69372a595
+SHA1 (patch-ab) = 3d593630b697f10b1ca1528e1818ccc33c6db464
+SHA1 (patch-ac) = 0a35ee0bfdc460e8a262d5cdc1d80c5f8905340e
+SHA1 (patch-ad) = 99cc8e4331756a425ebec914aa2bfaecadba38fb
+SHA1 (patch-ae) = 7db114b252d86ba41eefbd41d6e28b48189fc5e3
+SHA1 (patch-af) = 7bb6182e48c7517d62021d9126cf38f7fca833de
+SHA1 (patch-ag) = 67173de5037f122c559e3df3a51e2b4190e5668b
+SHA1 (patch-ah) = 8bfa6687c4a18cc3f0672930b31b4ea10a1cbce7
+SHA1 (patch-ai) = cc59e269314a22dce109d78bc705dda927f3739d
+SHA1 (patch-aj) = 153d716bacea6d4e3ca342a035ad43bec5c1d308
+SHA1 (patch-ak) = ae0e90954eeaaed0e466e23bd5cc65f55f005f32
+SHA1 (patch-al) = 989ea3eb31036dd11074585da09fb13f8dc0e121
+SHA1 (patch-am) = 0114bbc5f54a672442ddccb6a9680d941d1c623a
+SHA1 (patch-an) = 8b86bf3bb4b21c22fa4dfd655e180729a54bc67e
+SHA1 (patch-ao) = 14644865b6c05770c6ef1baf31de6741e131bcb2
+SHA1 (patch-ap) = d471013c0eb0bb1acdea6eaa4e6b0d477dda9dc0
+SHA1 (patch-aq) = 5bc41637c3f3d8e7c98d1ca33d37c6c7ca27bb7f
+SHA1 (patch-ar) = 6b269c69f34bec1408f81945b8335046e65bc763
+SHA1 (patch-as) = b87a8fa4fe4d3e120f50eb8d7182b94f0de9a301
+SHA1 (patch-at) = 21e23295ed9778d074d8bb7f56423903470227c9
+SHA1 (patch-au) = 6bb6f94c221d12aeb8ea3a98f9cadfb8b813e0ce
+SHA1 (patch-av) = fa677024bdb612d46c1d6dde43c677a127b77399
+SHA1 (patch-aw) = f3c23565502045d21518a40981c4e3170364df54
+SHA1 (patch-ax) = 0d63ac982956c51a1f731e879e3a3330fdc3e27a
diff --git a/cad/fasthenry/patches/patch-aa b/cad/fasthenry/patches/patch-aa
index be4a1276268..c2510d5c5e9 100644
--- a/cad/fasthenry/patches/patch-aa
+++ b/cad/fasthenry/patches/patch-aa
@@ -1,19 +1,51 @@
-$NetBSD: patch-aa,v 1.4 2004/03/22 00:25:11 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2004/09/20 02:08:58 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 += -DFOUR
- 
- SHELL = /bin/sh
-@@ -23,6 +23,8 @@
- NONUNIHEAD = gp.h
- 
-+LIBS?=	-lm
+--- Makefile.orig	Tue Nov 12 19:18:57 1996
++++ Makefile
+@@ -22,3 +22,46 @@ all: fasthenry zbuf
+ clean:
+ 	cd $(FASTH) ; $(MAKE) clean
+ 	cd $(ZBUF) ; $(MAKE) clean
++
++
++# install target added for NetBSD package
++install:
++	${BSD_INSTALL_PROGRAM} ./bin/fasthenry ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} ./bin/zbuf ${PREFIX}/bin
++	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/30pin.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/3d_example2.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/3d_example2_coarse.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/Zc_3d_examp2.mat ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/Zc_pin_con7.mat ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/broken.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/gpexamp_copper.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/hole.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/holey_gp.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/make_nonuniform.c ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/msm.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/nonuni01.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/onebargp.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/pin-con2seg.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/pin-con7.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/pin-connect.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/plane.in ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/rom_check_con7_r20.ckt ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/simple_gp.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/template.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/together.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/together_nonuni.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/trace.test.release ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/trace_over_mesh_new.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/tree_sample.hier ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/tree_sample.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA} ./examples/vias.inp ${PREFIX}/share/examples/fasthenry
++	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/README ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/manual_001.ps ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/manual_002.ps ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/manual_003.ps ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/nonuniform_manual_1.ps ${PREFIX}/share/doc/fasthenry
++	${BSD_INSTALL_DATA} ./doc/nonuniform_manual_2.ps ${PREFIX}/share/doc/fasthenry
++
 +
- fasthenry:	$(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB)
--	$(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB) -lm
-+	$(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB) $(LIBS)
- 	mv fasthenry $(BIN)/fasthenry
- 
diff --git a/cad/fasthenry/patches/patch-ab b/cad/fasthenry/patches/patch-ab
index c9c1a0c068a..962e2170219 100644
--- a/cad/fasthenry/patches/patch-ab
+++ b/cad/fasthenry/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2004/03/22 00:25:11 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.5 2004/09/20 02:08:58 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
-@@ -37,5 +37,5 @@
- $(IO)/dump_struct.c $(IO)/savemat_mod.c
+--- doc/README.orig	Tue Nov 12 19:19:02 1996
++++ doc/README
+@@ -2,8 +2,6 @@
+ Print the three files:  manual_001.ps, manual_002.ps, and manual_003.ps
+   to get the complete manual.  
  
--LIBS = -lm
-+LIBS?= -lm
+-The LaTex files are provided for a text version of the manual but
+-the associated figures are not included so LaTex will fail on these files.
  
- # These compile flags are needed to account for differences in the
-@@ -44,5 +44,5 @@
- #
- # for generic machine use (timers not supported)
--CFLAGS = -O -DOTHER
-+CFLAGS += -DOTHER
- # for most machines running 4.2/3 use (only necessary if timers are needed)
- #CFLAGS = -O -DFOUR
+ For the documentation on nonuniformly discretized planes, print the two parts
+ nonuniform_manual_1.ps
diff --git a/cad/fasthenry/patches/patch-ac b/cad/fasthenry/patches/patch-ac
index b7f129c3e08..5796e1ce774 100644
--- a/cad/fasthenry/patches/patch-ac
+++ b/cad/fasthenry/patches/patch-ac
@@ -1,11 +1,22 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:27 agc Exp $
+$NetBSD: patch-ac,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
 
---- doc/README.orig	Wed May  6 23:40:54 1998
-+++ doc/README	Wed May  6 23:41:08 1998
-@@ -3,6 +3,4 @@
-   to get the complete manual.  
+--- src/fasthenry/Makefile.default.orig	Tue Nov 12 19:18:58 1996
++++ src/fasthenry/Makefile.default
+@@ -1,4 +1,4 @@
+-CFLAGS = -O -DFOUR
++CFLAGS += -DFOUR
  
--The LaTex files are provided for a text version of the manual but
--the associated figures are not included so LaTex will fail on these files.
+ SHELL = /bin/sh
+ RM = /bin/rm
+@@ -22,8 +22,10 @@ HEADER = induct.h cmplx.h resusage.h
+ MULHEAD = mulStruct.h mulGlobal.h patran.h resusage.h
+ NONUNIHEAD = gp.h
  
- For the documentation on nonuniformly discretized planes, print the two parts
++LIBS?=	-lm
++
+ fasthenry:	$(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB)
+-	$(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB) -lm
++	$(CC) -o fasthenry $(CFLAGS) $(OBJS) $(MOBJS) $(NONUNIOBJS) $(SPLIB) $(LIBS)
+ 	mv fasthenry $(BIN)/fasthenry
+ 
+ $(SPLIB):
diff --git a/cad/fasthenry/patches/patch-ad b/cad/fasthenry/patches/patch-ad
index fad91663f20..f3b6c643ce5 100644
--- a/cad/fasthenry/patches/patch-ad
+++ b/cad/fasthenry/patches/patch-ad
@@ -1,11 +1,15 @@
-$NetBSD: patch-ad,v 1.3 2004/03/22 00:25:11 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2004/09/20 02:08:58 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
-@@ -4,5 +4,5 @@
- #  UC Berkeley
- #
--CFLAGS = -O
-+#CFLAGS = -O
- LINTFLAGS = -lc -lm
- SHELL = /bin/sh
+--- src/fasthenry/addgroundplane.c.orig	Tue Aug  3 22:17:08 2004
++++ src/fasthenry/addgroundplane.c
+@@ -32,7 +32,9 @@ damages, losses or liabilities whatsoeve
+ person or damage to property arising from or out of the possession, use, or
+ operation of Software or Licensed Program(s) by LICENSEE or its customers.
+  
+-*/#include<stdio.h>
++*/
++#include<stdio.h>
++#include<string.h>
+ #include<math.h>
+ #include "induct.h"
+ 
diff --git a/cad/fasthenry/patches/patch-ae b/cad/fasthenry/patches/patch-ae
index 6ae3d083121..1d6e52fd027 100644
--- a/cad/fasthenry/patches/patch-ae
+++ b/cad/fasthenry/patches/patch-ae
@@ -1,50 +1,13 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:28 agc Exp $
+$NetBSD: patch-ae,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
 
---- Makefile.orig	Wed May  6 23:29:41 1998
-+++ Makefile	Wed May  6 23:40:36 1998
-@@ -23,2 +23,45 @@
- 	cd $(FASTH) ; $(MAKE) clean
- 	cd $(ZBUF) ; $(MAKE) clean
-+
-+
-+# install target added for NetBSD package
-+install:
-+	${BSD_INSTALL_PROGRAM} ./bin/fasthenry ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} ./bin/zbuf ${PREFIX}/bin
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/30pin.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/3d_example2.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/3d_example2_coarse.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/Zc_3d_examp2.mat ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/Zc_pin_con7.mat ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/broken.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/gpexamp_copper.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/hole.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/holey_gp.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/make_nonuniform.c ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/msm.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/nonuni01.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/onebargp.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/pin-con2seg.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/pin-con7.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/pin-connect.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/plane.in ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/rom_check_con7_r20.ckt ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/simple_gp.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/template.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/together.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/together_nonuni.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/trace.test.release ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/trace_over_mesh_new.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/tree_sample.hier ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/tree_sample.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA} ./examples/vias.inp ${PREFIX}/share/examples/fasthenry
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/README ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/manual_001.ps ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/manual_002.ps ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/manual_003.ps ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/nonuniform_manual_1.ps ${PREFIX}/share/doc/fasthenry
-+	${BSD_INSTALL_DATA} ./doc/nonuniform_manual_2.ps ${PREFIX}/share/doc/fasthenry
-+
-+
+--- src/fasthenry/contact.c.orig	Tue Aug  3 22:17:10 2004
++++ src/fasthenry/contact.c
+@@ -45,7 +45,7 @@ operation of Software or Licensed Progra
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "induct.h"
+ 
diff --git a/cad/fasthenry/patches/patch-af b/cad/fasthenry/patches/patch-af
index 2efdcba1df1..d31c5fe50d3 100644
--- a/cad/fasthenry/patches/patch-af
+++ b/cad/fasthenry/patches/patch-af
@@ -1,10 +1,12 @@
-$NetBSD: patch-af,v 1.1 2001/02/09 11:29:37 dmcmahill Exp $
+$NetBSD: patch-af,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/induct.c.orig	Tue Nov 12 14:18:46 1996
-+++ src/fasthenry/induct.c	Thu Feb  8 18:54:48 2001
-@@ -2,4 +2,5 @@
+--- src/fasthenry/fillM.c.orig	Tue Aug  3 22:17:11 2004
++++ src/fasthenry/fillM.c
+@@ -34,6 +34,7 @@ operation of Software or Licensed Progra
+  
+ *//* this is the new fillM    10/92 */
  
- #include "induct.h"
 +#include <string.h>
+ #include "induct.h"
  
- /* these are missing in some math.h files */
+ /* this fills the kircoff's voltage law matrix (Mesh matrix) */
diff --git a/cad/fasthenry/patches/patch-ag b/cad/fasthenry/patches/patch-ag
index 50122d46d46..4ff92ad3c8d 100644
--- a/cad/fasthenry/patches/patch-ag
+++ b/cad/fasthenry/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2004/03/13 23:21:33 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/savemat_mod.c.orig	Tue Nov 12 14:18:47 1996
-+++ src/fasthenry/savemat_mod.c	Thu Feb  8 19:00:12 2001
-@@ -23,6 +23,7 @@
-  */
- #include <stdio.h>
+--- src/fasthenry/findpaths.c.orig	Tue Aug  3 22:17:11 2004
++++ src/fasthenry/findpaths.c
+@@ -34,7 +34,7 @@ operation of Software or Licensed Progra
+  
+ *//* this function finds all paths from node1 to node2 */
+ /* this does not search through ground planes yet */
+-
 +#include <string.h>
+ #include "induct.h"
+ 
  
--#ifdef ALPHA
-+#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
- typedef struct {
-      int type;   /* type */
diff --git a/cad/fasthenry/patches/patch-ah b/cad/fasthenry/patches/patch-ah
index 60cd0b2c0bf..631ac1ad20b 100644
--- a/cad/fasthenry/patches/patch-ah
+++ b/cad/fasthenry/patches/patch-ah
@@ -1,9 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2001/02/09 11:29:37 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/addgroundplane.c.orig	Tue Nov 12 14:18:45 1996
-+++ src/fasthenry/addgroundplane.c	Thu Feb  8 19:04:15 2001
-@@ -1,3 +1,4 @@
- #include<stdio.h>
-+#include <string.h>
- #include<math.h>
+--- src/fasthenry/hole.c.orig	Tue Aug  3 22:17:12 2004
++++ src/fasthenry/hole.c
+@@ -38,7 +38,7 @@ operation of Software or Licensed Progra
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
  #include "induct.h"
+ 
diff --git a/cad/fasthenry/patches/patch-ai b/cad/fasthenry/patches/patch-ai
index c06d890cab6..cb6301345c5 100644
--- a/cad/fasthenry/patches/patch-ai
+++ b/cad/fasthenry/patches/patch-ai
@@ -1,11 +1,12 @@
-$NetBSD: patch-ai,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/findpaths.c.orig	Tue Nov 12 14:18:46 1996
-+++ src/fasthenry/findpaths.c	Thu Feb  8 19:05:22 2001
-@@ -1,5 +1,5 @@
- /* this function finds all paths from node1 to node2 */
- /* this does not search through ground planes yet */
--
-+#include <string.h>
+--- src/fasthenry/induct.c.orig	Tue Aug  3 22:17:12 2004
++++ src/fasthenry/induct.c
+@@ -35,6 +35,7 @@ operation of Software or Licensed Progra
+ *//* This is the main part of the code */
+ 
  #include "induct.h"
++#include <string.h>
  
+ /* these are missing in some math.h files */
+ extern double asinh();
diff --git a/cad/fasthenry/patches/patch-aj b/cad/fasthenry/patches/patch-aj
index bc3bee2affd..6f47516080d 100644
--- a/cad/fasthenry/patches/patch-aj
+++ b/cad/fasthenry/patches/patch-aj
@@ -1,10 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/fillM.c.orig	Tue Nov 12 14:18:46 1996
-+++ src/fasthenry/fillM.c	Thu Feb  8 19:07:56 2001
-@@ -1,4 +1,5 @@
- /* this is the new fillM    10/92 */
- 
-+#include <string.h>
- #include "induct.h"
- 
+--- src/fasthenry/mulGlobal.h.orig	Tue Aug  3 22:20:13 2004
++++ src/fasthenry/mulGlobal.h
+@@ -46,7 +46,7 @@ extern char *   calloc();
+ extern char *   malloc();
+ extern char *   realloc();
+ #else
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif /* end if NEWS */
+ #include <stdio.h>
+ #include <math.h>
diff --git a/cad/fasthenry/patches/patch-ak b/cad/fasthenry/patches/patch-ak
index 21d53af5021..bf92dc7e2e0 100644
--- a/cad/fasthenry/patches/patch-ak
+++ b/cad/fasthenry/patches/patch-ak
@@ -1,17 +1,21 @@
-$NetBSD: patch-ak,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/parse_command_line.c.orig	Tue Nov 12 14:18:47 1996
-+++ src/fasthenry/parse_command_line.c	Thu Feb  8 19:33:56 2001
-@@ -5,4 +5,5 @@
+--- src/fasthenry/parse_command_line.c.orig	Tue Aug  3 22:17:15 2004
++++ src/fasthenry/parse_command_line.c
+@@ -38,6 +38,7 @@ operation of Software or Licensed Progra
+ 
  #include "induct.h"
  #include <string.h>
 +#include <time.h>
  #ifdef SOLARIS
  #include <sys/systeminfo.h>
-@@ -525,5 +526,5 @@
+ #endif
+@@ -558,7 +559,7 @@ ind_opts *opts;
+ fix_and_print_opts(opts)
  ind_opts *opts;
  {
 -  long clock;
 +  time_t clock;
    char hostname[BUFSIZ];
  
+   fprintf(stdout, "Running FastHenry %s (%s)\n", FHVERSION, FHDATE);
diff --git a/cad/fasthenry/patches/patch-al b/cad/fasthenry/patches/patch-al
index 0222e23cf6a..5d7395cc1ab 100644
--- a/cad/fasthenry/patches/patch-al
+++ b/cad/fasthenry/patches/patch-al
@@ -1,10 +1,13 @@
-$NetBSD: patch-al,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-al,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/uglieralloc.c.orig	Tue Nov 12 14:18:48 1996
-+++ src/fasthenry/uglieralloc.c	Thu Feb  8 19:35:37 2001
-@@ -21,4 +21,5 @@
- */
+--- src/fasthenry/readGeom.c.orig	Tue Aug  3 22:17:16 2004
++++ src/fasthenry/readGeom.c
+@@ -37,7 +37,7 @@ operation of Software or Licensed Progra
  #include <stdio.h>
-+#include <string.h>
+ #include <ctype.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include "induct.h"
  
- #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
diff --git a/cad/fasthenry/patches/patch-am b/cad/fasthenry/patches/patch-am
index f5a825df322..19b97f35cf2 100644
--- a/cad/fasthenry/patches/patch-am
+++ b/cad/fasthenry/patches/patch-am
@@ -1,11 +1,15 @@
-$NetBSD: patch-am,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-am,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/zbuf.c.orig	Tue Nov 12 14:18:57 1996
-+++ src/zbuf/zbuf.c	Thu Feb  8 19:37:31 2001
-@@ -33,4 +33,6 @@
- */
- 
+--- src/fasthenry/savemat_mod.c.orig	Tue Aug  3 22:17:16 2004
++++ src/fasthenry/savemat_mod.c
+@@ -56,8 +56,9 @@ operation of Software or Licensed Progra
+  * Revised 7-23-91 to support ANSI-C
+  */
+ #include <stdio.h>
 +#include <string.h>
-+
- #include "mulGlobal.h"
  
+-#ifdef ALPHA
++#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
+ typedef struct {
+      int type;   /* type */
+      int mrows;  /* row dimension */
diff --git a/cad/fasthenry/patches/patch-an b/cad/fasthenry/patches/patch-an
index 2eda6d219a5..26b4c511939 100644
--- a/cad/fasthenry/patches/patch-an
+++ b/cad/fasthenry/patches/patch-an
@@ -1,10 +1,13 @@
-$NetBSD: patch-an,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-an,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/patran.c.orig	Tue Nov 12 14:18:56 1996
-+++ src/zbuf/patran.c	Thu Feb  8 19:38:44 2001
-@@ -41,4 +41,5 @@
- 
- **************************************************************************/
-+#include <string.h>
- #include "mulGlobal.h"
- 
+--- src/fasthenry/sparse/Makefile.orig	Wed Aug  4 00:59:27 2004
++++ src/fasthenry/sparse/Makefile
+@@ -3,7 +3,7 @@
+ #  Ken Kundert
+ #  UC Berkeley
+ #
+-CFLAGS = -O
++#CFLAGS = -O
+ LINTFLAGS = -lc -lm
+ SHELL = /bin/sh
+ CC = cc
diff --git a/cad/fasthenry/patches/patch-ao b/cad/fasthenry/patches/patch-ao
index 30429e4f078..c95c458b8ac 100644
--- a/cad/fasthenry/patches/patch-ao
+++ b/cad/fasthenry/patches/patch-ao
@@ -1,10 +1,12 @@
-$NetBSD: patch-ao,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-ao,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/quickif.c.orig	Tue Nov 12 14:18:56 1996
-+++ src/zbuf/quickif.c	Thu Feb  8 19:41:39 2001
-@@ -33,4 +33,5 @@
+--- src/fasthenry/uglieralloc.c.orig	Tue Aug  3 22:17:20 2004
++++ src/fasthenry/uglieralloc.c
+@@ -54,6 +54,7 @@ operation of Software or Licensed Progra
+  - no attempt is made to make allocation efficient in terms of virtual pages
  */
- 
+ #include <stdio.h>
 +#include <string.h>
- #include "mulGlobal.h"
- #include "quickif.h"
+ 
+ #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
+ #define MAGICN 0xaaaaaaaaL	/* used to check fidelity of allocated blks */
diff --git a/cad/fasthenry/patches/patch-ap b/cad/fasthenry/patches/patch-ap
index 82719c34283..746a98a89a6 100644
--- a/cad/fasthenry/patches/patch-ap
+++ b/cad/fasthenry/patches/patch-ap
@@ -1,19 +1,21 @@
-$NetBSD: patch-ap,v 1.1 2001/02/09 11:29:38 dmcmahill Exp $
+$NetBSD: patch-ap,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/input.c.orig	Tue Nov 12 14:18:56 1996
-+++ src/zbuf/input.c	Thu Feb  8 19:42:47 2001
-@@ -32,5 +32,6 @@
- of this software.
- */
--
-+#include <string.h>
-+#include <time.h>
- #include "mulGlobal.h"
- #include "zbufGlobal.h"
-@@ -1461,5 +1462,5 @@
-   char infile[BUFSIZ], *ctime(), hostname[BUFSIZ];
-   charge *read_panels(), *chglist;
--  long clock;
-+  time_t clock;
-   extern ITER *kill_num_list, *qpic_num_list, *kinp_num_list, *kq_num_list;
-   extern char *kill_name_list, *qpic_name_list, *kinp_name_list;
+--- src/zbuf/Makefile.default.orig	Tue Nov 12 19:18:57 1996
++++ src/zbuf/Makefile.default
+@@ -36,14 +36,14 @@ $(IO)/input.c \
+ $(IO)/zbufInOut.c $(IO)/zbuf2fastcap.c $(IO)/zbufProj.c $(IO)/zbufSort.c \
+ $(IO)/dump_struct.c $(IO)/savemat_mod.c
+ 
+-LIBS = -lm
++LIBS?= -lm
+ 
+ # These compile flags are needed to account for differences in the
+ #  resource usage system call used to get CPU time and memory use data
+ #  - also used to select the correct CC macro definition for AIX machines
+ #
+ # for generic machine use (timers not supported)
+-CFLAGS = -O -DOTHER
++CFLAGS += -DOTHER
+ # for most machines running 4.2/3 use (only necessary if timers are needed)
+ #CFLAGS = -O -DFOUR
+ # for most machines running System V use (only necessary if timers are needed)
diff --git a/cad/fasthenry/patches/patch-aq b/cad/fasthenry/patches/patch-aq
index 8deec4dad3f..e8b9fd48664 100644
--- a/cad/fasthenry/patches/patch-aq
+++ b/cad/fasthenry/patches/patch-aq
@@ -1,11 +1,23 @@
-$NetBSD: patch-aq,v 1.1 2001/02/09 11:29:39 dmcmahill Exp $
+$NetBSD: patch-aq,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/zbufInOut.c.orig	Tue Nov 12 14:18:57 1996
-+++ src/zbuf/zbufInOut.c	Thu Feb  8 19:55:56 2001
-@@ -32,5 +32,5 @@
- of this software.
+--- src/zbuf/input.c.orig	Tue Aug  3 22:22:22 2004
++++ src/zbuf/input.c
+@@ -33,7 +33,8 @@ person or damage to property arising fro
+ operation of Software or Licensed Program(s) by LICENSEE or its customers.
+  
  */
 -
 +#include <string.h>
++#include <time.h>
  #include "mulGlobal.h"
  #include "zbufGlobal.h"
+ 
+@@ -1462,7 +1463,7 @@ Name **name_list;
+   surface *surf_list, *input_surfaces();
+   char infile[BUFSIZ], *ctime(), hostname[BUFSIZ];
+   charge *read_panels(), *chglist;
+-  long clock;
++  time_t clock;
+   extern ITER *kill_num_list, *qpic_num_list, *kinp_num_list, *kq_num_list;
+   extern char *kill_name_list, *qpic_name_list, *kinp_name_list;
+   extern char *kq_name_list;
diff --git a/cad/fasthenry/patches/patch-ar b/cad/fasthenry/patches/patch-ar
index d47173a8670..38c91a578fe 100644
--- a/cad/fasthenry/patches/patch-ar
+++ b/cad/fasthenry/patches/patch-ar
@@ -1,10 +1,13 @@
-$NetBSD: patch-ar,v 1.1 2001/02/09 11:29:39 dmcmahill Exp $
+$NetBSD: patch-ar,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/uglieralloc.c.orig	Tue Nov 12 14:18:56 1996
-+++ src/zbuf/uglieralloc.c	Thu Feb  8 20:03:45 2001
-@@ -21,4 +21,5 @@
- */
+--- src/zbuf/mulGlobal.h.orig	Tue Aug  3 22:17:22 2004
++++ src/zbuf/mulGlobal.h
+@@ -76,7 +76,7 @@ extern char *   calloc();
+ extern char *   malloc();
+ extern char *   realloc();
+ #else
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif /* end if NEWS */
  #include <stdio.h>
-+#include <string.h>
- 
- #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
+ #include <math.h>
diff --git a/cad/fasthenry/patches/patch-as b/cad/fasthenry/patches/patch-as
index a0e5bdbafb6..b16902f4cef 100644
--- a/cad/fasthenry/patches/patch-as
+++ b/cad/fasthenry/patches/patch-as
@@ -1,13 +1,12 @@
-$NetBSD: patch-as,v 1.2 2004/03/13 23:21:33 dmcmahill Exp $
+$NetBSD: patch-as,v 1.3 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/savemat_mod.c.orig	Tue Nov 12 14:18:56 1996
-+++ src/zbuf/savemat_mod.c	Thu Feb  8 20:04:39 2001
-@@ -23,6 +23,7 @@
-  */
- #include <stdio.h>
+--- src/zbuf/patran.c.orig	Tue Aug  3 22:22:49 2004
++++ src/zbuf/patran.c
+@@ -42,6 +42,7 @@ operation of Software or Licensed Progra
+   Written by Songmin Kim, July 24, 1990.
+ 
+ **************************************************************************/
 +#include <string.h>
+ #include "mulGlobal.h"
  
--#ifdef ALPHA
-+#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
- typedef struct {
-      int type;   /* type */
+ #define BIG 35000              /* Size of element and node serach table. */
diff --git a/cad/fasthenry/patches/patch-at b/cad/fasthenry/patches/patch-at
index ebd060a331a..c037b6c85b7 100644
--- a/cad/fasthenry/patches/patch-at
+++ b/cad/fasthenry/patches/patch-at
@@ -1,13 +1,12 @@
-$NetBSD: patch-at,v 1.1 2004/05/07 01:44:45 danw Exp $
+$NetBSD: patch-at,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/contact.c.orig	Sun May  2 21:40:25 2004
-+++ src/fasthenry/contact.c
-@@ -11,7 +11,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "induct.h"
+--- src/zbuf/quickif.c.orig	Tue Aug  3 22:23:56 2004
++++ src/zbuf/quickif.c
+@@ -34,6 +34,7 @@ operation of Software or Licensed Progra
+  
+ */
+ 
++#include <string.h>
+ #include "mulGlobal.h"
+ #include "quickif.h"
  
diff --git a/cad/fasthenry/patches/patch-au b/cad/fasthenry/patches/patch-au
index fc8af5e9b5b..7d207e99fae 100644
--- a/cad/fasthenry/patches/patch-au
+++ b/cad/fasthenry/patches/patch-au
@@ -1,13 +1,15 @@
-$NetBSD: patch-au,v 1.1 2004/05/07 01:44:45 danw Exp $
+$NetBSD: patch-au,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/hole.c.orig	Sun May  2 21:40:28 2004
-+++ src/fasthenry/hole.c
-@@ -4,7 +4,7 @@
+--- src/zbuf/savemat_mod.c.orig	Tue Aug  3 22:17:23 2004
++++ src/zbuf/savemat_mod.c
+@@ -56,8 +56,9 @@ operation of Software or Licensed Progra
+  * Revised 7-23-91 to support ANSI-C
+  */
  #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "induct.h"
++#include <string.h>
  
+-#ifdef ALPHA
++#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__)
+ typedef struct {
+      int type;   /* type */
+      int mrows;  /* row dimension */
diff --git a/cad/fasthenry/patches/patch-av b/cad/fasthenry/patches/patch-av
index 0de0deeaf43..d3a72f6ea56 100644
--- a/cad/fasthenry/patches/patch-av
+++ b/cad/fasthenry/patches/patch-av
@@ -1,13 +1,12 @@
-$NetBSD: patch-av,v 1.1 2004/05/07 01:44:45 danw Exp $
+$NetBSD: patch-av,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/mulGlobal.h.orig	Sun May  2 21:40:34 2004
-+++ src/fasthenry/mulGlobal.h
-@@ -45,7 +45,7 @@ extern char *   calloc();
- extern char *   malloc();
- extern char *   realloc();
- #else
--#include <malloc.h>
-+#include <stdlib.h>
- #endif /* end if NEWS */
+--- src/zbuf/uglieralloc.c.orig	Tue Aug  3 22:17:23 2004
++++ src/zbuf/uglieralloc.c
+@@ -54,6 +54,7 @@ operation of Software or Licensed Progra
+  - no attempt is made to make allocation efficient in terms of virtual pages
+ */
  #include <stdio.h>
- #include <math.h>
++#include <string.h>
+ 
+ #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
+ #define MAGICN 0xaaaaaaaaL	/* used to check fidelity of allocated blks */
diff --git a/cad/fasthenry/patches/patch-aw b/cad/fasthenry/patches/patch-aw
index 1255330c8ff..874d91ea540 100644
--- a/cad/fasthenry/patches/patch-aw
+++ b/cad/fasthenry/patches/patch-aw
@@ -1,13 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2004/05/07 01:44:45 danw Exp $
+$NetBSD: patch-aw,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/fasthenry/readGeom.c.orig	Sun May  2 21:44:00 2004
-+++ src/fasthenry/readGeom.c
-@@ -3,7 +3,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "induct.h"
+--- src/zbuf/zbuf.c.orig	Tue Aug  3 22:24:14 2004
++++ src/zbuf/zbuf.c
+@@ -34,6 +34,8 @@ operation of Software or Licensed Progra
+  
+ */
  
++#include <string.h>
++
+ #include "mulGlobal.h"
+ 
+ main(argc, argv)
diff --git a/cad/fasthenry/patches/patch-ax b/cad/fasthenry/patches/patch-ax
index 2ae03d49606..d5429e9f819 100644
--- a/cad/fasthenry/patches/patch-ax
+++ b/cad/fasthenry/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.1 2004/05/07 01:44:45 danw Exp $
+$NetBSD: patch-ax,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $
 
---- src/zbuf/mulGlobal.h.orig	Sun May  2 21:47:21 2004
-+++ src/zbuf/mulGlobal.h
-@@ -42,7 +42,7 @@ extern char *   calloc();
- extern char *   malloc();
- extern char *   realloc();
- #else
--#include <malloc.h>
-+#include <stdlib.h>
- #endif /* end if NEWS */
- #include <stdio.h>
- #include <math.h>
+--- src/zbuf/zbufInOut.c.orig	Tue Aug  3 22:24:28 2004
++++ src/zbuf/zbufInOut.c
+@@ -33,7 +33,7 @@ person or damage to property arising fro
+ operation of Software or Licensed Program(s) by LICENSEE or its customers.
+  
+ */
+-
++#include <string.h>
+ #include "mulGlobal.h"
+ #include "zbufGlobal.h"
+