Stage cad/cider. Mark BROKEN on F10+ caused by bmake

This port generates a makefile and then passes it to "make" via stdin,
which makes it different to troubleshoot.  When I finally saw the file
in order to figure out why several internal static libraries weren't
getting built leading to some programs not getting built, I saw a
generic static library target made up of variables.  fmake likes it;
bmake does not.

I tried USES+= fmake along with some patching but I must have missed
some hardcoded "make" commands because bmake got called again.  This
software is 20 years old so I finally gave it.  It got a stay of
execution by getting staged.  If somebody wants to study a target that
bmake just doesn't get, this is a good place to start.

46 files changed, 528 insertions, 500 deletions

diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index deb93f6f2706..7c1adddc8fd4 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cider
 PORTVERSION=	1.b1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	mita
@@ -14,45 +14,77 @@ COMMENT=	Mixed-level circuit and device simulator (includes SPICE3)
 
 CONFLICTS=	spice-[0-9]*
 WRKSRC=		${WRKDIR}/sim
-MAN1=		sconvert.1 nutmeg.1 spice.1 cider.1
-MAN3=		mfb.3
-MAN5=		mfbcap.5
-MLINKS=		spice.1 spice3.1
 USE_XORG=	xt xaw xmu
 
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000100
+# cider has a generated makefile that is passed to make via stdin.
+# bmake doesn't understand its generic static library targets, but
+# continues on failure.  The result is several programs aren't built.
+# Using USE+=fmake even with patching won't fix it on FreeBSD 10.  make
+# must be hardcoded somewhere because fmake ends up calling make.
+BROKEN=		Will not build with bmake and USES=fmake will not solve the issue
+.endif
+
 pre-patch:
-	@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt
+	@${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt \
+		${WRKSRC}/cider/common/lib/helpdir/spice.txt
 
 post-patch:
-	@${LN} -fs ../../../spice/common/util/makelib.sh ${WRKSRC}/cider/common/util
-	@${LN} -fs ../../../../spice/common/src/lib/sparse/spdefs.h ${WRKSRC}/cider/common/src/include
+	@${LN} -fs ../../../spice/common/util/makelib.sh \
+		${WRKSRC}/cider/common/util
+	@${LN} -fs ../../../../spice/common/src/lib/sparse/spdefs.h \
+		${WRKSRC}/cider/common/src/include
 	@${CP} -f ${FILESDIR}/Makefile.spice ${WRKSRC}/spice/common/Makefile
 	@${CP} -f ${FILESDIR}/Makefile.cider ${WRKSRC}/cider/common/Makefile
 	@${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/spice/common/conf
 	@${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/cider/common/conf
 
 do-build:
-	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE})
-	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE})
+	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
+	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 
 do-install:
