8 files changed, 117 insertions, 91 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 2622d79dd877..93dec2027730 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -3,7 +3,7 @@
 # Date created:         26 Mar 96
 # Whom:                 Julian Jenkins <kaveman@magna.com.au>
 #
-# $Id: Makefile,v 1.8 1997/01/31 08:23:06 tg Exp $
+# $Id: Makefile,v 1.9 1997/10/22 07:04:48 tg Exp $
 #
 
 DISTNAME=	sp3f4.kit
@@ -25,10 +25,10 @@ MAN1=		sconvert.1 nutmeg.1 spice.1
 MAN3=		mfb.3
 MAN5=		mfbcap.5
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${PREFIX}/share/examples/spice
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/examples/spice3
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${PREFIX}/share/examples/spice3
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/spice/files/FreeBSD b/cad/spice/files/FreeBSD
index 59a8f9359bd6..9639ab93fd9e 100644
--- a/cad/spice/files/FreeBSD
+++ b/cad/spice/files/FreeBSD
@@ -4,7 +4,7 @@ MAKE		= /usr/bin/make
 INTERFACE_OPTS  = -DWANT_X11
 CC              = gcc
 CC_OPT          = -O2 -pipe
-CC_OPT_SAFE     = -O2 -pipe
-LDFLAGS		= -L /usr/X11R6/lib -lm -ltermcap
+CC_OPT_SAFE     = -O2 -fno-strength-reduce -pipe
+LDFLAGS		= -L$(X11BASE)/lib -lm -ltermcap
 ASM_HACK	= < /dev/null
 SYS_CFLAGS	= -Dbsd
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index c74c0f3747f8..6ca93e2439f6 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -4,15 +4,15 @@ all:
 
 install:
 	util/build FreeBSD install 
+	chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
+	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help	\
+	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
+	strip ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg	\
+	  ${PREFIX}/bin/sconvert ${PREFIX}/bin/help \
+	  ${PREFIX}/bin/proc2mod ${PREFIX}/bin/multidec
+	chmod -R a+rX ${PREFIX}/share/spice3
 	install -c -m 644 -o bin -g bin man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5
 	install -c -m 644 -o bin -g bin man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1
 	install -c -m 644 -o bin -g bin man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1
 	install -c -m 644 -o bin -g bin man/man1/spice.1 ${PREFIX}/man/man1/spice.1
 	install -c -m 644 -o bin -g bin man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
-	chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
-		${PREFIX}/bin/sconvert ${PREFIX}/bin/help ${PREFIX}/bin/proc2mod  \
-		${PREFIX}/bin/multidec
-	strip ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
-	    ${PREFIX}/bin/sconvert ${PREFIX}/bin/help ${PREFIX}/bin/proc2mod \
-	    ${PREFIX}/bin/multidec
-	chmod -R a+rX ${PREFIX}/share/spice
diff --git a/cad/spice/files/patch-aa b/cad/spice/files/patch-aa
index 36d04d4a4708..8e423df0cf3c 100644
--- a/cad/spice/files/patch-aa
+++ b/cad/spice/files/patch-aa
@@ -1,5 +1,5 @@
-*** conf/defaults.orig	Thu Jul 29 23:33:56 1993
---- conf/defaults	Sat Dec 21 14:15:35 1996
+*** conf/defaults.orig	Thu Jul 29 16:33:56 1993
+--- conf/defaults	Sat Jun  6 23:40:14 1998
 ***************
 *** 65,71 ****
   #	the following definition:
@@ -36,16 +36,16 @@
   #	file listed on the "build" command line.
   
 ! SPICE_DIR	= ${PREFIX}
-! SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice
+! SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
   SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
   
   S_SPICE_DIR	= $(SPICE_DIR)
-! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice
+! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/share/spice3
   S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
   
   #	INSTALL_DIRS lists the directories that need to be created before
 ***************
-*** 129,135 ****
+*** 129,139 ****
   #	an extra definition to work around the same strange bug.  See either
   #	file "conf/vax" or "conf/gcc".
   
@@ -53,7 +53,11 @@
   
   #	CC_OPT: Default compile options (optimization/debug level, other)
   
---- 129,135 ----
+! CC_OPT		= -O
+  
+  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
+  #	which typically causes problems for most compilers (bsim1 and bsim2).
+--- 129,139 ----
   #	an extra definition to work around the same strange bug.  See either
   #	file "conf/vax" or "conf/gcc".
   
@@ -61,6 +65,10 @@
   
   #	CC_OPT: Default compile options (optimization/debug level, other)
   
+! CC_OPT		= -O2 -pipe
+  
+  #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
+  #	which typically causes problems for most compilers (bsim1 and bsim2).
 ***************
 *** 203,209 ****
   #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
