Remove expired ports:

2018-06-06 biology/ssaha: Broken for more than 6 months
2018-06-06 biology/crux: Broken for more than 6 months
2018-06-06 biology/ariadne: Broken for more than 6 months
2018-06-06 cad/sceptre: Broken for more than 6 months
2018-06-06 cad/cider: Broken for more than 6 months
2018-06-06 chinese/scim-array: Broken for more than 6 months
2018-06-06 chinese/xpdf: Broken for more than 6 months
2018-06-06 chinese/telnet: Broken for more than 6 months
2018-06-06 comms/java-commapi-freebsd: Depends on BROKEN and expiring comms/java-commapi
2018-06-06 comms/soundmodem: Broken for more than 6 months
2018-06-06 comms/jsdr: Broken for more than 6 months
2018-06-06 comms/java-commapi: Broken for more than 6 months
2018-06-06 converters/pdf2djvu: Broken for more than 6 months
2018-06-06 databases/rdb: Broken for more than 6 months
2018-06-06 databases/animenfo-client: Broken for more than 6 months
2018-06-06 databases/ruby-mysql: Broken for more than 6 months
2018-06-06 databases/riak: Broken for more than 6 months
2018-06-06 databases/animenfo-client-gtk: Broken for more than 6 months
2018-06-06 databases/rdfdb: Broken for more than 6 months
2018-06-06 databases/riak2: Broken for more than 6 months
2018-06-06 devel/subversion-static: Broken for more than 6 months
2018-06-06 japanese/xgate: Broken for more than 6 months
2018-06-06 textproc/opengrm-ngram: Broken for more than 6 months
2018-06-06 textproc/ocaml-tyxml: Depends on BROKEN and expiring www/ocaml-net
2018-06-06 www/ocaml-net: Broken for more than 6 months
2018-06-06 audio/linux-genpuid: Broken for more than 6 months
2018-06-06 x11/enventor: Broken for more than 6 months
2018-06-06 audio/xmms-timidity: Broken for more than 6 months
2018-06-06 audio/kaudiocreator: Broken for more than 6 months
2018-06-06 audio/jxm: Depends on BROKEN and expiring comms/java-commapi
2018-06-06 audio/deforaos-mixer: Broken for more than 6 months
2018-06-06 audio/gkrellmss2: Broken for more than 6 months
2018-06-06 audio/ogg2mp3: Broken for more than 6 months
2018-06-06 audio/abcmidi: Broken for more than 6 months
2018-06-06 benchmarks/netpipe: Broken for more than 6 months
2018-06-06 biology/plink: Broken for more than 6 months

48 files changed, 0 insertions, 1284 deletions

diff --git a/cad/Makefile b/cad/Makefile
index e56df5115311..7d7828ef334b 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -18,7 +18,6 @@
     SUBDIR += calculix-ccx
     SUBDIR += cascade
     SUBDIR += chipvault
-    SUBDIR += cider
     SUBDIR += cura-engine
     SUBDIR += dinotrace
     SUBDIR += dxf2fig
@@ -84,7 +83,6 @@
     SUBDIR += qucs
     SUBDIR += repsnapper
     SUBDIR += rubygem-gdsii