-	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE} install)
-	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE} install)
-
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${PREFIX}/share/examples/spice3
-	@${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir ${PREFIX}/share/examples/spice3
-	@${MKDIR} ${PREFIX}/share/examples/cider
-	@${TAR} -cf - -C ${WRKSRC}/cider/common/examples . | ${TAR} -xf - -C ${PREFIX}/share/examples/cider
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/cider
+	@${MKDIR} ${STAGEDIR}${DATADIR}/spice3/helpdir \
+		${STAGEDIR}${DATADIR}/spice3/scripts \
+		${STAGEDIR}${DATADIR}/cider/helpdir \
+		${STAGEDIR}${DATADIR}/cider/scripts
+	${INSTALL_PROGRAM} ${WRKSRC}/cider/FreeBSD/obj/bin/cider \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/cider/common/doc/cider.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/cider/common/lib/helpdir/*.txt \
+		${STAGEDIR}${DATADIR}/cider/helpdir
+	${INSTALL_SCRIPT} ${WRKSRC}/cider/common/lib/scripts/dev* \
+		${STAGEDIR}${DATADIR}/cider/scripts
+	(cd ${WRKSRC}/spice/FreeBSD/obj/bin && ${INSTALL_PROGRAM} \
+		spice3 nutmeg sconvert help proc2mod multidec \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/spice/common/man/man1 && ${INSTALL_MAN} nutmeg.1 \
+		sconvert.1 spice.1 ${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${STAGEDIR}${MANPREFIX}/man/man1 && \
+		${LN} -s spice.1 spice3.1)
+	${INSTALL_MAN} ${WRKSRC}/spice/common/man/man3/mfb.3 \
+		${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/spice/common/man/man5/mfbcap.5 \
+		${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/spice/common/lib/helpdir/spice.txt \
+		${STAGEDIR}${DATADIR}/spice3/helpdir
+	(cd ${WRKSRC}/spice/common/lib && ${INSTALL_DATA} news mfbcap \
+		${STAGEDIR}${DATADIR}/spice3)
+	${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/s* \
+		${STAGEDIR}${DATADIR}/spice3/scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/spinit \
+		${STAGEDIR}${DATADIR}/cider/scripts
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/spice3
+	${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir \
+		${STAGEDIR}${EXAMPLESDIR}/spice3
+	cd ${WRKSRC}/cider/common/examples && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 .endif
-	@${LN} -fs ${PREFIX}/share/spice3/scripts/spinit ${PREFIX}/share/cider/scripts
 
 .include <bsd.port.mk>
diff --git a/cad/cider/files/patch-aa b/cad/cider/files/patch-aa
deleted file mode 100644
index a99d8f742fe7..000000000000
--- a/cad/cider/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-*** spice/common/conf/defaults.orig	Sat Jan 29 19:15:53 1994
---- spice/common/conf/defaults	Sun Dec 12 14:40:09 1999
-***************
-*** 105,116 ****
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed on the "build" command line.
-  
-! SPICE_DIR	= $(TOP1)/$(SYSTEM)
-! SPICE_LIB_DIR	= $(SPICE_DIR)/lib
-  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
-  
-  S_SPICE_DIR	= $(SPICE_DIR)
-! S_SPICE_LIB_DIR	= $(S_SPICE_DIR)/lib
-  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
---- 105,116 ----
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed on the "build" command line.
-  
-! SPICE_DIR	= ${PREFIX}
-! 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/spice3
-  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
diff --git a/cad/cider/files/patch-ac b/cad/cider/files/patch-ac
deleted file mode 100644
index f9e164ca93c2..000000000000
--- a/cad/cider/files/patch-ac
+++ /dev/null
@@ -1,62 +0,0 @@
-*** spice/common/src/bin/sconvert.c.orig	Sat Jan 29 19:12:56 1994
---- spice/common/src/bin/sconvert.c	Sun Dec 12 14:49:36 1999
-***************
-*** 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,BSIZE_SP,stdin);
-              sf = copy(buf);
-              printf("Input type: ");
-              (void) fflush(stdout);
-!             (void) fgets(buf,BSIZE_SP,stdin);
-              f = buf[0];
-              printf("Output file: ");
-              (void) fflush(stdout);
-!             (void) fgets(buf,BSIZE_SP,stdin);
-              af = copy(buf);
-              printf("Output type: ");
-              (void) fflush(stdout);
-!             (void) fgets(buf,BSIZE_SP,stdin);
-              t = buf[0];
-              break;
-          default:
-*** spice/common/src/lib/fte/inp.c.orig	Sat Jan 29 18:48:10 1994
---- spice/common/src/lib/fte/inp.c	Sun Dec 12 14:49:36 1999
-***************
-*** 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,BSIZE_SP,stdin);
-      if (buf[0] != 'n') {
-        fprintf(cp_out, "running circuit\n");
-        com_run(NULL);
diff --git a/cad/cider/files/patch-ba b/cad/cider/files/patch-ba
deleted file mode 100644
index c8fe3d953db5..000000000000
--- a/cad/cider/files/patch-ba
+++ /dev/null
@@ -1,39 +0,0 @@
-*** cider/common/conf/defaults.orig	Sat Jan 29 19:21:15 1994
---- cider/common/conf/defaults	Sun Dec 12 14:14:43 1999
-***************
-*** 99,115 ****
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed in the "build" command.
-  
-! SIM_DIR		= $(TOP2)
-! SPICE_DIR	= $(SIM_DIR)/spice/$(SYSTEM)
-! CIDER_DIR	= $(SIM_DIR)/cider/$(SYSTEM)
-! SPICE_LIB_DIR	= $(SPICE_DIR)/lib
-! CIDER_LIB_DIR	= $(SPICE_DIR)/lib
-  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
-  CIDER_EXEC_DIR	= $(CIDER_DIR)/bin
-  
-  S_CIDER_DIR	= $(CIDER_DIR)
-  S_SPICE_DIR	= $(SPICE_DIR)
-! S_CIDER_LIB_DIR	= $(S_SPICE_DIR)/lib
-  S_CIDER_EXEC_DIR= $(S_CIDER_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
---- 99,115 ----
-  #	identified as and SYSTEM is the name of the per-system definitions
-  #	file listed in the "build" command.
-  
-! SIM_DIR		= ${PREFIX}
-! SPICE_DIR	= $(SIM_DIR)
-! CIDER_DIR	= $(SIM_DIR)
-! SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
-! CIDER_LIB_DIR	= $(SPICE_DIR)/share/cider
-  SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
-  CIDER_EXEC_DIR	= $(CIDER_DIR)/bin
-  
-  S_CIDER_DIR	= $(CIDER_DIR)
-  S_SPICE_DIR	= $(SPICE_DIR)
-! S_CIDER_LIB_DIR	= $(S_SPICE_DIR)/share/cider
-  S_CIDER_EXEC_DIR= $(S_CIDER_DIR)/bin
-  
-  #	INSTALL_DIRS lists the directories that need to be created before
diff --git a/cad/cider/files/patch-bb b/cad/cider/files/patch-bb
deleted file mode 100644
index eaa3598bd139..000000000000
--- a/cad/cider/files/patch-bb
+++ /dev/null
@@ -1,36 +0,0 @@
-*** cider/common/util/build.orig	Sat Jan 29 19:32:01 1994
---- cider/common/util/build	Sun Dec 12 16:45:08 1999
-***************
-*** 89,95 ****
-  
-  TMP_LEADER="${TMP_DIR}/buildl$$"
-  TMP_TRAILER="${TMP_DIR}/buildt$$"
-! trap "rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1" 1 2 3 4 6 7 8 9 10 12 13 14 15
-  echo > "${TMP_TRAILER}"
-  BAD=false
-  DEBUG=
---- 89,95 ----
-  
-  TMP_LEADER="${TMP_DIR}/buildl$$"
-  TMP_TRAILER="${TMP_DIR}/buildt$$"
-! trap "rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1" 1 2 3 4 6 7 8 10 12 13 14 15
-  echo > "${TMP_TRAILER}"
-  BAD=false
-  DEBUG=
-***************
-*** 166,172 ****
-  	echo Begin build for "${SYS_NAME}" on "${BUILD_DATE}":
-  	$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
-  		"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
-! 	| /bin/make ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
-  		VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
-  	echo Done with build at `date`
-  else
---- 166,172 ----
-  	echo Begin build for "${SYS_NAME}" on "${BUILD_DATE}":
-  	$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
-  		"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
-! 	| make -E CC ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
-  		VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
-  	echo Done with build at `date`
-  else
diff --git a/cad/cider/files/patch-be b/cad/cider/files/patch-be
deleted file mode 100644
index 4a4774d16e5f..000000000000
--- a/cad/cider/files/patch-be
+++ /dev/null
@@ -1,26 +0,0 @@
-*** cider/common/lib/makedefs.orig	Thu Feb 24 09:11:21 1994
---- cider/common/lib/makedefs	Mon Dec 13 11:34:56 1999
-***************
-*** 1,9 ****
-  
-  INSTALL_TARGETS	= $(CIDER_LIB_DIR)/helpdir/cider.txt			      \
-  		  $(CIDER_LIB_DIR)/helpdir/cider.idx	\
-  		  $(CIDER_LIB_DIR)/scripts/devaxis	\
-  		  $(CIDER_LIB_DIR)/scripts/devload
-  
-! ALL_INSTALL_DIRS = $(CIDER_LIB_DIR) $(CIDER_LIB_DIR)/helpdir
-  
-  INSTALL_SPECIAL = directories
---- 1,12 ----
-  
-  INSTALL_TARGETS	= $(CIDER_LIB_DIR)/helpdir/cider.txt			      \
-  		  $(CIDER_LIB_DIR)/helpdir/cider.idx	\
-+ 		  $(CIDER_LIB_DIR)/helpdir/spice.txt	\
-+ 		  $(CIDER_LIB_DIR)/helpdir/spice.idx	\
-  		  $(CIDER_LIB_DIR)/scripts/devaxis	\
-  		  $(CIDER_LIB_DIR)/scripts/devload
-  
-! ALL_INSTALL_DIRS = $(CIDER_LIB_DIR) $(CIDER_LIB_DIR)/helpdir \
-! 		   $(CIDER_LIB_DIR)/scripts
-  
-  INSTALL_SPECIAL = directories
diff --git a/cad/cider/files/patch-bf b/cad/cider/files/patch-bf
deleted file mode 100644
index 6e6f6e74109a..000000000000
--- a/cad/cider/files/patch-bf
+++ /dev/null
@@ -1,18 +0,0 @@
-*** cider/common/lib/makeops.orig	Thu Feb 24 09:11:43 1994
---- cider/common/lib/makeops	Mon Dec 13 11:45:34 1999
-***************
-*** 11,16 ****
---- 11,23 ----
-  $(CIDER_LIB_DIR)/helpdir/cider.idx: $(OBJBIN_SPICE_DIR)/makeidx
-  	$(OBJBIN_SPICE_DIR)/makeidx $(CIDER_LIB_DIR)/helpdir/cider.txt
-  
-+ $(CIDER_LIB_DIR)/helpdir/spice.txt: $(DISTLIB_DIR)/helpdir/spice.txt
-+ 	-cp $? $@
-+ 
-+ $(CIDER_LIB_DIR)/helpdir/spice.idx: $(DISTLIB_DIR)/helpdir/spice.txt
-+ $(CIDER_LIB_DIR)/helpdir/spice.idx: $(OBJBIN_SPICE_DIR)/makeidx
-+ 	$(OBJBIN_SPICE_DIR)/makeidx $(CIDER_LIB_DIR)/helpdir/spice.txt
-+ 
-  $(CIDER_LIB_DIR):
-  	mkdir -p $(CIDER_LIB_DIR)
-  
diff --git a/cad/cider/files/patch-bg b/cad/cider/files/patch-bg
deleted file mode 100644
index 95acfb1546a1..000000000000
--- a/cad/cider/files/patch-bg
+++ /dev/null
@@ -1,22 +0,0 @@
-*** cider/common/lib/helpdir/spice.txt.orig	Mon Dec 13 10:57:16 1999
---- cider/common/lib/helpdir/spice.txt	Mon Dec 13 10:50:01 1999
-***************
-*** 7,12 ****
---- 7,13 ----
-  TEXT: H
-  TEXT: H
-  TEXT: H
-+ SUBTOPIC: CIDER:cider
-  SUBTOPIC: SPICE:INTRODUCTION
-  SUBTOPIC: SPICE:CIRCUIT DESCRIPTION
-  SUBTOPIC: SPICE:CIRCUIT ELEMENTS AND MODELS
-***************
-*** 15,20 ****
---- 16,22 ----
-  SUBTOPIC: SPICE:BIBLIOGRAPHY
-  SUBTOPIC: SPICE:APPENDIX A
-  SUBTOPIC: SPICE:APPENDIX B
-+ SUBJECT: cider
-  SUBJECT: INTRODUCTION
-  TITLE: INTRODUCTION
-  TEXT: H
diff --git a/cad/cider/files/patch-bm b/cad/cider/files/patch-bm
deleted file mode 100644
index d750cfd15b6b..000000000000
--- a/cad/cider/files/patch-bm
+++ /dev/null
@@ -1,16 +0,0 @@
---- cider/common/src/lib/support/erfc.c.orig	Sat Jan 29 19:29:27 1994
-+++ cider/common/src/lib/support/erfc.c	Tue Oct 24 12:23:09 2000
-@@ -10,6 +10,7 @@
- 
- /* erfc computes the erfc(x) the code is from sedan's derfc.f */
- 
-+#ifdef HAS_NO_ERFC
- double erfc ( x )
- double x;
- {
-@@ -46,4 +47,4 @@
-         return( 1.0 - sum2 );
-     }
- }
--
-+#endif
diff --git a/cad/cider/files/patch-cider1b1_common_conf_defaults b/cad/cider/files/patch-cider1b1_common_conf_defaults
new file mode 100644
index 000000000000..52499018bef4
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_conf_defaults
@@ -0,0 +1,26 @@
+--- cider1b1/common/conf/defaults.orig	1994-01-29 19:21:15 UTC
++++ cider1b1/common/conf/defaults
+@@ -99,17 +99,17 @@ OBJ_TOP		= $(SYS_DIR)/obj
+ #	identified as and SYSTEM is the name of the per-system definitions
+ #	file listed in the "build" command.
+ 
+-SIM_DIR		= $(TOP2)
+-SPICE_DIR	= $(SIM_DIR)/spice/$(SYSTEM)
+-CIDER_DIR	= $(SIM_DIR)/cider/$(SYSTEM)
+-SPICE_LIB_DIR	= $(SPICE_DIR)/lib
+-CIDER_LIB_DIR	= $(SPICE_DIR)/lib
++SIM_DIR		= ${PREFIX}
++SPICE_DIR	= $(SIM_DIR)
++CIDER_DIR	= $(SIM_DIR)
++SPICE_LIB_DIR	= $(SPICE_DIR)/share/spice3
++CIDER_LIB_DIR	= $(SPICE_DIR)/share/cider
+ SPICE_EXEC_DIR	= $(SPICE_DIR)/bin
+ CIDER_EXEC_DIR	= $(CIDER_DIR)/bin
+ 
+ S_CIDER_DIR	= $(CIDER_DIR)
+ S_SPICE_DIR	= $(SPICE_DIR)
+-S_CIDER_LIB_DIR	= $(S_SPICE_DIR)/lib
++S_CIDER_LIB_DIR	= $(S_SPICE_DIR)/share/cider
+ S_CIDER_EXEC_DIR= $(S_CIDER_DIR)/bin
+ 
+ #	INSTALL_DIRS lists the directories that need to be created before
diff --git a/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt b/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt
new file mode 100644
index 000000000000..d8cfab61e6d6
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt
@@ -0,0 +1,18 @@
+--- cider1b1/common/lib/helpdir/spice.txt.orig	2014-08-18 09:55:34 UTC
++++ cider1b1/common/lib/helpdir/spice.txt
+@@ -7,6 +7,7 @@ TEXT: H
+ TEXT: H
+ TEXT: H
+ TEXT: H
++SUBTOPIC: CIDER:cider
+ SUBTOPIC: SPICE:INTRODUCTION
+ SUBTOPIC: SPICE:CIRCUIT DESCRIPTION
+ SUBTOPIC: SPICE:CIRCUIT ELEMENTS AND MODELS
+@@ -15,6 +16,7 @@ SUBTOPIC: SPICE:INTERACTIVE INTERPRETER
+ SUBTOPIC: SPICE:BIBLIOGRAPHY
+ SUBTOPIC: SPICE:APPENDIX A
+ SUBTOPIC: SPICE:APPENDIX B
++SUBJECT: cider
+ SUBJECT: INTRODUCTION
+ TITLE: INTRODUCTION
+ TEXT: H
diff --git a/cad/cider/files/patch-cider1b1_common_lib_makedefs b/cad/cider/files/patch-cider1b1_common_lib_makedefs
new file mode 100644
index 000000000000..506ea08b4f4d
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_lib_makedefs
@@ -0,0 +1,16 @@
+--- cider1b1/common/lib/makedefs.orig	1994-02-24 09:11:21 UTC
++++ cider1b1/common/lib/makedefs
+@@ -1,9 +1,12 @@
+ 
+ INSTALL_TARGETS	= $(CIDER_LIB_DIR)/helpdir/cider.txt			      \
+ 		  $(CIDER_LIB_DIR)/helpdir/cider.idx	\
++		  $(CIDER_LIB_DIR)/helpdir/spice.txt	\
++		  $(CIDER_LIB_DIR)/helpdir/spice.idx	\
+ 		  $(CIDER_LIB_DIR)/scripts/devaxis	\
+ 		  $(CIDER_LIB_DIR)/scripts/devload
+ 
+-ALL_INSTALL_DIRS = $(CIDER_LIB_DIR) $(CIDER_LIB_DIR)/helpdir
++ALL_INSTALL_DIRS = $(CIDER_LIB_DIR) $(CIDER_LIB_DIR)/helpdir \
++		   $(CIDER_LIB_DIR)/scripts
+ 
+ INSTALL_SPECIAL = directories
diff --git a/cad/cider/files/patch-cider1b1_common_lib_makeops b/cad/cider/files/patch-cider1b1_common_lib_makeops
new file mode 100644
index 000000000000..6672ea21f77e
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_lib_makeops
@@ -0,0 +1,16 @@
+--- cider1b1/common/lib/makeops.orig	1994-02-24 09:11:43 UTC
++++ cider1b1/common/lib/makeops
+@@ -11,6 +11,13 @@ $(CIDER_LIB_DIR)/helpdir/cider.idx: $(DI
+ $(CIDER_LIB_DIR)/helpdir/cider.idx: $(OBJBIN_SPICE_DIR)/makeidx
+ 	$(OBJBIN_SPICE_DIR)/makeidx $(CIDER_LIB_DIR)/helpdir/cider.txt
+ 
++$(CIDER_LIB_DIR)/helpdir/spice.txt: $(DISTLIB_DIR)/helpdir/spice.txt
++	-cp $? $@
++
++$(CIDER_LIB_DIR)/helpdir/spice.idx: $(DISTLIB_DIR)/helpdir/spice.txt
++$(CIDER_LIB_DIR)/helpdir/spice.idx: $(OBJBIN_SPICE_DIR)/makeidx
++	$(OBJBIN_SPICE_DIR)/makeidx $(CIDER_LIB_DIR)/helpdir/spice.txt
++
+ $(CIDER_LIB_DIR):
+ 	mkdir -p $(CIDER_LIB_DIR)
+ 
diff --git a/cad/cider/files/patch-bc b/cad/cider/files/patch-cider1b1_common_src_bin_main.c
index d860044fff49..86450a4fe302 100644
--- a/cad/cider/files/patch-bc
+++ b/cad/cider/files/patch-cider1b1_common_src_bin_main.c
@@ -1,6 +1,6 @@
---- cider/common/src/bin/main.c.orig	Sat Mar 12 08:20:59 1994
-+++ cider/common/src/bin/main.c	Fri Oct 17 22:19:55 2003
-@@ -36,6 +36,11 @@
+--- cider1b1/common/src/bin/main.c.orig	1994-03-12 08:20:59 UTC
++++ cider1b1/common/src/bin/main.c
+@@ -36,6 +36,11 @@ Author: 1985 Wayne A. Christopher
  #endif
  
  #include "patchlev.h"
@@ -12,14 +12,14 @@
  #include "suffix.h"
  
  /* (Virtual) Machine architecture parameters */
-@@ -214,6 +219,10 @@
-     FILE	*fp;
-     FILE	*circuit_file;
+@@ -216,6 +221,10 @@ main(ac, av)
  
-+#endif
-+
-+#ifdef __FreeBSD__
-+    fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL);
  #endif
  