@@ -78,40 +86,6 @@
   
   #	INCX lists the X include directories.  This may be different between
   #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
-***************
-*** 282,288 ****
-  #	code for either or both MFB (a terminal independent graphics
-  #	interface) or X11.
-  
-! INTERFACE_OPTS	= -DWANT_MFB -DWANT_X11
-  
-  #	BUGADDR is the e-mail address to send bug reports.  If left blank
-  #	the "bug" command in spice will not operate.
---- 282,288 ----
-  #	code for either or both MFB (a terminal independent graphics
-  #	interface) or X11.
-  
-! INTERFACE_OPTS	= -DWANT_X11
-  
-  #	BUGADDR is the e-mail address to send bug reports.  If left blank
-  #	the "bug" command in spice will not operate.
-***************
-*** 292,298 ****
-  #	DEFAULT_EDITOR lists where the default editor used by the "edit"
-  #	command is located.
-  
-! DEFAULT_EDITOR	= vi
-  
-  #	ASCII_RAWFILE indicates that the default format of the spice3 raw data
-  #	file should be in human-readable format ( = 1 ) or in the smaller,
---- 292,298 ----
-  #	DEFAULT_EDITOR lists where the default editor used by the "edit"
-  #	command is located.
-  
-! DEFAULT_EDITOR	= /usr/bin/vi
-  
-  #	ASCII_RAWFILE indicates that the default format of the spice3 raw data
-  #	file should be in human-readable format ( = 1 ) or in the smaller,
 *** util/build.orig	Sun Mar 31 10:56:09 1996
 --- util/build	Sun Mar 31 10:57:21 1996
 ***************
@@ -176,3 +150,53 @@
   
   #  ifndef index
   #    ifdef HAS_INDEX
+*** src/include/os_bsd.h.orig	Sat Apr 24 18:09:46 1993
+--- src/include/os_bsd.h	Tue Jun  2 22:28:04 1998
+***************
+*** 8,19 ****
+  
+  #include "os_unix.h"
+  
+  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
+- #define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
+  #define HAS_FTIME		/* ftime( ), <times.h>			*/
+  #define HAS_TERMCAP		/* tgetxxx( )				*/
+  #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
+- #define HAS_INDEX		/* index( ) instead of strchr( )	*/
+  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
+  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
+  #define HAS_BSDTTY		/* <sgtty.h>				*/
+--- 8,23 ----
+  
+  #include "os_unix.h"
+  
++ #ifndef __FreeBSD__
+  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
+  #define HAS_FTIME		/* ftime( ), <times.h>			*/
++ #define HAS_INDEX		/* index( ) instead of strchr( )	*/
++ #define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
++ #endif
++ 
++ #define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
+  #define HAS_TERMCAP		/* tgetxxx( )				*/
+  #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
+  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
+  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
+  #define HAS_BSDTTY		/* <sgtty.h>				*/
+***************
+*** 22,25 ****
+  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
+  #define HAS_DUP2
+  #define HAS_GETWD		/* getwd(buf)				*/
+! #define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
+--- 26,35 ----
+  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
+  #define HAS_DUP2
+  #define HAS_GETWD		/* getwd(buf)				*/
+! 
+! #ifdef __FreeBSD__
+! #define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
+! #define HAS_BSDTIME		/* gettimeofday( ) return time		*/
+! #define HAS_FLOAT_H		/* float.h				*/
+! #define HAS_STRCHR		/* strchr( ) instead of index( )	*/
+! #endif
diff --git a/cad/spice/files/patch-ac b/cad/spice/files/patch-ac
index 8ffa725d64cf..8ad35674f7b2 100644
--- a/cad/spice/files/patch-ac
+++ b/cad/spice/files/patch-ac
@@ -25,19 +25,19 @@
 
           case 1: printf("Input file: ");
               (void) fflush(stdout);
-!             (void) fgets(buf,256,stdin);
+!             (void) fgets(buf,BSIZE_SP,stdin);
               sf = copy(buf);
               printf("Input type: ");
               (void) fflush(stdout);
-!             (void) fgets(buf,256,stdin);
+!             (void) fgets(buf,BSIZE_SP,stdin);
               f = buf[0];
               printf("Output file: ");
               (void) fflush(stdout);
-!             (void) fgets(buf,256,stdin);
+!             (void) fgets(buf,BSIZE_SP,stdin);
               af = copy(buf);
               printf("Output type: ");
               (void) fflush(stdout);
-!             (void) fgets(buf,256,stdin);
+!             (void) fgets(buf,BSIZE_SP,stdin);
               t = buf[0];
               break;
           default:
