Port cleanup. Upgrade version number to 3f5.

PR:		4721
Submitted by:	Pedro Giffuni <pgiffuni@FPS.biblos.unal.edu.co>

5 files changed, 74 insertions, 3 deletions

diff --git a/cad/spice/files/FreeBSD b/cad/spice/files/FreeBSD
index 87835b625228..59a8f9359bd6 100644
--- a/cad/spice/files/FreeBSD
+++ b/cad/spice/files/FreeBSD
@@ -3,7 +3,8 @@
 MAKE		= /usr/bin/make
 INTERFACE_OPTS  = -DWANT_X11
 CC              = gcc
-CC_OPT          = -O2 -pipe -Dbsd 
-CC_OPT_SAFE     = -O2 -pipe -Dbsd
+CC_OPT          = -O2 -pipe
+CC_OPT_SAFE     = -O2 -pipe
 LDFLAGS		= -L /usr/X11R6/lib -lm -ltermcap
 ASM_HACK	= < /dev/null
+SYS_CFLAGS	= -Dbsd
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index 0327cb4ac36c..c74c0f3747f8 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -9,3 +9,10 @@ install:
 	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 9b4c5d314d90..36d04d4a4708 100644
--- a/cad/spice/files/patch-aa
+++ b/cad/spice/files/patch-aa
@@ -74,7 +74,7 @@
   #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
   #	a convenience that is used in the following definitions.
   
-! X_DIR		= /usr/X11R6
+! X_DIR		= ${X11BASE}
   
   #	INCX lists the X include directories.  This may be different between
   #	MIT X11r5, X11r4, and your vendor's version of X11, though listing
diff --git a/cad/spice/files/patch-ab b/cad/spice/files/patch-ab
index d561a07a85ed..b271cc97905d 100644
--- a/cad/spice/files/patch-ab
+++ b/cad/spice/files/patch-ab
@@ -1,3 +1,4 @@
+NOTE: This are Berkeley patches for 3F4
 *** src/lib/fte/grid.c.orig	Sun Apr 25 14:53:11 1993
 --- src/lib/fte/grid.c	Sat Jan 29 10:47:59 1994
 ***************
diff --git a/cad/spice/files/patch-ac b/cad/spice/files/patch-ac
new file mode 100644
index 000000000000..8ffa725d64cf
--- /dev/null
+++ b/cad/spice/files/patch-ac
@@ -0,0 +1,62 @@
+*** src/bin/sconvert.c.orig	Tue Aug 19 17:44:17 1997
+--- src/bin/sconvert.c	Tue Aug 19 17:47:11 1997
+***************
+*** 80,98 ****
+
+          case 1: printf("Input file: ");
+              (void) fflush(stdout);
+!             (void) gets(buf);
+              sf = copy(buf);
+              printf("Input type: ");
+              (void) fflush(stdout);
+!             (void) gets(buf);
+              f = buf[0];
+              printf("Output file: ");
+              (void) fflush(stdout);
+!             (void) gets(buf);
+              af = copy(buf);
+              printf("Output type: ");
+              (void) fflush(stdout);
+!             (void) gets(buf);
+              t = buf[0];
+              break;
+          default:
+--- 80,98 ----
+
+          case 1: printf("Input file: ");
+              (void) fflush(stdout);
+!             (void) fgets(buf,256,stdin);
+              sf = copy(buf);
+              printf("Input type: ");
+              (void) fflush(stdout);
+!             (void) fgets(buf,256,stdin);
+              f = buf[0];
+              printf("Output file: ");
+              (void) fflush(stdout);
+!             (void) fgets(buf,256,stdin);
+              af = copy(buf);
+              printf("Output type: ");
+              (void) fflush(stdout);
+!             (void) fgets(buf,256,stdin);
+              t = buf[0];
+              break;
+          default:
+*** src/lib/fte/inp.c.orig	Tue Aug 19 17:38:25 1997
+--- src/lib/fte/inp.c	Tue Aug 19 17:33:01 1997
+***************
+*** 666,672 ****
+
+      fprintf(cp_out, "run circuit? ");
+      fflush(cp_out);
+!     (void) gets(buf);
+      if (buf[0] != 'n') {
+        fprintf(cp_out, "running circuit\n");
+        com_run(NULL);
+--- 666,672 ----
+
+      fprintf(cp_out, "run circuit? ");
+      fflush(cp_out);
+!     (void) fgets(buf,256,stdin);
+      if (buf[0] != 'n') {
+        fprintf(cp_out, "running circuit\n");
+        com_run(NULL);