++#ifdef __FreeBSD__
++    fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL);
++#endif
++
      /* MFB tends to jump to 0 on errors.  This tends to catch it. */
+     if (started) {
+         fprintf(cp_err, "main: Internal Error: jump to zero\n");
diff --git a/cad/cider/files/patch-bl b/cad/cider/files/patch-cider1b1_common_src_bin_makeops
index f565a3f0d49f..1245c2598f2f 100644
--- a/cad/cider/files/patch-bl
+++ b/cad/cider/files/patch-cider1b1_common_src_bin_makeops
@@ -1,6 +1,6 @@
---- cider/common/src/bin/makeops.orig	Tue Mar  8 12:39:12 1994
-+++ cider/common/src/bin/makeops	Wed Dec 20 22:51:56 2006
-@@ -19,14 +19,14 @@
+--- cider1b1/common/src/bin/makeops.orig	1994-03-08 03:39:12 UTC
++++ cider1b1/common/src/bin/makeops
+@@ -19,14 +19,14 @@ $(CIDER_EXEC_DIR):
  	mkdir $(CIDER_EXEC_DIR)
  
  cider.o: main.c $(SYS_CONF)/$(OBJECTIVE)-cc
@@ -18,7 +18,7 @@
  
  conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
  	@echo Creating "$@":
-@@ -66,7 +66,7 @@
+@@ -66,7 +66,7 @@ LIBCDR	= $(NULIB)/dev.a $(NULIB)/input.a
  cider: cider.o conf.o $(TUNEFILE).o $(OBJCDR) $(LIBBEFS) $(LIBCDR) $(LIBAFTS) \
  	  $(SYS_CONF)/$(OBJECTIVE)-ld
  	-@rm -f cider
diff --git a/cad/cider/files/patch-cider-common-src-lib-input-meshset.c b/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c
index 697492d9d8ec..3b3fa012bcd1 100644
--- a/cad/cider/files/patch-cider-common-src-lib-input-meshset.c
+++ b/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c
@@ -1,6 +1,6 @@
---- cider/common/src/lib/input/meshset.c.orig	Sun Jan 30 04:30:51 1994
-+++ cider/common/src/lib/input/meshset.c	Sat Dec 23 19:52:47 2006
-@@ -36,12 +36,14 @@
+--- cider1b1/common/src/lib/input/meshset.c.orig	1994-01-29 19:30:51 UTC
++++ cider1b1/common/src/lib/input/meshset.c
+@@ -36,12 +36,14 @@ static int maxLimSpacing( double, double
      double *, int *, int * );
  static int oneSideRatio( double, double, double *, int );
  static int twoSideRatio( double, double, double, double *, int, int );
diff --git a/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c b/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c
new file mode 100644
index 000000000000..fafddd9d2b3e
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c
@@ -0,0 +1,16 @@
+--- cider1b1/common/src/lib/support/erfc.c.orig	1994-01-29 19:29:27 UTC
++++ cider1b1/common/src/lib/support/erfc.c
+@@ -10,6 +10,7 @@ Author:	1987 Kartikeya Mayaram, U. C. Be
+ 
+ /* erfc computes the erfc(x) the code is from sedan's derfc.f */
+ 
++#ifdef HAS_NO_ERFC
+ double erfc ( x )
+ double x;
+ {
+@@ -46,4 +47,4 @@ double x;
+         return( 1.0 - sum2 );
+     }
+ }
+-
++#endif
diff --git a/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c b/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c
new file mode 100644
index 000000000000..c6749392c79d
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c
@@ -0,0 +1,27 @@
+--- cider1b1/common/src/lib/support/mobil.c.orig	1994-01-29 19:29:43.000000000 +0000
++++ cider1b1/common/src/lib/support/mobil.c
+@@ -304,7 +304,7 @@ double *pMup;
+       *pMup = info->muMax[HOLE][MAJOR];
+     }
+   }
+-  return;
++  return (0);
+ }
+ 
+ MOBfieldDep (info, carrier, field, pMu, pDMu)
+@@ -321,7 +321,7 @@ double *pDMu;
+ 
+   /* Quick check to make sure we really belong here. */
+   if (!FieldDepMobility)
+-    return;
++    return (0);
+ 
+   sgnL = SGN (field);
+   eLateral = ABS (field);
+@@ -413,5 +413,5 @@ double *pDMu;
+   *pMu = mu;
+   *pDMu = dMuDEl;
+ 
+-  return;
++  return (0);
+ }
diff --git a/cad/cider/files/patch-cider1b1_common_util_build b/cad/cider/files/patch-cider1b1_common_util_build
new file mode 100644
index 000000000000..bc9003453bd8
--- /dev/null
+++ b/cad/cider/files/patch-cider1b1_common_util_build
@@ -0,0 +1,20 @@
+--- cider1b1/common/util/build.orig	1994-01-29 19:32:01 UTC
++++ cider1b1/common/util/build
+@@ -89,7 +89,7 @@ DIR4=`basename ${TOP3}`
+ 
+ TMP_LEADER="${TMP_DIR}/buildl$$"
+ TMP_TRAILER="${TMP_DIR}/buildt$$"
+-trap "rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1" 1 2 3 4 6 7 8 9 10 12 13 14 15
++trap "rm -f ${TMP_LEADER} ${TMP_TRAILER}; exit 1" 1 2 3 4 6 7 8 10 12 13 14 15
+ echo > "${TMP_TRAILER}"
+ BAD=false
+ DEBUG=
+@@ -166,7 +166,7 @@ if test -z "${DEBUG}"; then
+ 	echo Begin build for "${SYS_NAME}" on "${BUILD_DATE}":
+ 	$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
+ 		"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
+-	| /bin/make ${VERBOSE} -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
++	| make ${VERBOSE} -f - bootstrap CC="${CC}" DIR="${DIR}" SUBDIR="${SUBDIR}" \
+ 		VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
+ 	echo Done with build at `date`
+ else
diff --git a/cad/cider/files/patch-bj b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd
index 821e81d9a851..60490c0e7d23 100644
--- a/cad/cider/files/patch-bj
+++ b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd
@@ -1,6 +1,6 @@
---- cider/common/util/skeleton/make_def.bd.orig	Sat Mar 12 22:05:44 1994
-+++ cider/common/util/skeleton/make_def.bd	Wed Dec 20 22:46:26 2006
-@@ -48,7 +48,7 @@
+--- cider1b1/common/util/skeleton/make_def.bd.orig	1994-03-12 13:05:44 UTC
++++ cider1b1/common/util/skeleton/make_def.bd
+@@ -48,7 +48,7 @@ ALL_PURPOSE	= default_all
  PRE_PURPOSE	= pre_$(PURPOSE)
  PURPOSE		= all
  INCLUDE		= -I$(INCLUDE_DIR) -I$(INCLUDE_SPICE_DIR) -I$(TCGMSG_DIR)/include