-    SUBDIR += sceptre
     SUBDIR += scotch
     SUBDIR += solvespace
     SUBDIR += sp2sp
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
deleted file mode 100644
index ac84228dba91..000000000000
--- a/cad/cider/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# Created by: AMAKAWA Shuhei <amakawa@jp.FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	cider
-PORTVERSION=	1.b1
-PORTREVISION=	8
-CATEGORIES=	cad
-MASTER_SITES=	LOCAL/mita
-DISTNAME=	cider1b1
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Mixed-level circuit and device simulator (includes SPICE3)
-
-BROKEN=		No public distfiles
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2018-06-06
-BROKEN_aarch64=		fails to link: missing sbrk
-BROKEN_powerpc64=	fails to compile: ccache: cc: FreeBSD: No such file or directory
-
-CONFLICTS=	spice-[0-9]*
-WRKSRC=		${WRKDIR}/sim
-USE_XORG=	xt xaw xmu
-
-OPTIONS_DEFINE=	EXAMPLES
-
-CFLAGS+=	-Wno-return-type
-
-pre-patch:
-	@${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
-	@${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_CMD}) && \
-	    (cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
-
-do-install:
-	@${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
-do-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/spice3
-	${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir \
-		${STAGEDIR}${EXAMPLESDIR}/spice3
-	cd ${WRKSRC}/cider/common/examples && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/cad/cider/distinfo b/cad/cider/distinfo
deleted file mode 100644
index fe2075a37e21..000000000000
--- a/cad/cider/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cider1b1.tar.gz) = 85e8a616bdc1001d763457b16bb2d2fb1dcad1933d892ddd2b419f088f2f514a
-SIZE (cider1b1.tar.gz) = 1821055
diff --git a/cad/cider/files/FreeBSD b/cad/cider/files/FreeBSD
deleted file mode 100644
index 340d05383b42..000000000000
--- a/cad/cider/files/FreeBSD
+++ /dev/null
@@ -1,10 +0,0 @@
-# FreeBSD config exception file
-
-MAKE		= /usr/bin/make
-INTERFACE_OPTS  = -DWANT_X11
-CC_OPT          = $(CFLAGS)
-#CC_OPT_SAFE     = $(CFLAGS) -fno-strength-reduce
-X_DIR		= $(LOCALBASE)
-LDFLAGS		= -L$(LOCALBASE)/lib -lm -ltermcap
-ASM_HACK	= < /dev/null
-SYS_CFLAGS	= -Dbsd
diff --git a/cad/cider/files/Makefile.cider b/cad/cider/files/Makefile.cider
deleted file mode 100644
index 828c8dd37415..000000000000
--- a/cad/cider/files/Makefile.cider
+++ /dev/null
@@ -1,11 +0,0 @@
-all:
-	env CC=${CC} ./util/build FreeBSD
-
-install:
-	./util/build FreeBSD install 
-	chmod ${BINMODE} ${PREFIX}/bin/cider
-	strip ${PREFIX}/bin/cider
-	chmod -R a+rX ${PREFIX}/share/cider
-	${BSD_INSTALL_MAN} doc/cider.1 ${PREFIX}/man/man1
-
-.include <bsd.own.mk>
diff --git a/cad/cider/files/Makefile.spice b/cad/cider/files/Makefile.spice
deleted file mode 100644
index eefca7821762..000000000000
--- a/cad/cider/files/Makefile.spice
+++ /dev/null
@@ -1,19 +0,0 @@
-all:
-	env CC=${CC} ./util/build FreeBSD default
-
-install:
-	./util/build FreeBSD install 
-	chmod ${BINMODE} ${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
-	${BSD_INSTALL_MAN} man/man5/mfbcap.5 ${PREFIX}/man/man5
-	${BSD_INSTALL_MAN} man/man1/sconvert.1 ${PREFIX}/man/man1
-	${BSD_INSTALL_MAN} man/man1/nutmeg.1 ${PREFIX}/man/man1
-	${BSD_INSTALL_MAN} man/man1/spice.1 ${PREFIX}/man/man1
-	${BSD_INSTALL_MAN} man/man3/mfb.3 ${PREFIX}/man/man3
-
-.include <bsd.own.mk>
diff --git a/cad/cider/files/patch-cider1b1_common_conf_defaults b/cad/cider/files/patch-cider1b1_common_conf_defaults
deleted file mode 100644
index 52499018bef4..000000000000
--- a/cad/cider/files/patch-cider1b1_common_conf_defaults
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index d8cfab61e6d6..000000000000
--- a/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 506ea08b4f4d..000000000000
--- a/cad/cider/files/patch-cider1b1_common_lib_makedefs
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 6672ea21f77e..000000000000
--- a/cad/cider/files/patch-cider1b1_common_lib_makeops
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-cider1b1_common_src_bin_main.c b/cad/cider/files/patch-cider1b1_common_src_bin_main.c
deleted file mode 100644
index 86450a4fe302..000000000000
--- a/cad/cider/files/patch-cider1b1_common_src_bin_main.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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"
-+
-+#ifdef __FreeBSD__
-+#include <ieeefp.h>
-+#endif
-+
- #include "suffix.h"
- 
- /* (Virtual) Machine architecture parameters */
-@@ -216,6 +221,10 @@ main(ac, av)
- 
- #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-cider1b1_common_src_bin_makeops b/cad/cider/files/patch-cider1b1_common_src_bin_makeops
deleted file mode 100644
index 1245c2598f2f..000000000000
--- a/cad/cider/files/patch-cider1b1_common_src_bin_makeops
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
- 	mv -f main.o $@
- 
- conf.o: conf.c
--	$(CC) $(CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
- 
- $(TUNEFILE).o: $(TUNEFILE).c
--	$(CC) $(CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
- 
- conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
- 	@echo Creating "$@":
-@@ -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
--	$(CC) -o $@ cider.o conf.o $(TUNEFILE).o $(OBJCDR) \
-+	$(REAL_CC) -o $@ cider.o conf.o $(TUNEFILE).o $(OBJCDR) \
- 	   $(LIBBEFS) $(LIBCDR) $(LIBAFTS) $(LIBTCGMSG) $(LIBX) $(LDFLAGS)
- 
- qcider: qcider.tpl $(SYS_CONF)/$(OBJECTIVE)
diff --git a/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c b/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c
deleted file mode 100644
index 3b3fa012bcd1..000000000000
--- a/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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 );
-+static int MESHspacing( MESHcard *, double *, double *, int *, int *, int * );
- #else
- static int oneSideSpacing();
- static int twoSideSpacing();
- static int maxLimSpacing();
- static int oneSideRatio();
- static int twoSideRatio();
-+static int MESHspacing();
- #endif
- 
- /* END OF HEADER */
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
deleted file mode 100644
index fafddd9d2b3e..000000000000
--- a/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index c6749392c79d..000000000000
--- a/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
deleted file mode 100644
index bc9003453bd8..000000000000
--- a/cad/cider/files/patch-cider1b1_common_util_build
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-cider1b1_common_util_skeleton_make__def.bd b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd
deleted file mode 100644
index 60490c0e7d23..000000000000
--- a/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
--CC		= cc
-+REAL_CC		= $(CC)
- 
- CIDER_TUNE	= -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\"	      \
- 		  -DSCRIPT_DIR=\"$(SCRIPT_DIR)\" -DNEWS_FILE=\"$(NEWS_FILE)\" \
-@@ -76,7 +76,7 @@ SPARSELIB	= sparse
- 
- LIBRARIES	= dev input oned twod spiceitf support
- 
--CFLAGS		= $(REAL_CC_OPT) $(SYS_CFLAGS)
-+REAL_CFLAGS	= $(REAL_CC_OPT) $(SYS_CFLAGS)
- 
- LIBRARY_HACK	= $(OBJLIB_DIR)/$(LIBRARY).a
- 
diff --git a/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd
deleted file mode 100644
index e163e04f43e7..000000000000
--- a/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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:
--	$(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
- 
- bootstrap: always
- 	-@if test "x$(DIR)" = "xsrc/"; then				      \
-@@ -110,10 +110,10 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
- 		cfiles="$(CFILES)";					      \
- 		for file in $${cfiles}; do				      \
- 		    if test -n "$(INC_SPECIAL)"; then			      \
--			    echo "$(CC) /I..\..\include /I..\dev /c $${file}" \
-+			    echo "$(REAL_CC) /I..\..\include /I..\dev /c $${file}" \
- 				    ">> ..\..\$(MSC_ERRS)";		      \
- 		    else						      \
--			    echo "$(CC) /I..\..\include /c $${file}"	      \
-+			    echo "$(REAL_CC) /I..\..\include /c $${file}"	      \
- 				    ">> ..\..\$(MSC_ERRS)";		      \
- 		    fi;							      \
- 		done;							      \
-@@ -123,7 +123,7 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
- 	if test -n "$(MODULE_TARGET)"; then				      \
- 		cfiles="$(CFILES)";					      \
- 		for file in $${cfiles}; do				      \
--		    echo "$(CC) /I..\..\..\include /c" $${file}		      \
-+		    echo "$(REAL_CC) /I..\..\..\include /c" $${file}		      \
- 			    ">> ..\..\..\$(MSC_ERRS)";			      \
- 		done;							      \
- 		echo "lib ..\..\$(LIBRARY)$(NUMBER).lib"		      \
diff --git a/cad/cider/files/patch-spice3f5_common_conf_defaults b/cad/cider/files/patch-spice3f5_common_conf_defaults
deleted file mode 100644
index d02d7db76b57..000000000000
--- a/cad/cider/files/patch-spice3f5_common_conf_defaults
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-spice3f5_common_src_bin_main.c b/cad/cider/files/patch-spice3f5_common_src_bin_main.c
deleted file mode 100644
index a76fac6af175..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_bin_main.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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"
-+
-+#ifdef __FreeBSD__
-+#include <ieeefp.h>
-+#endif
-+
- #include "suffix.h"
- 
- /* (Virtual) Machine architecture parameters */
-@@ -216,6 +221,10 @@ main(ac, av)
- 
- #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-spice3f5_common_src_bin_makeops b/cad/cider/files/patch-spice3f5_common_src_bin_makeops
deleted file mode 100644
index babb11888c86..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_bin_makeops
+++ /dev/null
@@ -1,169 +0,0 @@
---- 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
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
- 	mv -f main.o $@
- 
- bspice.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH $(SRC_DIR)/main.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH $(SRC_DIR)/main.c $(ASM_HACK)
- 	mv -f main.o $@
- 
- cspice.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH -DSPICE2 $(SRC_DIR)/main.c \
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR -DBATCH -DSPICE2 $(SRC_DIR)/main.c \
- 		$(ASM_HACK)
- 	mv -f main.o $@
- 
- nutmeg.o: main.c $(SRC_TOP)/include/patchlev.h $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) -c $(CFLAGS) $(INCLUDE) $(SRC_DIR)/main.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) $(SRC_DIR)/main.c $(ASM_HACK)
- 	mv -f main.o $@
- 
- conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
-@@ -63,7 +63,7 @@ conf.c: config.c $(SYS_CONF)/$(OBJECTIVE
- 	chmod -w "$@"
- 
- cconf.o: $(OBJ_DIR)/cconf.c
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
- 
- bconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
- 	@echo Creating "$@": ; rm -f "$@"
-@@ -73,7 +73,7 @@ bconf.c: config.c $(SYS_CONF)/$(OBJECTIV
- 	chmod -w "$@"
- 
- bconf.o: $(OBJ_DIR)/bconf.c
--	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
-+	$(REAL_CC) -c $(REAL_CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
- 
- cconf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
- 	@echo Creating "$@": ; rm -f "$@"
-@@ -97,13 +97,13 @@ nconf.c: nconfig.c $(SYS_CONF)/$(OBJECTI
- 	chmod -w "$@"
- 
- $(TUNEFILE).o: $(TUNEFILE).c
--	${CC} ${CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
-+	${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
- 
- nconf.o: nconf.c
--	${CC} ${CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
-+	${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
- 
- conf.o: conf.c
--	${CC} ${CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
-+	${REAL_CC} ${REAL_CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
- 
- $(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
- 	@echo "Creating $(TUNEFILE).c";					      \
-@@ -122,14 +122,14 @@ $(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
- 	chmod -w "$@"
- 
- help.o: help.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) $(CFLAGS) $(INTERFACE_OPTS) $(INCX) \
-+	$(REAL_CC) $(REAL_CFLAGS) $(INTERFACE_OPTS) $(INCX) \
- 	-c $(INCLUDE) $(SRC_DIR)/help.c $(ASM_HACK)
- 
- spiced.o: spiced.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) $(CFLAGS) -c $(INCLUDE) $(SRC_DIR)/spiced.c $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/spiced.c $(ASM_HACK)
- 
- multidec.o: multidec.c $(SYS_CONF)/$(OBJECTIVE)-cc
--	$(CC) $(CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
- 
- LIB	= $(OBJLIB_DIR)
- 
-@@ -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
--	$(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS)
-+	$(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS)
- 
- spice3m: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	-@rm -f spice3m
--	$(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
-+	$(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
- 		/users/beorn/malloc.a
- 
- spice3mp: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	-@rm -f spice3mp
--	$(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
-+	$(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
- 		/users/beorn/mprof/libc_mp.a
- 
- spice3mp2: spice3.o $(LIBS) conf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	-@rm -f spice3mp
--	$(CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
-+	$(REAL_CC) -o $@ spice3.o conf.o $(TUNEFILE).o $(LIBS) $(LIBX) $(LDFLAGS) \
- 		/users/beorn/libc_mp.a
- 
- LIBB	= $(LIB)/fte.a $(LIB)/cp.a $(LIB)/dev.a $(LIB)/ckt.a \
- 	$(LIB)/inp.a $(LIB)/ni.a $(LIB)/$(SPARSELIB).a $(LIB)/misc.a
- bspice: bspice.o $(LIBB) bconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f bspice
--	$(CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS)
-+	$(REAL_CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS)
- 
- bspicem: bspice.o $(LIBB) bconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f bspice
--	$(CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS) \
-+	$(REAL_CC) -o $@ bspice.o bconf.o $(TUNEFILE).o $(LIBB) $(LDFLAGS) \
- 		/users/beorn/malloc.a
- 
- LIBC	= $(LIB)/fte.a $(LIB)/cp.a $(LIB)/dev.a $(LIB)/ckt.a \
- 	$(LIB)/inp.a $(LIB)/ni.a $(LIB)/$(SPARSELIB).a $(LIB)/misc.a
- cspice: cspice.o $(LIBC) cconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f cspice
--	$(CC) -o $@ cspice.o cconf.o $(TUNEFILE).o $(LIBC) $(LDFLAGS)
-+	$(REAL_CC) -o $@ cspice.o cconf.o $(TUNEFILE).o $(LIBC) $(LDFLAGS)
- 
- LIBN	= $(LIB)/fte.a $(LIB)/cp.a $(LIB)/hlp.a  $(LIB)/mfb.a $(LIB)/misc.a   \
- 	$(LIBTCGMSG)
- nutmeg:	nutmeg.o $(LIBN) nconf.o $(TUNEFILE).o $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f nutmeg
--	$(CC) -o $@ nutmeg.o nconf.o $(TUNEFILE).o $(LIBN) $(LIBX) $(LDFLAGS)
-+	$(REAL_CC) -o $@ nutmeg.o nconf.o $(TUNEFILE).o $(LIBN) $(LIBX) $(LDFLAGS)
- 
- # 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 @@ 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
--	$(CC) -o $@ sconvert.o $(SCFILES) $(LIBSC) $(LDFLAGS)
-+	$(REAL_CC) -o $@ sconvert.o $(SCFILES) $(LIBSC) $(LDFLAGS)
- 
- LIBP2M	= $(LIB)/cp.a $(LIB)/inp.a $(LIB)/misc.a
- proc2mod: proc2mod.o $(LIBP2M) $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f proc2mod
--	$(CC) -o $@ proc2mod.o $(LIBP2M) $(LDFLAGS)
-+	$(REAL_CC) -o $@ proc2mod.o $(LIBP2M) $(LDFLAGS)
- 
- LIBH	= $(LIB)/hlp.a $(LIB)/cp.a $(LIB)/misc.a
- help: help.o $(LIBH) $(TUNEFILE).o
- 	@-rm -f help
--	$(CC) -o $@ help.o $(LIBH) $(LIBX) $(LDFLAGS) $(TUNEFILE).o
-+	$(REAL_CC) -o $@ help.o $(LIBH) $(LIBX) $(LDFLAGS) $(TUNEFILE).o
- 
- makeidx: makeidx.o $(LIB)/misc.a
- 	@-rm -f makeidx
--	$(CC) -o $@ makeidx.o $(LIB)/misc.a
-+	$(REAL_CC) -o $@ makeidx.o $(LIB)/misc.a
- 
- LIBSD	= $(LIB)/misc.a
- spiced: spiced.o $(LIBSD) $(TUNEFILE).o
- 	@-rm -f spiced
--	$(CC) -o $@ spiced.o $(LIBSD) $(TUNEFILE).o
-+	$(REAL_CC) -o $@ spiced.o $(LIBSD) $(TUNEFILE).o
- 
- LIBMD	= $(LIB)/sparse.a $(LIB)/misc.a
- multidec: multidec.o $(LIBMD) $(SYS_CONF)/$(OBJECTIVE)-ld
- 	@-rm -f $@
--	$(CC) -o $@ multidec.o $(LIBMD) $(LDFLAGS) $(GETOPTLIB)
-+	$(REAL_CC) -o $@ multidec.o $(LIBMD) $(LDFLAGS) $(GETOPTLIB)
diff --git a/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c b/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c
deleted file mode 100644
index bded4326dc00..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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-spice3f5_common_src_include_misc.h b/cad/cider/files/patch-spice3f5_common_src_include_misc.h
deleted file mode 100644
index 9bff43951a37..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_include_misc.h
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #define BSIZE_SP      512
- 
- #ifdef HAS_EXIT1
-@@ -81,12 +85,16 @@ extern void srandom();
- #    define srandom	srand
- #  endif
- 
-+/*
- extern char *calloc();
- extern char *malloc();
-+*/
- extern char *realloc();
- extern char *getenv();
- extern int errno;
-+#if !(defined(BSD) && (BSD >= 199306))
- extern char *sys_errlist[];
-+#endif
- extern char *getenv();
- extern char *getwd();
- extern int rand();
-@@ -109,12 +117,14 @@ extern void clearerr();
- #    endif /* clearerr */
- #  endif /* HAS_CLEARERR */
- 
-+#if !(defined(BSD) && (BSD >= 199306))
- #  ifndef bzero
- extern int bzero();
- #  endif
- #  ifndef bcopy
- extern void bcopy();
- #  endif
-+#endif
- 
- #  ifndef index
- #    ifdef HAS_INDEX
diff --git a/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h b/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h
deleted file mode 100644
index 1132447c5f6f..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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
-  */
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #include "os_unix.h"
- 
-+#if !(defined(BSD) && (BSD >= 199306))
- #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_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_INDEX		/* index( ) instead of strchr( )	*/
- #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
- #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
-+#ifdef __FreeBSD__
-+#define HAS_POSIXTTY		/* <termios.h>				*/
-+#else
- #define HAS_BSDTTY		/* <sgtty.h>				*/
-+#endif
- #define HAS_BSDDIRS		/* <sys/dir.h>				*/
- #define HAS_BSDRUSAGE		/* getrusage( )				*/
- #define HAS_BSDRLIMIT		/* getrlimit( )				*/
- #define HAS_DUP2
- #define HAS_GETWD		/* getwd(buf)				*/
--#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
-+
-+#if (defined(BSD) && (BSD >= 199306))
-+#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( )	*/
-+#define HAS_INTWAITSTATUS	/* wait(3)  takes an int *, not a union */
-+#undef HAS_UNIX_SEGMENT_HACK
-+#endif
diff --git a/cad/cider/files/patch-spice3f5_common_src_include_util.h b/cad/cider/files/patch-spice3f5_common_src_include_util.h
deleted file mode 100644
index 9daa1866f9c8..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_include_util.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- /* #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 @@ Author: 1985 Thomas L. Quarles
- #include <stdlib.h>
- #endif
- #else
-+/*
- extern char *malloc();
- extern char *calloc();
-+*/
- extern char *realloc();
- extern void free();
- #endif
-@@ -44,8 +50,10 @@ double fabs();
- #endif
- 
- /* XXX Move these into the above ifdef someday */
-+#if !(defined(BSD) && (BSD >= 199306))
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
- #define SIGN(a,b) ( b >= 0 ? (a >= 0 ? a : - a) : (a >= 0 ? - a : a))
- 
- #define ABORT() fflush(stderr);fflush(stdout);abort();
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c b/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c
deleted file mode 100644
index 344fbe07a041..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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) {
--	(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
-+    	tcgetattr(fileno(cp_in), &OS_Buf);
- 	sbuf = OS_Buf;
- 	sbuf.c_cc[VEOF] = 0;
- 	sbuf.c_cc[VEOL] = ESCAPE;
- 	sbuf.c_cc[VEOL2] = CNTRL_D;
--	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
-+    	tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf);
-     } else {
--	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
-+    	tcsetattr(fileno(cp_in), TCSANOW, &OS_Buf);
-     }
- 
- #  endif
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c
deleted file mode 100644
index 08e221e78837..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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"
-+#include "util.h"
- 
- #define POLYGONBUFSIZE 512
- /* XXX */
-@@ -33,8 +34,10 @@ Author: 1982 Giles Billingsley
-                          c |= CODEMAXY;
- 
- /* XXX */
-+/* Defined in "util.h".
- #define MAX(a, b) (((a) > (b)) ? (a) : (b))
- #define MIN(a, b) (((a) < (b)) ? (a) : (b))
-+*/
- #define SWAPINT(a, b) { int xxxx = (a); (a) = (b); (b) = xxxx; }
- 
- /* clip_line will clip a line to a rectangular area.  The returned
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
deleted file mode 100644
index 74ab3fce7d93..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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-spice3f5_common_src_lib_fte_graf.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c
deleted file mode 100644
index b7b1793e8340..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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();
- 
-+static int drawlegend();
-+static int gr_resize_internal();
-+
- #define XFACTOR 2       /* How much to expand the X scale during iplot. */
- #define YFACTOR 1.5     /* How much to expand the Y scale during iplot. */
- 
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c
deleted file mode 100644
index 09edb3596886..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
- 
-+static int drawlingrid();
-+static int drawloggrid();
-+
- static double *lingrid(), *loggrid();
- static void polargrid(), smithgrid();
- static void drawpolargrid( );
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
deleted file mode 100644
index bd2e7cc0de86..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-spice3f5_common_src_lib_fte_makedefs b/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs
deleted file mode 100644
index 3fa2aa8a0e20..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
--CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
-+REAL_CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
- CONF_DEP_EXTRA	= $(CONF_XCC)
- agraf.o: agraf.c
- arg.o: arg.c
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c
deleted file mode 100644
index 4496a7f75f18..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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))
- 
-+static int initlinestyles();
-+static int initcolors();
-+static int X_ScreentoData();
-+
- static void linear_arc( );
- static Display *display;
- static GC xorgc;
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs
deleted file mode 100644
index 5212175d90dd..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
--CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
-+REAL_CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
- CONF_DEP_EXTRA	= $(CONF_XCC)
- help.o: help.c
- provide.o: provide.c
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c
deleted file mode 100644
index 904728e090e0..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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();
--extern void sortlist(), tlfree();
--extern int sortcmp();
-+static void sortlist(), tlfree();
-+static int sortcmp();
- 
- static topic *alltopics = NULL;
- 
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c b/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c
deleted file mode 100644
index 300b6a359ee8..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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();
--char   *MFBSkip();
-+static char   *MFBSkip();
- char   *MFBGetStr();
--char   *MFBCapDecod();
-+static char   *MFBCapDecod();
- int    MFBGetNum();
- int    MFBGetFlag();
- int    MFBGetEnt();
diff --git a/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h b/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h
deleted file mode 100644
index 3533217e0ac6..000000000000
--- a/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 */
- /* Macro functions that return the maximum or minimum independent of type. */
-+#if !(defined(BSD) && (BSD >= 199306))
- #define  MAX(a,b)           ((a) > (b) ? (a) : (b))
- #define  MIN(a,b)           ((a) < (b) ? (a) : (b))
-+#endif
- 
- /* Macro function that returns the absolute value of a floating point number. */
- #define  ABS(a)             ((a) < 0 ? -(a) : (a))
diff --git a/cad/cider/files/patch-spice3f5_common_util_build b/cad/cider/files/patch-spice3f5_common_util_build
deleted file mode 100644
index 2be89831b1cb..000000000000
--- a/cad/cider/files/patch-spice3f5_common_util_build
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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$$"
--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=
-@@ -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 -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-spice3f5_common_util_makelib.sh b/cad/cider/files/patch-spice3f5_common_util_makelib.sh
deleted file mode 100644
index fca161cdc303..000000000000
--- a/cad/cider/files/patch-spice3f5_common_util_makelib.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
--CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
-+REAL_CFLAGS		= $(CC_OPT) $(SYS_CFLAGS) $(INTERFACE_OPTS)
- CONF_DEP_EXTRA	= $(CONF_XCC)
- ENDOFMAKEDEFSX
- 		fi
diff --git a/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd
deleted file mode 100644
index 3f724d25e2db..000000000000
--- a/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
--CC		= cc
-+REAL_CC		= $(CC)
- 
- 
- SPICE_TUNE	= -DBUG_ADDR=\"$(BUG_ADDR)\" -DHELP_DIR=\"$(HELP_DIR)\"	      \
-@@ -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)
- 
--CFLAGS		= $(REAL_CC_OPT) $(SYS_CFLAGS)
-+REAL_CFLAGS		= $(REAL_CC_OPT) $(SYS_CFLAGS)
- 
- LIBRARY_HACK	= $(OBJLIB_DIR)/$(LIBRARY).a
- 
diff --git a/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd b/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd
deleted file mode 100644
index 38df3bb4d350..000000000000
--- a/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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:
--	$(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
-+	$(REAL_CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
- 
- bootstrap: always
- 	-@if test "x$(DIR)" = "xsrc/"; then				      \
-@@ -110,10 +110,10 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
- 		cfiles="$(CFILES)";					      \
- 		for file in $${cfiles}; do				      \
- 		    if test -n "$(INC_SPECIAL)"; then			      \
--			    echo "$(CC) /I..\..\include /I..\dev /c $${file}" \
-+			    echo "$(REAL_CC) /I..\..\include /I..\dev /c $${file}" \
- 				    ">> ..\..\$(MSC_ERRS)";		      \
- 		    else						      \
--			    echo "$(CC) /I..\..\include /c $${file}"	      \
-+			    echo "$(REAL_CC) /I..\..\include /c $${file}"	      \
- 				    ">> ..\..\$(MSC_ERRS)";		      \
- 		    fi;							      \
- 		done;							      \
-@@ -123,7 +123,7 @@ $(MSC_EXEC_FILE): makedefs $(SKELETON_DI
- 	if test -n "$(MODULE_TARGET)"; then				      \
- 		cfiles="$(CFILES)";					      \
- 		for file in $${cfiles}; do				      \
--		    echo "$(CC) /I..\..\..\include /c" $${file}		      \
-+		    echo "$(REAL_CC) /I..\..\..\include /c" $${file}		      \
- 			    ">> ..\..\..\$(MSC_ERRS)";			      \
- 		done;							      \
- 		echo "lib ..\..\$(LIBRARY)$(NUMBER).lib"		      \
diff --git a/cad/cider/pkg-descr b/cad/cider/pkg-descr
deleted file mode 100644
index d3cd59f7521e..000000000000
--- a/cad/cider/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-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.
-
-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
-lines (two separate implementations), switches, uniform distributed RC
-lines, and the five most common semiconductor devices: diodes, BJTs, JFETs,
-MESFETs, and MOSFETs.
-
-WWW: http://infopad.eecs.berkeley.edu/~icdesign/SPICE/
diff --git a/cad/cider/pkg-plist b/cad/cider/pkg-plist
deleted file mode 100644
index 2c29816ac6dc..000000000000
--- a/cad/cider/pkg-plist
+++ /dev/null
@@ -1,96 +0,0 @@
-bin/cider
-bin/help
-bin/multidec
-bin/nutmeg
-bin/proc2mod
-bin/sconvert
-bin/spice3
-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
diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
deleted file mode 100644
index ab64aa660347..000000000000
--- a/cad/sceptre/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: grog
-# $FreeBSD$
-
-PORTNAME=	sceptre
-PORTVERSION=	2012.061
-PORTREVISION=	7
-CATEGORIES=	cad
-MASTER_SITES=	http://alpha.fh-friedberg.de/iem/fileadmin/user_upload/novender/sceptre/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	General-purpose circuit analysis program
-
-LICENSE=	GPLv2
-
-BROKEN=		No public distfiles
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2018-06-06
-USES=		fortran
-
-MAKE_JOBS_UNSAFE=	yes
-NO_WRKSUBDIR=		yes
-
-FFLAGS+=	-fno-automatic
-PORTDOCS=	doc_en.pdf doc_ger.pdf install.pdf
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e '/^(FC|FFLAGS)[[:blank:]]*=/d' \
-		-e 's!/usr/local!${PREFIX}!' \
-		-e '/install.*BINDIR/{ s/install -s.*755/${INSTALL_PROGRAM}/ ; \
-			s/install -m.*755/${INSTALL_SCRIPT}/ ; }' \
-		-e '/install.*(ETCDIR|LIBDIR)/{ /install -d/d ; \
-			s/install.*644/${INSTALL_DATA}/ ; }' \
-				${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -E \
-		-e '/^(FC|FFLAGS)[[:blank:]]*=/d' \
-		-e 's!ar rv!${AR} ${ARFLAGS}!' \
-		-e 's!ranlib!${RANLIB}!' \
-				${WRKSRC}/x[123]/Makefile
-	@${REINPLACE_CMD} \
-		-e 's!/usr/local!${PREFIX}!' \
-				${WRKSRC}/bin/ngp \
-				${WRKSRC}/bin/sceptre.inst
-	@${REINPLACE_CMD} -E \
-		-e 's!/usr/local!${PREFIX}!' \
-		-e "s!^(FC=')(.*)(')!\1${FC} ${FFLAGS}\3!" \
-				${WRKSRC}/bin/sceptre
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/install.pdf ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc ; ${INSTALL_DATA} ${PORTDOCS:Mdoc_*} ${STAGEDIR}${DOCSDIR}
-
-do-test:
-	cd ${WRKSRC}/samples; for s in ${WRKSRC}/samples/*.d; do \
-		${WRKSRC}/bin/sceptre $${s%.d}; \
-	done
-
-.include <bsd.port.mk>
diff --git a/cad/sceptre/distinfo b/cad/sceptre/distinfo
deleted file mode 100644
index 6c9557f85467..000000000000
--- a/cad/sceptre/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (sceptre-2012.061.tar.gz) = 6ca602bab7e63c84747f243f72e02dc4bac1e0491cedca192e1a1c365349ae61
-SIZE (sceptre-2012.061.tar.gz) = 1190280
diff --git a/cad/sceptre/files/patch-Makefile b/cad/sceptre/files/patch-Makefile
deleted file mode 100644
index 01015e9cfba3..000000000000
--- a/cad/sceptre/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	2014-08-14 16:40:12.245403240 +0800
-+++ Makefile	2014-08-14 16:40:52.823402660 +0800
-@@ -35,19 +35,19 @@ all: 
- 	cd x1;  ${MAKE} "FC=${FC}" "FFLAGS=${FFLAGS}" 
- 	cd x2;  ${MAKE} "FC=${FC}" "FFLAGS=${FFLAGS}" 
- install:
--	install -s -m 755 x1/exec1          ${BINDIR}
--	install -m 644    x2/exec2.o        ${LIBDIR}
--	install -m 644    x2/libx2.a        ${LIBDIR}
--	install -s -m 755 x3/ngp_gnu        ${BINDIR}
--	install -s -m 755 x3/asa            ${BINDIR}
--	install -m 644    x3/libx3.a        ${LIBDIR}
--	install -m 755    bin/sceptre       ${BINDIR}
--	install -m 755    bin/sceptre.inst  ${BINDIR}
--	install -m 755    bin/ngp           ${BINDIR}
--	install -m 644    lib/usrlib.a      ${LIBDIR}
--	install -m 644    lib/modellib.dat  ${LIBDIR}
--	install -d 			    ${ETCDIR}
--	install -m 644    etc/ngp.rc        ${ETCDIR}
-+	install -s -m 755 x1/exec1          $(DESTDIR)${BINDIR}
-+	install -m 644    x2/exec2.o        $(DESTDIR)${LIBDIR}
-+	install -m 644    x2/libx2.a        $(DESTDIR)${LIBDIR}
-+	install -s -m 755 x3/ngp_gnu        $(DESTDIR)${BINDIR}
-+	install -s -m 755 x3/asa            $(DESTDIR)${BINDIR}
-+	install -m 644    x3/libx3.a        $(DESTDIR)${LIBDIR}
-+	install -m 755    bin/sceptre       $(DESTDIR)${BINDIR}
-+	install -m 755    bin/sceptre.inst  $(DESTDIR)${BINDIR}
-+	install -m 755    bin/ngp           $(DESTDIR)${BINDIR}
-+	install -m 644    lib/usrlib.a      $(DESTDIR)${LIBDIR}
-+	install -m 644    lib/modellib.dat  $(DESTDIR)${LIBDIR}
-+	install -d 			    $(DESTDIR)${ETCDIR}
-+	install -m 644    etc/ngp.rc        $(DESTDIR)${ETCDIR}
- 	@echo "installation finished"
- uninstall:
- 	@rm -fv ${BINDIR}/exec1 
diff --git a/cad/sceptre/pkg-descr b/cad/sceptre/pkg-descr
deleted file mode 100644
index 691f5a6def38..000000000000
--- a/cad/sceptre/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-SCEPTRE (System for Circuit Evaluation and Prediction of Transient
-Radiation Effects) is a general purpose circuit analysis program which
-provides all three major analyses, AC, DC, and transient analysis, on
-either linear or nonlinear networks.  It employs a free-form input
-language and state variable methods to simulate problems of interest
-to electrical engineers.
-
-WWW: http://alpha.fh-friedberg.de/iem/84.html
diff --git a/cad/sceptre/pkg-plist b/cad/sceptre/pkg-plist
deleted file mode 100644
index 2b6afe0cd3ac..000000000000
--- a/cad/sceptre/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/exec1
-bin/ngp_gnu
-bin/asa
-bin/sceptre
-bin/sceptre.inst
-bin/ngp
-etc/ngp.rc
-lib/exec2.o
-lib/libx2.a
-lib/libx3.a
-lib/usrlib.a
-lib/modellib.dat