-include a ton of missing header files for 64 bit machines. there remain

 some 64 bit related compiler warnings to fix.

- while here, use libffm if on an alpha for faster math.  In this case
  20-30% faster.

18 files changed, 216 insertions, 10 deletions

diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index fb4cc9314e1..3ec62c5aa74 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/11/02 03:49:09 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/09 11:29:36 dmcmahill Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -22,4 +22,15 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS=		default
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${MACHINE_ARCH} == "alpha")
+DEPENDS+=	libffm-*:../../math/libffm
+# optimized libffm (free fast math library)
+LIBS=		-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lffm -lm
+MAKE_ENV+=	LIBS="${LIBS}"
+.else
+LIBS=		-lm
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/fasthenry/files/patch-sum b/cad/fasthenry/files/patch-sum
index d17880f6f39..53e36c7ada6 100644
--- a/cad/fasthenry/files/patch-sum
+++ b/cad/fasthenry/files/patch-sum
@@ -1,7 +1,21 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:21 agc Exp $
+$NetBSD: patch-sum,v 1.2 2001/02/09 11:29:36 dmcmahill Exp $
 
-MD5 (patch-aa) = c21b0f2dace30e2ff3a3ed36ae9d0252
-MD5 (patch-ab) = 7f9d95ce5e9c2c1236748525ac43b6b6
+MD5 (patch-aa) = 69a95373950535f48439e725abcf877d
+MD5 (patch-ab) = 58f0920dc965dff50f6c7cab5601f8c4
 MD5 (patch-ac) = 821c075ef18ddf5f48a7909ef1231d01
 MD5 (patch-ad) = 19a481a855cd6396868659ba0a34d7c0
 MD5 (patch-ae) = 7a2c1ab170e14e95208e1d22437df279
+MD5 (patch-af) = 685aba9cfa5b3fba4286a87cd586db8e
+MD5 (patch-ag) = 983ffddbac5f956538b616d024f365bb
+MD5 (patch-ah) = d797c21b4289ab2209fb111e898d3fe9
+MD5 (patch-ai) = 2d54825a5c89f207c87d4013cd5393e0
+MD5 (patch-aj) = bb42f8d25250a3a331d91b8739a832f5
+MD5 (patch-ak) = 663e2151ee5f66af52f914e034f7e131
+MD5 (patch-al) = 6414e763df22a585fc163a968cab32e9
+MD5 (patch-am) = a173405eafea9b7c51c49acddc428d13
+MD5 (patch-an) = c0116c43520176402d2a9eb25be6b885
+MD5 (patch-ao) = 04367099b64e047a123c64960a4b048e
+MD5 (patch-ap) = a540bf24383c72bedb85173cf9f427a6
+MD5 (patch-aq) = 303bca14fc866d408f0efd85bff00af7
+MD5 (patch-ar) = 34b48ce92e33f6a6313c63c412ac1043
+MD5 (patch-as) = 3f09bca7704abc6e28656b4fa2c16cc7
diff --git a/cad/fasthenry/patches/patch-aa b/cad/fasthenry/patches/patch-aa
index ad8c72ad6a6..aba22c353d5 100644
--- a/cad/fasthenry/patches/patch-aa
+++ b/cad/fasthenry/patches/patch-aa
@@ -1,9 +1,19 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:27 agc Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/09 11:29:37 dmcmahill Exp $
 
---- src/fasthenry/Makefile.default.orig	Wed May  6 23:27:54 1998
-+++ src/fasthenry/Makefile.default	Wed May  6 23:28:08 1998
+--- 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
  
  SHELL = /bin/sh
+@@ -23,6 +23,8 @@
+ NONUNIHEAD = gp.h
+ 
++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
+ 
diff --git a/cad/fasthenry/patches/patch-ab b/cad/fasthenry/patches/patch-ab
index 8e3b4eaed69..c3b8460e3d5 100644
--- a/cad/fasthenry/patches/patch-ab
+++ b/cad/fasthenry/patches/patch-ab
@@ -1,7 +1,14 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:27 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/09 11:29:37 dmcmahill Exp $
 
---- src/zbuf/Makefile.default.orig	Wed May  6 23:28:17 1998
-+++ src/zbuf/Makefile.default	Wed May  6 23:28:26 1998
+--- 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
+ 
+-LIBS = -lm
++LIBS?= -lm
+ 
+ # These compile flags are needed to account for differences in the
 @@ -44,5 +44,5 @@
  #
  # for generic machine use (timers not supported)