@@ -9,7 +9,7 @@
  
  CIDER_TUNE	= -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\"	      \
  		  -DSCRIPT_DIR=\"$(SCRIPT_DIR)\" -DNEWS_FILE=\"$(NEWS_FILE)\" \
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ SPARSELIB	= sparse
  
  LIBRARIES	= dev input oned twod spiceitf support
  
diff --git a/cad/cider/files/patch-ak b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd
index 22801695c1f5..e163e04f43e7 100644
--- a/cad/cider/files/patch-ak
+++ b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd
@@ -1,6 +1,6 @@
---- spice/common/util/skeleton/make_std.bd.orig	Sun Jan 30 04:16:16 1994
-+++ spice/common/util/skeleton/make_std.bd	Wed Dec 20 22:59:47 2006
-@@ -23,7 +23,7 @@
+--- cider1b1/common/util/skeleton/make_std.bd.orig	1994-01-29 19:31:59 UTC
++++ cider1b1/common/util/skeleton/make_std.bd
+@@ -23,7 +23,7 @@ BUILD_DIR =								      \
  			DIR="$${DIR}"
  
  .c.o:
@@ -9,7 +9,7 @@
  
  bootstrap: always
  	-@if test "x$(DIR)" = "xsrc/"; then				      \
-@@ -110,10 +110,10 @@
+@@ -110,10 +110,10 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
  		cfiles="$(CFILES)";					      \
  		for file in $${cfiles}; do				      \
  		    if test -n "$(INC_SPECIAL)"; then			      \
@@ -22,7 +22,7 @@
  				    ">> ..\..\$(MSC_ERRS)";		      \
  		    fi;							      \
  		done;							      \
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
  	if test -n "$(MODULE_TARGET)"; then				      \
  		cfiles="$(CFILES)";					      \
  		for file in $${cfiles}; do				      \
diff --git a/cad/cider/files/patch-spice3f5_common_conf_defaults b/cad/cider/files/patch-spice3f5_common_conf_defaults
new file mode 100644
index 000000000000..d02d7db76b57
--- /dev/null
+++ b/cad/cider/files/patch-spice3f5_common_conf_defaults
@@ -0,0 +1,18 @@
+--- spice3f5/common/conf/defaults.orig	1994-01-29 19:15:53 UTC
++++ spice3f5/common/conf/defaults
+@@ -105,12 +105,12 @@ OBJ_TOP		= $(SYS_DIR)/obj
+ #	identified as and SYSTEM is the name of the per-system definitions
+ #	file listed on the "build" command line.
+ 
+-SPICE_DIR	= $(TOP1)/$(SYSTEM)
+-SPICE_LIB_DIR	= $(SPICE_DIR)/lib
++SPICE_DIR	= ${PREFIX}
++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)/lib
++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
diff --git a/cad/cider/files/patch-ad b/cad/cider/files/patch-spice3f5_common_src_bin_main.c
index b6f5736836b9..a76fac6af175 100644
--- a/cad/cider/files/patch-ad
+++ b/cad/cider/files/patch-spice3f5_common_src_bin_main.c
@@ -1,6 +1,6 @@
---- spice/common/src/bin/main.c.orig	Sat Mar 12 08:22:28 1994
-+++ spice/common/src/bin/main.c	Fri Oct 17 22:11:28 2003
-@@ -36,6 +36,11 @@
+--- spice3f5/common/src/bin/main.c.orig	1994-03-12 08:22:28 UTC
++++ spice3f5/common/src/bin/main.c
+@@ -36,6 +36,11 @@ Author: 1985 Wayne A. Christopher
  #endif
  
  #include "patchlev.h"
@@ -12,14 +12,14 @@
  #include "suffix.h"
  
  /* (Virtual) Machine architecture parameters */
-@@ -214,6 +219,10 @@
-     FILE	*fp;
-     FILE	*circuit_file;
+@@ -216,6 +221,10 @@ main(ac, av)
  
-+#endif
-+
-+#ifdef __FreeBSD__
-+    fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL);
  #endif
  
++#ifdef __FreeBSD__
++    fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL);
++#endif
++
      /* MFB tends to jump to 0 on errors.  This tends to catch it. */