@@ -56,7 +56,7 @@
 
       fprintf(cp_out, "run circuit? ");
       fflush(cp_out);
-!     (void) fgets(buf,256,stdin);
+!     (void) fgets(buf,BSIZE_SP,stdin);
       if (buf[0] != 'n') {
         fprintf(cp_out, "running circuit\n");
         com_run(NULL);
diff --git a/cad/spice/pkg-comment b/cad/spice/pkg-comment
index 0db132c05913..c00e708fabc5 100644
--- a/cad/spice/pkg-comment
+++ b/cad/spice/pkg-comment
@@ -1 +1 @@
-Simulation Program for Integrated Circuit Electronics
+A general-purpose circuit simulation program
diff --git a/cad/spice/pkg-descr b/cad/spice/pkg-descr
index 76ceb3428817..4d7c58e2c684 100644
--- a/cad/spice/pkg-descr
+++ b/cad/spice/pkg-descr
@@ -1,4 +1,4 @@
-SPICE is a general-purpose circuit  simulation  program for nonlinear dc,
+SPICE is a general-purpose circuit simulation program for nonlinear dc,
 nonlinear transient, and linear ac analyses. Circuits may contain resistors,
 capacitors, inductors, mutual inductors, independent voltage and current
 sources, four types of dependent sources, lossless and lossy transmission
@@ -9,6 +9,8 @@ MESFETs, and MOSFETs.
 	From the SPICE3 Version3f3 User's Manual.
 	This is availble as a postscript document from:
 		ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
-		
+	or you can read the online documentation at:
+		http://infopad.eecs.berkeley.edu/~icdesign/SPICE/
+
 Julian Jenkins
 kaveman@magna.com.au
diff --git a/cad/spice/pkg-plist b/cad/spice/pkg-plist
index bc4d56172655..f68f6dd8faa9 100644
--- a/cad/spice/pkg-plist
+++ b/cad/spice/pkg-plist
@@ -4,38 +4,38 @@ bin/sconvert
 bin/help
 bin/proc2mod
 bin/multidec
-share/examples/spice/bjtnoise.cir
-share/examples/spice/bsim1tst.cir
-share/examples/spice/bsim2tst.cir
-share/examples/spice/diffpair.cir
-share/examples/spice/diodisto.cir
-share/examples/spice/ltra_1.cir
-share/examples/spice/ltra_2.cir
-share/examples/spice/ltra_3.cir
-share/examples/spice/mixdisto.cir
-share/examples/spice/mos6inv.cir
-share/examples/spice/mosamp2.cir
-share/examples/spice/mosmem.cir
-share/examples/spice/pz2.cir
-share/examples/spice/pzt.cir
-share/examples/spice/rc.cir
-share/examples/spice/rca3040.cir
-share/examples/spice/resnoise.cir
-share/examples/spice/rtlinv.cir
-share/examples/spice/schmitt.cir
-share/examples/spice/simplepz.cir
-share/spice/helpdir/spice.txt
-share/spice/helpdir/spice.idx
-share/spice/scripts/setplot
-share/spice/scripts/spinit
-share/spice/mfbcap
-share/spice/news
+share/examples/spice3/bjtnoise.cir
+share/examples/spice3/bsim1tst.cir
+share/examples/spice3/bsim2tst.cir
+share/examples/spice3/diffpair.cir
+share/examples/spice3/diodisto.cir
+share/examples/spice3/ltra_1.cir
+share/examples/spice3/ltra_2.cir
+share/examples/spice3/ltra_3.cir
+share/examples/spice3/mixdisto.cir
+share/examples/spice3/mos6inv.cir
+share/examples/spice3/mosamp2.cir
+share/examples/spice3/mosmem.cir
+share/examples/spice3/pz2.cir
+share/examples/spice3/pzt.cir
+share/examples/spice3/rc.cir
+share/examples/spice3/rca3040.cir
+share/examples/spice3/resnoise.cir
+share/examples/spice3/rtlinv.cir
+share/examples/spice3/schmitt.cir
+share/examples/spice3/simplepz.cir
+share/spice3/helpdir/spice.txt
+share/spice3/helpdir/spice.idx
+share/spice3/scripts/setplot
+share/spice3/scripts/spinit
+share/spice3/mfbcap
+share/spice3/news
 man/man5/mfbcap.5.gz
 man/man1/sconvert.1.gz
 man/man1/nutmeg.1.gz
 man/man1/spice.1.gz
 man/man3/mfb.3.gz
-@dirrm share/examples/spice
-@dirrm share/spice/helpdir
-@dirrm share/spice/scripts
-@dirrm share/spice
+@dirrm share/examples/spice3
+@dirrm share/spice3/helpdir
+@dirrm share/spice3/scripts
+@dirrm share/spice3