diff --git a/cad/fasthenry/patches/patch-af b/cad/fasthenry/patches/patch-af
new file mode 100644
index 00000000000..2efdcba1df1
--- /dev/null
+++ b/cad/fasthenry/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1 2001/02/09 11:29:37 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 @@
+ 
+ #include "induct.h"
++#include <string.h>
+ 
+ /* these are missing in some math.h files */
diff --git a/cad/fasthenry/patches/patch-ag b/cad/fasthenry/patches/patch-ag
new file mode 100644
index 00000000000..4f81b52023b
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/02/09 11:29:37 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>
++#include <string.h>
+ 
+-#ifdef ALPHA
++#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__)
+ typedef struct {
+      int type;   /* type */
diff --git a/cad/fasthenry/patches/patch-ah b/cad/fasthenry/patches/patch-ah
new file mode 100644
index 00000000000..60cd0b2c0bf
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ah
@@ -0,0 +1,9 @@
+$NetBSD: patch-ah,v 1.1 2001/02/09 11:29:37 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>
+ #include "induct.h"
diff --git a/cad/fasthenry/patches/patch-ai b/cad/fasthenry/patches/patch-ai
new file mode 100644
index 00000000000..c06d890cab6
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ai
@@ -0,0 +1,11 @@
+$NetBSD: patch-ai,v 1.1 2001/02/09 11:29:38 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>
+ #include "induct.h"
+ 
diff --git a/cad/fasthenry/patches/patch-aj b/cad/fasthenry/patches/patch-aj
new file mode 100644
index 00000000000..bc3bee2affd
--- /dev/null
+++ b/cad/fasthenry/patches/patch-aj
@@ -0,0 +1,10 @@
+$NetBSD: patch-aj,v 1.1 2001/02/09 11:29:38 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"
+ 
diff --git a/cad/fasthenry/patches/patch-ak b/cad/fasthenry/patches/patch-ak
new file mode 100644
index 00000000000..21d53af5021
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2001/02/09 11:29:38 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 @@
+ #include "induct.h"
+ #include <string.h>
++#include <time.h>
+ #ifdef SOLARIS
+ #include <sys/systeminfo.h>
+@@ -525,5 +526,5 @@
+ ind_opts *opts;
+ {
+-  long clock;
++  time_t clock;
+   char hostname[BUFSIZ];
+ 
diff --git a/cad/fasthenry/patches/patch-al b/cad/fasthenry/patches/patch-al
new file mode 100644
index 00000000000..0222e23cf6a
--- /dev/null
+++ b/cad/fasthenry/patches/patch-al
@@ -0,0 +1,10 @@
+$NetBSD: patch-al,v 1.1 2001/02/09 11:29:38 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 @@
+ */
+ #include <stdio.h>
++#include <string.h>
+ 
+ #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
diff --git a/cad/fasthenry/patches/patch-am b/cad/fasthenry/patches/patch-am
new file mode 100644
index 00000000000..f5a825df322
--- /dev/null
+++ b/cad/fasthenry/patches/patch-am
@@ -0,0 +1,11 @@
+$NetBSD: patch-am,v 1.1 2001/02/09 11:29:38 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 @@
+ */
+ 
++#include <string.h>
++
+ #include "mulGlobal.h"
+ 
diff --git a/cad/fasthenry/patches/patch-an b/cad/fasthenry/patches/patch-an
new file mode 100644
index 00000000000..2eda6d219a5
--- /dev/null
+++ b/cad/fasthenry/patches/patch-an
@@ -0,0 +1,10 @@
+$NetBSD: patch-an,v 1.1 2001/02/09 11:29:38 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"
+ 
diff --git a/cad/fasthenry/patches/patch-ao b/cad/fasthenry/patches/patch-ao
new file mode 100644
index 00000000000..30429e4f078
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ao
@@ -0,0 +1,10 @@
+$NetBSD: patch-ao,v 1.1 2001/02/09 11:29:38 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 @@
+ */
+ 
++#include <string.h>
+ #include "mulGlobal.h"
+ #include "quickif.h"
diff --git a/cad/fasthenry/patches/patch-ap b/cad/fasthenry/patches/patch-ap
new file mode 100644
index 00000000000..82719c34283
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 2001/02/09 11:29:38 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;
diff --git a/cad/fasthenry/patches/patch-aq b/cad/fasthenry/patches/patch-aq
new file mode 100644
index 00000000000..8deec4dad3f
--- /dev/null
+++ b/cad/fasthenry/patches/patch-aq
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.1 2001/02/09 11:29:39 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.
+ */
+-
++#include <string.h>
+ #include "mulGlobal.h"
+ #include "zbufGlobal.h"
diff --git a/cad/fasthenry/patches/patch-ar b/cad/fasthenry/patches/patch-ar
new file mode 100644
index 00000000000..d47173a8670
--- /dev/null
+++ b/cad/fasthenry/patches/patch-ar
@@ -0,0 +1,10 @@
+$NetBSD: patch-ar,v 1.1 2001/02/09 11:29:39 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 @@
+ */
+ #include <stdio.h>
++#include <string.h>
+ 
+ #define NALLOC 8184		/* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */
diff --git a/cad/fasthenry/patches/patch-as b/cad/fasthenry/patches/patch-as
new file mode 100644
index 00000000000..91c25cd447b
--- /dev/null
+++ b/cad/fasthenry/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2001/02/09 11:29:39 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>
++#include <string.h>
+ 
+-#ifdef ALPHA
++#if defined(ALPHA) || defined(__alpha__) || defined(__sparc64__)
+ typedef struct {
+      int type;   /* type */