+     if (started) {
+         fprintf(cp_err, "main: Internal Error: jump to zero\n");
diff --git a/cad/cider/files/patch-ao b/cad/cider/files/patch-spice3f5_common_src_bin_makeops
index 2b424e76e4bc..babb11888c86 100644
--- a/cad/cider/files/patch-ao
+++ b/cad/cider/files/patch-spice3f5_common_src_bin_makeops
@@ -1,6 +1,6 @@
---- spice/common/src/bin/makeops.orig	Mon Jan 31 11:14:05 1994
-+++ spice/common/src/bin/makeops	Wed Dec 20 22:57:35 2006
-@@ -39,20 +39,20 @@
+--- spice3f5/common/src/bin/makeops.orig	1994-01-31 02:14:05 UTC
++++ spice3f5/common/src/bin/makeops
+@@ -39,20 +39,20 @@ $(SPICE_EXEC_DIR):
  	mkdir $(SPICE_EXEC_DIR)
  
  spice3.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
@@ -25,7 +25,7 @@
  	mv -f main.o $@
  
  conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ conf.c: config.c $(SYS_CONF)/$(OBJECTIVE
  	chmod -w "$@"
  
  cconf.o: $(OBJ_DIR)/cconf.c
@@ -34,7 +34,7 @@
  
  bconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
  	@echo Creating "$@": ; rm -f "$@"
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ bconf.c: config.c $(SYS_CONF)/$(OBJECTIV
  	chmod -w "$@"
  
  bconf.o: $(OBJ_DIR)/bconf.c
@@ -43,7 +43,7 @@
  
  cconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
  	@echo Creating "$@": ; rm -f "$@"
-@@ -97,13 +97,13 @@
+@@ -97,13 +97,13 @@ nconf.c: nconfig.c $(SYS_CONF)/$(OBJECTI
  	chmod -w "$@"
  
  $(TUNEFILE).o: $(TUNEFILE).c
@@ -60,7 +60,7 @@
  
  $(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
  	@echo "Creating $(TUNEFILE).c";					      \
-@@ -122,14 +122,14 @@
+@@ -122,14 +122,14 @@ $(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
  	chmod -w "$@"
  
  help.o: help.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
@@ -78,7 +78,7 @@
  
  LIB	= $(OBJLIB_DIR)
  
-@@ -138,45 +138,45 @@
+@@ -138,45 +138,45 @@ LIBS	= $(LIB)/fte.a $(LIB)/dev.a $(LIB)/
  	$(LIB)/misc.a $(LIBTCGMSG)
  spice3: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
  	-@rm -f spice3
@@ -132,7 +132,7 @@
  
  # old LIBSC= $(LIB)/fte.a $(LIB)/cp.a $(LIB)/fte.a $(LIB)/inp.a $(LIB)/misc.a
  LIBSC	= $(LIB)/misc.a $(LIBTCGMSG)
-@@ -186,28 +186,28 @@
+@@ -186,28 +186,28 @@ SCFILES	= $(LIB)/fte/rawfile.o $(LIB)/ft
  	  $(LIB)/cp/variable.o $(LIB)/cp/var2.o $(LIB)/fte/dimens.o
  sconvert: sconvert.o $(SCFILES) $(LIBSC) $(SYS_CONF)/$(OBJECTIVE)-ld
  	@-rm -f sconvert
diff --git a/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c b/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c
new file mode 100644
index 000000000000..bded4326dc00
--- /dev/null
+++ b/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c
@@ -0,0 +1,26 @@
+--- spice3f5/common/src/bin/sconvert.c.orig	1994-01-29 19:12:56 UTC
++++ spice3f5/common/src/bin/sconvert.c
+@@ -80,19 +80,19 @@ main(ac, av)
+ 
+         case 1: printf("Input file: ");
+             (void) fflush(stdout);
+-            (void) gets(buf);
++            (void) fgets(buf,BSIZE_SP,stdin);
+             sf = copy(buf);
+             printf("Input type: ");
+             (void) fflush(stdout);
+-            (void) gets(buf);
++            (void) fgets(buf,BSIZE_SP,stdin);
+             f = buf[0];
+             printf("Output file: ");
+             (void) fflush(stdout);
+-            (void) gets(buf);
++            (void) fgets(buf,BSIZE_SP,stdin);
+             af = copy(buf);
+             printf("Output type: ");
+             (void) fflush(stdout);
+-            (void) gets(buf);
++            (void) fgets(buf,BSIZE_SP,stdin);
+             t = buf[0];
+             break;
+         default:
diff --git a/cad/cider/files/patch-aq b/cad/cider/files/patch-spice3f5_common_src_include_misc.h
index 9d5a04ad81ce..9bff43951a37 100644
--- a/cad/cider/files/patch-aq
+++ b/cad/cider/files/patch-spice3f5_common_src_include_misc.h
@@ -1,6 +1,6 @@
---- spice/common/src/include/misc.h.orig	Sun Jan 30 04:14:17 1994
-+++ spice/common/src/include/misc.h	Fri Dec 22 21:05:31 2006
-@@ -5,6 +5,10 @@
+--- spice3f5/common/src/include/misc.h.orig	1994-01-29 19:14:17 UTC
++++ spice3f5/common/src/include/misc.h
+@@ -5,6 +5,10 @@ Copyright 1990 Regents of the University
  #ifndef MISC_H
  #define MISC_H
  
@@ -11,7 +11,7 @@
  #define BSIZE_SP      512
  
  #ifdef HAS_EXIT1
-@@ -81,12 +85,16 @@
+@@ -81,12 +85,16 @@ extern void srandom();
  #    define srandom	srand
  #  endif
  
@@ -28,7 +28,7 @@
  extern char *getenv();
  extern char *getwd();
  extern int rand();
-@@ -109,12 +117,14 @@
+@@ -109,12 +117,14 @@ extern void clearerr();
  #    endif /* clearerr */
  #  endif /* HAS_CLEARERR */
  
diff --git a/cad/cider/files/patch-ar b/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h
index 1ea4d84e3892..1132447c5f6f 100644
--- a/cad/cider/files/patch-ar
+++ b/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h
@@ -1,6 +1,6 @@
---- spice/common/src/include/os_bsd.h.orig	Sat Jan 29 19:14:37 1994
-+++ spice/common/src/include/os_bsd.h	Thu Jan  6 12:33:20 2000
-@@ -6,20 +6,40 @@
+--- spice3f5/common/src/include/os_bsd.h.orig	1994-01-29 19:14:37 UTC
++++ spice3f5/common/src/include/os_bsd.h
+@@ -6,20 +6,40 @@ Copyright 1990 Regents of the University
   *	BSD and derivative systems
   */
  
diff --git a/cad/cider/files/patch-as b/cad/cider/files/patch-spice3f5_common_src_include_util.h
index d87b835d7557..9daa1866f9c8 100644
--- a/cad/cider/files/patch-as
+++ b/cad/cider/files/patch-spice3f5_common_src_include_util.h
@@ -1,6 +1,6 @@
---- spice/common/src/include/util.h.orig	Sun Jan 30 04:14:24 1994
-+++ spice/common/src/include/util.h	Sat Dec 23 19:48:50 2006
-@@ -6,6 +6,10 @@
+--- spice3f5/common/src/include/util.h.orig	1994-01-29 19:14:24 UTC
++++ spice3f5/common/src/include/util.h
+@@ -6,6 +6,10 @@ Author: 1985 Thomas L. Quarles
  #ifndef UTIL
  #define UTIL
  
@@ -11,7 +11,7 @@
  /* #define MALLOC(x) calloc(1,(unsigned)(x)) */
  #define MALLOC(x) tmalloc((unsigned)(x))
  #define FREE(x) {if (x) {free((char *)(x));(x) = 0;}}
-@@ -18,8 +22,10 @@
+@@ -18,8 +22,10 @@ Author: 1985 Thomas L. Quarles
  #include <stdlib.h>
  #endif
  #else
@@ -22,7 +22,7 @@
  extern char *realloc();
  extern void free();
  #endif
-@@ -44,8 +50,10 @@
+@@ -44,8 +50,10 @@ double fabs();
  #endif
  
  /* XXX Move these into the above ifdef someday */
diff --git a/cad/cider/files/patch-spice-common-src-lib-cp-complete.c b/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c
index 745e66d8269c..344fbe07a041 100644
--- a/cad/cider/files/patch-spice-common-src-lib-cp-complete.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/cp/complete.c	Wed Jun 19 05:55:38 1991
-+++ spice/common/src/lib/cp/complete.c	Sat Mar 17 11:51:56 2007
-@@ -445,14 +445,14 @@
+--- spice3f5/common/src/lib/cp/complete.c.orig	1994-01-29 18:44:01 UTC
++++ spice3f5/common/src/lib/cp/complete.c
+@@ -445,14 +445,14 @@ cp_ccon(on)
      ison = on;
  
      if (ison == true) {
diff --git a/cad/cider/files/patch-at b/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c
index f772c924e45b..08e221e78837 100644
--- a/cad/cider/files/patch-at
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/fte/clip.c.orig	Sat Jan 29 18:45:45 1994
-+++ spice/common/src/lib/fte/clip.c	Mon Dec 27 14:29:09 1999
-@@ -14,6 +14,7 @@
+--- spice3f5/common/src/lib/fte/clip.c.orig	1994-01-29 18:45:45 UTC
++++ spice3f5/common/src/lib/fte/clip.c
+@@ -14,6 +14,7 @@ Author: 1982 Giles Billingsley
  #include "cpdefs.h"
  #include "ftedefs.h"
  #include "suffix.h"
@@ -8,7 +8,7 @@
  
  #define POLYGONBUFSIZE 512
  /* XXX */
-@@ -33,8 +34,10 @@
+@@ -33,8 +34,10 @@ Author: 1982 Giles Billingsley
                           c |= CODEMAXY;
  
  /* XXX */
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c
new file mode 100644
index 000000000000..74ab3fce7d93
--- /dev/null
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c
@@ -0,0 +1,55 @@
+--- spice3f5/common/src/lib/fte/device.c.orig	1994-03-08 05:14:19.000000000 +0000
++++ spice3f5/common/src/lib/fte/device.c
+@@ -594,7 +594,7 @@ com_alter_common(wl, do_model)
+ 
+     if (!ft_curckt) {
+         fprintf(cp_err, "Error: no circuit loaded\n");
+-        return;
++        return (0);
+     }
+ 
+     words = wl;
+@@ -608,7 +608,7 @@ com_alter_common(wl, do_model)
+     }
+     if (!words) {
+ 	fprintf(cp_err, "Error: no assignment found.\n");
+-	return;
++	return (0);
+     }
+ 
+     /* device parameter = expr
+@@ -643,29 +643,29 @@ com_alter_common(wl, do_model)
+     }
+     if (!dev) {
+ 	fprintf(cp_err, "Error: no model or device name provided.\n" );
+-	return;
++	return (0);
+     }
+ 
+     words = eqword->wl_next;
+     names = ft_getpnames(words, false);
+     if (!names) {
+ 	fprintf(cp_err, "Error: cannot parse new parameter value.\n");
+-	return;
++	return (0);
+     }
+     dv = ft_evaluate(names);
+     free_pnode(names);
+     if (!dv)
+-	return;
++	return (0);
+     if (dv->v_length < 1) {
+ 	fprintf(cp_err, "Error: cannot evaluate new parameter value.\n");
+-	return;
++	return (0);
+     }
+ 
+     if_setparam(ft_curckt->ci_ckt, &dev, param, dv, do_model);
+ 
+     /* Vector data (dv) should get garbage-collected. */
+ 
+-    return;
++    return (0);
+ 
+ #ifdef notdef
+     while (wl) {
diff --git a/cad/cider/files/patch-spice-common-src-lib-fte-graf.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c
index 8ee6e6862d08..b7b1793e8340 100644
--- a/cad/cider/files/patch-spice-common-src-lib-fte-graf.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/fte/graf.c.orig	Sun Jan 30 03:46:21 1994
-+++ spice/common/src/lib/fte/graf.c	Fri Dec 22 20:12:25 2006
-@@ -49,6 +49,9 @@
+--- spice3f5/common/src/lib/fte/graf.c.orig	1994-01-29 18:46:21 UTC
++++ spice3f5/common/src/lib/fte/graf.c
+@@ -49,6 +49,9 @@ static char *ticlist = ticbuf;
  #define MAXTICS 100
  double *readtics();
  
diff --git a/cad/cider/files/patch-spice-common-src-lib-fte-grid.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c
index 6252698f94a0..09edb3596886 100644
--- a/cad/cider/files/patch-spice-common-src-lib-fte-grid.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/fte/grid.c.orig	Sun Jan 30 03:47:59 1994
-+++ spice/common/src/lib/fte/grid.c	Fri Dec 22 20:11:21 2006
-@@ -19,6 +19,9 @@
+--- spice3f5/common/src/lib/fte/grid.c.orig	1994-01-29 18:47:59 UTC
++++ spice3f5/common/src/lib/fte/grid.c
+@@ -19,6 +19,9 @@ Copyright 1990 Regents of the University
  #define RAD_TO_DEG	(180.0 / M_PI)
  #define LABEL_CHARS	20
  
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c
new file mode 100644
index 000000000000..bd2e7cc0de86
--- /dev/null
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c
@@ -0,0 +1,11 @@
+--- spice3f5/common/src/lib/fte/inp.c.orig	1994-01-29 18:48:10 UTC
++++ spice3f5/common/src/lib/fte/inp.c
+@@ -666,7 +666,7 @@ com_edit(wl)
+ 
+     fprintf(cp_out, "run circuit? ");
+     fflush(cp_out);
+-    (void) gets(buf);
++    (void) fgets(buf,BSIZE_SP,stdin);
+     if (buf[0] != 'n') {
+       fprintf(cp_out, "running circuit\n");
+       com_run(NULL);
diff --git a/cad/cider/files/patch-an b/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs
index b7af70da283b..3fa2aa8a0e20 100644
--- a/cad/cider/files/patch-an
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs
@@ -1,6 +1,6 @@
---- spice/common/src/lib/fte/makedefs.orig	Mon Jan 31 00:52:12 1994
-+++ spice/common/src/lib/fte/makedefs	Sun Dec 26 18:09:57 1999
-@@ -28,7 +28,7 @@
+--- spice3f5/common/src/lib/fte/makedefs.orig	1994-01-31 00:52:12 UTC
++++ spice3f5/common/src/lib/fte/makedefs
+@@ -28,7 +28,7 @@ LIBRARY		= fte
  LIB_TARGET	= $(OBJLIB_DIR)/$(LIBRARY).a
  
  INCLUDE		= -I$(INCLUDE_DIR) -I$(TCGMSG_DIR)/include $(INCX)
diff --git a/cad/cider/files/patch-spice-common-src-lib-fte-x11.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c
index 2de02f989a0c..4496a7f75f18 100644
--- a/cad/cider/files/patch-spice-common-src-lib-fte-x11.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/fte/x11.c.orig	Sun Jan 30 03:48:34 1994
-+++ spice/common/src/lib/fte/x11.c	Fri Dec 22 20:24:00 2006
-@@ -61,6 +61,10 @@
+--- spice3f5/common/src/lib/fte/x11.c.orig	1994-01-29 18:48:34 UTC
++++ spice3f5/common/src/lib/fte/x11.c
+@@ -61,6 +61,10 @@ typedef struct x11info {
  
  #define DEVDEP(g) (*((X11devdep *) (g)->devdep))
  
diff --git a/cad/cider/files/patch-am b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs
index 0dc7c6578a61..5212175d90dd 100644
--- a/cad/cider/files/patch-am
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs
@@ -1,6 +1,6 @@
---- spice/common/src/lib/hlp/makedefs.orig	Mon Jan 31 00:52:51 1994
-+++ spice/common/src/lib/hlp/makedefs	Sun Dec 26 18:08:08 1999
-@@ -10,7 +10,7 @@
+--- spice3f5/common/src/lib/hlp/makedefs.orig	1994-01-31 00:52:51 UTC
++++ spice3f5/common/src/lib/hlp/makedefs
+@@ -10,7 +10,7 @@ LIBRARY		= hlp
  LIB_TARGET	= $(OBJLIB_DIR)/$(LIBRARY).a
  
  INCLUDE		= -I$(INCLUDE_DIR) -I$(TCGMSG_DIR)/include $(INCX)
diff --git a/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c
index b845a8339786..904728e090e0 100644
--- a/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/hlp/readhelp.c.orig	Sun Jan 30 03:44:53 1994
-+++ spice/common/src/lib/hlp/readhelp.c	Fri Dec 22 20:58:15 2006
-@@ -41,8 +41,8 @@
+--- spice3f5/common/src/lib/hlp/readhelp.c.orig	1994-01-29 18:44:53 UTC
++++ spice3f5/common/src/lib/hlp/readhelp.c
+@@ -41,8 +41,8 @@ Author: 1986 Wayne A. Christopher, U. C.
  
  static char *getsubject();
  static toplink *getsubtoplink();
diff --git a/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c b/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c
index 8338d4b14ae3..300b6a359ee8 100644
--- a/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c
@@ -1,6 +1,6 @@
---- spice/common/src/lib/mfb/mfbcaps.c.orig	Sun Jan 30 04:07:32 1994
-+++ spice/common/src/lib/mfb/mfbcaps.c	Fri Dec 22 21:08:10 2006
-@@ -43,9 +43,9 @@
+--- spice3f5/common/src/lib/mfb/mfbcaps.c.orig	1994-01-29 19:07:32 UTC
++++ spice3f5/common/src/lib/mfb/mfbcaps.c
+@@ -43,9 +43,9 @@ static int hopcount;       /* detect inf
  
  FILE   *POpen();
  char   *strcpy();
diff --git a/cad/cider/files/patch-ap b/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h
index bb5c92461c64..3533217e0ac6 100644
--- a/cad/cider/files/patch-ap
+++ b/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h
@@ -1,5 +1,5 @@
---- spice/common/src/lib/sparse/spdefs.h.orig	Sat Jan 29 19:08:43 1994
-+++ spice/common/src/lib/sparse/spdefs.h	Mon Dec 27 14:41:07 1999
+--- spice3f5/common/src/lib/sparse/spdefs.h.orig	1994-01-29 19:08:43 UTC
++++ spice3f5/common/src/lib/sparse/spdefs.h
 @@ -132,8 +132,10 @@
  
  /* Macro commands */
diff --git a/cad/cider/files/patch-ab b/cad/cider/files/patch-spice3f5_common_util_build
index cda621b387b8..2be89831b1cb 100644
--- a/cad/cider/files/patch-ab
+++ b/cad/cider/files/patch-spice3f5_common_util_build
@@ -1,6 +1,6 @@
---- spice/common/util/build.orig	Sun Jan 30 04:16:26 1994
-+++ spice/common/util/build	Thu Dec 21 23:27:39 2006
-@@ -96,7 +96,7 @@
+--- spice3f5/common/util/build.orig	1994-01-29 19:16:26 UTC
++++ spice3f5/common/util/build
+@@ -96,7 +96,7 @@ DIR4=`basename ${TOP3}`
  
  TMP_LEADER="${TMP_DIR}/buildl$$"
  TMP_TRAILER="${TMP_DIR}/buildt$$"
@@ -9,12 +9,12 @@
  echo > "${TMP_TRAILER}"
  BAD=false
  DEBUG=
-@@ -171,7 +171,7 @@
+@@ -171,7 +171,7 @@ if test -z "${DEBUG}"; then
  	echo Begin build on `hostname` for "${SYS_NAME}" on "${BUILD_DATE}":
  	$EXEC cat ${FILES0} "${TOP0}/${DIR}/${SUBDIR}/makedefs" \
  		"${TMP_TRAILER}" "${SKEL_DIR}/make_std.bd" \
 -	| make -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
-+	| make -E CC -f - bootstrap DIR="${DIR}" SUBDIR="${SUBDIR}" \
++	| make -f - bootstrap CC="${CC}" DIR="${DIR}" SUBDIR="${SUBDIR}" \
  		VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}"
  	echo Done with build at `date`
  else
diff --git a/cad/cider/files/patch-al b/cad/cider/files/patch-spice3f5_common_util_makelib.sh
index 382469373646..fca161cdc303 100644
--- a/cad/cider/files/patch-al
+++ b/cad/cider/files/patch-spice3f5_common_util_makelib.sh
@@ -1,6 +1,6 @@
---- spice/common/util/makelib.sh.orig	Sat Jan 29 19:16:27 1994
-+++ spice/common/util/makelib.sh	Sun Dec 26 18:12:42 1999
-@@ -35,7 +35,7 @@
+--- spice3f5/common/util/makelib.sh.orig	1994-01-29 19:16:27 UTC
++++ spice3f5/common/util/makelib.sh
+@@ -35,7 +35,7 @@ ENDOFMAKEDEFS
  			cat >> makedefs <<ENDOFMAKEDEFSX
  
  INCLUDE		= -I$(INCLUDE_DIR) $(INCX)
diff --git a/cad/cider/files/patch-aj b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd
index 3c45608e2b06..3f724d25e2db 100644
--- a/cad/cider/files/patch-aj
+++ b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd
@@ -1,6 +1,6 @@
---- spice/common/util/skeleton/make_def.bd.orig	Thu Feb 24 16:07:01 1994
-+++ spice/common/util/skeleton/make_def.bd	Wed Dec 20 22:41:46 2006
-@@ -44,7 +44,7 @@
+--- spice3f5/common/util/skeleton/make_def.bd.orig	1994-02-24 07:07:01 UTC
++++ spice3f5/common/util/skeleton/make_def.bd
+@@ -44,7 +44,7 @@ ALL_PURPOSE	= default_all
  PRE_PURPOSE	= pre_$(PURPOSE)
  PURPOSE		= all
  INCLUDE		= -I$(INCLUDE_DIR) -I$(TCGMSG_DIR)/include
@@ -9,7 +9,7 @@
  
  
  SPICE_TUNE	= -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\"	      \
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ SPARSELIB	= sparse
  # LIBRARIES = ckt cp dev fte hlp inp mfb mfbpc misc ni smp sparse
  LIBRARIES = dev ckt cp fte hlp inp $(MFBLIB) misc ni $(SPARSELIB)
  
diff --git a/cad/cider/files/patch-bk b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd
index cb8ac462ba5f..38df3bb4d350 100644
--- a/cad/cider/files/patch-bk
+++ b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd
@@ -1,6 +1,6 @@
---- cider/common/util/skeleton/make_std.bd.orig	Sun Jan 30 04:31:59 1994
-+++ cider/common/util/skeleton/make_std.bd	Wed Dec 20 22:54:18 2006
-@@ -23,7 +23,7 @@
+--- spice3f5/common/util/skeleton/make_std.bd.orig	1994-01-29 19:16:16 UTC
++++ spice3f5/common/util/skeleton/make_std.bd
+@@ -23,7 +23,7 @@ BUILD_DIR =								      \
  			DIR="$${DIR}"
  
  .c.o:
@@ -9,7 +9,7 @@
  
  bootstrap: always
  	-@if test "x$(DIR)" = "xsrc/"; then				      \
-@@ -110,10 +110,10 @@
+@@ -110,10 +110,10 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
  		cfiles="$(CFILES)";					      \
  		for file in $${cfiles}; do				      \
  		    if test -n "$(INC_SPECIAL)"; then			      \
@@ -22,7 +22,7 @@
  				    ">> ..\..\$(MSC_ERRS)";		      \
  		    fi;							      \
  		done;							      \
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
  	if test -n "$(MODULE_TARGET)"; then				      \
  		cfiles="$(CFILES)";					      \
  		for file in $${cfiles}; do				      \
diff --git a/cad/cider/pkg-descr b/cad/cider/pkg-descr
index 5b99e5a2ca28..bb5355c9e4ba 100644
--- a/cad/cider/pkg-descr
+++ b/cad/cider/pkg-descr
@@ -1,22 +1,17 @@
-CIDER is a mixed-level circuit and device simulator.
-CIDER attempts to provide greater simulation accuracy than a stand-alone
-circuit or device simulator can provide.
-CIDER is based on the sequential mixed-level circuit and
-device simulator, CODECS.  In common with CODECS, CIDER embeds the circuit
-simulator, SPICE3, which provides circuit simulation capabilities,
-analytical models for semiconductor devices, and an interactive
-user interface.  An interface to the captive device simulator, DSIM,
-provides accurate, one- and two-dimensional numerical models
-based on the solution of Poisson's equation, and the electron and hole
-current-continuity equations.  The input format of CIDER couples
-SPICE-like circuit descriptions
-to a device description format similar to the one
+CIDER is a mixed-level circuit and device simulator.  CIDER attempts to
+provide greater simulation accuracy than a stand-alone circuit or device
+simulator can provide.  CIDER is based on the sequential mixed-level 
+circuit and device simulator, CODECS.  In common with CODECS, CIDER embeds
+the circuit simulator, SPICE3, which provides circuit simulation
+capabilities, analytical models for semiconductor devices, and an
+interactive user interface.  An interface to the captive device simulator,
+DSIM, provides accurate, one- and two-dimensional numerical models based
+on the solution of Poisson's equation, and the electron and hole current-
+continuity equations.  The input format of CIDER couples SPICE-like
+circuit descriptions to a device description format similar to the one
 used by the PISCES device simulator developed at Stanford University.
-As a result, CIDER should seem reasonably familiar to designers
-already accustomed to both these tools.
-
-	From the Cider help file.
-
+As a result, CIDER should seem reasonably familiar to designers already
+accustomed to both these tools.
 
 SPICE is a general-purpose circuit simulation program for nonlinear DC,
 nonlinear transient, and linear AC analyses. Circuits may contain resistors,
@@ -26,9 +21,4 @@ lines (two separate implementations), switches, uniform distributed RC
 lines, and the five most common semiconductor devices: diodes, BJTs, JFETs,
 MESFETs, and MOSFETs.
 
-	From the SPICE3 Version3f3 User's Manual.
-	This is available as a postscript document from:
-		ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps
-	or you can read the online documentation on the homepage.
-
 WWW: http://infopad.eecs.berkeley.edu/~icdesign/SPICE/
diff --git a/cad/cider/pkg-plist b/cad/cider/pkg-plist
index 1be8d073e37b..f72e4c6eda27 100644
--- a/cad/cider/pkg-plist
+++ b/cad/cider/pkg-plist
@@ -5,104 +5,109 @@ bin/nutmeg
 bin/proc2mod
 bin/sconvert
 bin/spice3
-share/cider/helpdir/cider.idx
-share/cider/helpdir/cider.txt
-share/cider/helpdir/spice.idx
-share/cider/helpdir/spice.txt
-share/cider/scripts/devaxis
-share/cider/scripts/devload
-share/cider/scripts/spinit
-%%PORTDOCS%%share/examples/cider/bicmos/bicmos.lib
-%%PORTDOCS%%share/examples/cider/bicmos/bicmpd.cir
-%%PORTDOCS%%share/examples/cider/bjt/astable.cir
-%%PORTDOCS%%share/examples/cider/bjt/colposc.cir
-%%PORTDOCS%%share/examples/cider/bjt/ecp.cir
-%%PORTDOCS%%share/examples/cider/bjt/invchain.cir
-%%PORTDOCS%%share/examples/cider/bjt/meclgate.cir
-%%PORTDOCS%%share/examples/cider/bjt/pebjt.lib
-%%PORTDOCS%%share/examples/cider/bjt/pz.cir
-%%PORTDOCS%%share/examples/cider/bjt/rtlinv.cir
-%%PORTDOCS%%share/examples/cider/bjt/vco.cir
-%%PORTDOCS%%share/examples/cider/diode/diode.cir
-%%PORTDOCS%%share/examples/cider/diode/diotran.cir
-%%PORTDOCS%%share/examples/cider/diode/pindiode.cir
-%%PORTDOCS%%share/examples/cider/jfet/jfet.cir
-%%PORTDOCS%%share/examples/cider/mos/bootinv.cir
-%%PORTDOCS%%share/examples/cider/mos/charge.cir
-%%PORTDOCS%%share/examples/cider/mos/cmosinv.cir
-%%PORTDOCS%%share/examples/cider/mos/nmosinv.cir
-%%PORTDOCS%%share/examples/cider/mos/pass.cir
-%%PORTDOCS%%share/examples/cider/mos/ringosc.cir
-%%PORTDOCS%%share/examples/cider/parallel/BICMOS.LIB
-%%PORTDOCS%%share/examples/cider/parallel/bicmpd.cir
-%%PORTDOCS%%share/examples/cider/parallel/bicmpu.cir
-%%PORTDOCS%%share/examples/cider/parallel/clkfeed.cir
-%%PORTDOCS%%share/examples/cider/parallel/cmosamp.cir
-%%PORTDOCS%%share/examples/cider/parallel/eclinv.cir
-%%PORTDOCS%%share/examples/cider/parallel/ecpal.cir
-%%PORTDOCS%%share/examples/cider/parallel/foobar
-%%PORTDOCS%%share/examples/cider/parallel/gmamp.cir
-%%PORTDOCS%%share/examples/cider/parallel/latch.cir
-%%PORTDOCS%%share/examples/cider/parallel/ppef.1d.cir
-%%PORTDOCS%%share/examples/cider/parallel/ppef.2d.cir
-%%PORTDOCS%%share/examples/cider/parallel/readme
-%%PORTDOCS%%share/examples/cider/parallel/ringosc.1u.cir
-%%PORTDOCS%%share/examples/cider/parallel/ringosc.2u.cir
-%%PORTDOCS%%share/examples/cider/readme
-%%PORTDOCS%%share/examples/cider/resistor/gaasres.cir
-%%PORTDOCS%%share/examples/cider/resistor/sires.cir
-%%PORTDOCS%%share/examples/cider/serial/astable.cir
-%%PORTDOCS%%share/examples/cider/serial/charge.cir
-%%PORTDOCS%%share/examples/cider/serial/colposc.cir
-%%PORTDOCS%%share/examples/cider/serial/dbridge.cir
-%%PORTDOCS%%share/examples/cider/serial/invchain.cir
-%%PORTDOCS%%share/examples/cider/serial/meclgate.cir
-%%PORTDOCS%%share/examples/cider/serial/nmosinv.cir
-%%PORTDOCS%%share/examples/cider/serial/pass.cir
-%%PORTDOCS%%share/examples/cider/serial/pullup.cir
-%%PORTDOCS%%share/examples/cider/serial/readme
-%%PORTDOCS%%share/examples/cider/serial/recovery.cir
-%%PORTDOCS%%share/examples/cider/serial/rtlinv.cir
-%%PORTDOCS%%share/examples/cider/serial/vco.cir
-%%PORTDOCS%%share/examples/spice3/bjtnoise.cir
-%%PORTDOCS%%share/examples/spice3/bsim1tst.cir
-%%PORTDOCS%%share/examples/spice3/bsim2tst.cir
-%%PORTDOCS%%share/examples/spice3/diffpair.cir
-%%PORTDOCS%%share/examples/spice3/diodisto.cir
-%%PORTDOCS%%share/examples/spice3/ltra_1.cir
-%%PORTDOCS%%share/examples/spice3/ltra_2.cir
-%%PORTDOCS%%share/examples/spice3/ltra_3.cir
-%%PORTDOCS%%share/examples/spice3/mixdisto.cir
-%%PORTDOCS%%share/examples/spice3/mos6inv.cir
-%%PORTDOCS%%share/examples/spice3/mosamp2.cir
-%%PORTDOCS%%share/examples/spice3/mosmem.cir
-%%PORTDOCS%%share/examples/spice3/pz2.cir
-%%PORTDOCS%%share/examples/spice3/pzt.cir
-%%PORTDOCS%%share/examples/spice3/rc.cir
-%%PORTDOCS%%share/examples/spice3/rca3040.cir
-%%PORTDOCS%%share/examples/spice3/resnoise.cir
-%%PORTDOCS%%share/examples/spice3/rtlinv.cir
-%%PORTDOCS%%share/examples/spice3/schmitt.cir
-%%PORTDOCS%%share/examples/spice3/simplepz.cir
-share/spice3/helpdir/spice.idx
-share/spice3/helpdir/spice.txt
-share/spice3/mfbcap
-share/spice3/news
-share/spice3/scripts/setplot
-share/spice3/scripts/spinit
-@dirrm share/cider/helpdir
-@dirrm share/cider/scripts
+man/man1/sconvert.1.gz
+man/man1/nutmeg.1.gz
+man/man1/spice.1.gz
+man/man1/spice3.1.gz
+man/man1/cider.1.gz
+man/man3/mfb.3.gz
+man/man5/mfbcap.5.gz
+share/cider/cider/helpdir/cider.txt
+share/cider/cider/helpdir/spice.txt
+share/cider/cider/scripts/devaxis
+share/cider/cider/scripts/devload
+share/cider/cider/scripts/spinit
+share/cider/spice3/helpdir/spice.txt
+share/cider/spice3/mfbcap
+share/cider/spice3/news
+share/cider/spice3/scripts/setplot
+share/cider/spice3/scripts/spinit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicmos/bicmos.lib
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicmos/bicmpd.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/astable.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/colposc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/ecp.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/invchain.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/meclgate.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/pebjt.lib
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/pz.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/rtlinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/vco.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/diode.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/diotran.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/pindiode.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jfet/jfet.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/bootinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/charge.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/cmosinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/nmosinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/pass.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/ringosc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/BICMOS.LIB
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/bicmpd.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/bicmpu.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/clkfeed.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/cmosamp.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/eclinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ecpal.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/foobar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/gmamp.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/latch.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ppef.1d.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ppef.2d.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ringosc.1u.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ringosc.2u.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resistor/gaasres.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resistor/sires.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/astable.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/charge.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/colposc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/dbridge.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/invchain.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/meclgate.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/nmosinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/pass.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/pullup.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/recovery.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/rtlinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/vco.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bjtnoise.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bsim1tst.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bsim2tst.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/diffpair.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/diodisto.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_1.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_3.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mixdisto.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mos6inv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mosamp2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mosmem.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/pz2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/pzt.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rca3040.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/resnoise.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rtlinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/schmitt.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/simplepz.cir
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/spice3
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bicmos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bjt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/diode
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/jfet
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/parallel
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/resistor
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/serial
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+@dirrm share/cider/cider/helpdir
+@dirrm share/cider/cider/scripts
+@dirrm share/cider/cider
+@dirrm share/cider/spice3/helpdir
+@dirrm share/cider/spice3/scripts
+@dirrm share/cider/spice3
 @dirrm share/cider
-%%PORTDOCS%%@dirrm share/examples/cider/bicmos
-%%PORTDOCS%%@dirrm share/examples/cider/bjt
-%%PORTDOCS%%@dirrm share/examples/cider/diode
-%%PORTDOCS%%@dirrm share/examples/cider/jfet
-%%PORTDOCS%%@dirrm share/examples/cider/mos
-%%PORTDOCS%%@dirrm share/examples/cider/parallel
-%%PORTDOCS%%@dirrm share/examples/cider/resistor
-%%PORTDOCS%%@dirrm share/examples/cider/serial
-%%PORTDOCS%%@dirrm share/examples/cider
-%%PORTDOCS%%@dirrm share/examples/spice3
-@dirrm share/spice3/helpdir
-@dirrm share/spice3/scripts
-@dirrm share/spice3