* Do not set NO_WRKSUBDIR to yes. Specify WRKSRC.

* Respect CFLAGS.
* Make less use of __FreeBSD__.
* Use more system-defined make variables.

PR:		15746
Submitted by:	maintainer

33 files changed, 385 insertions, 134 deletions

diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index a86c3da5e6d4..d4ee86e02908 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -14,24 +14,40 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	amakawa@jp.FreeBSD.org
 
+WRKSRC=		${WRKDIR}/sim
 USE_XLIB=	yes
-NO_WRKSUBDIR=	yes
 MAN1=		sconvert.1 nutmeg.1 spice.1 cider.1
 MAN3=		mfb.3
 MAN5=		mfbcap.5
 MLINKS=		spice.1 spice3.1
 
 pre-patch:
-	${CP} -f ${WRKSRC}/sim/spice/common/lib/helpdir/spice.txt ${WRKSRC}/sim/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 ${WRKSRC}/spice/common/util/makelib.sh ${WRKSRC}/cider/common/util
+	@${LN} -fs ${WRKSRC}/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})
+
+do-install:
+	@(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE} install)
+	@(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE} install)
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/spice3
-	${INSTALL_DATA} ${WRKSRC}/sim/spice/common/examples/*.cir ${PREFIX}/share/examples/spice3
-	${MKDIR} ${PREFIX}/share/examples/cider
-	${TAR} -cf - -C ${WRKSRC}/sim/cider/common/examples . | ${TAR} -xf - -C ${PREFIX}/share/examples/cider
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/cider
-	${LN} -fs ${PREFIX}/share/spice3/scripts/spinit ${PREFIX}/share/cider/scripts
+	@${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
+	@${LN} -fs ${PREFIX}/share/spice3/scripts/spinit ${PREFIX}/share/cider/scripts
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/cider/files/FreeBSD b/cad/cider/files/FreeBSD
index b45d347e1da1..f23cb4143148 100644
--- a/cad/cider/files/FreeBSD
+++ b/cad/cider/files/FreeBSD
@@ -2,9 +2,9 @@
 
 MAKE		= /usr/bin/make
 INTERFACE_OPTS  = -DWANT_X11
-CC_OPT          = -O2 -DHAS_GNUREADLINE -pipe
-CC_OPT_SAFE     = -O -DHAS_GNUREADLINE -pipe
+CC_OPT          = $(CFLAGS)
+#CC_OPT_SAFE     = $(CFLAGS) -fno-strength-reduce
 X_DIR		= $(X11BASE)
 LDFLAGS		= -L$(X11BASE)/lib -lreadline -lm -ltermcap
 ASM_HACK	= < /dev/null
-SYS_CFLAGS	= -Dbsd
+SYS_CFLAGS	= -Dbsd -DHAS_GNUREADLINE
diff --git a/cad/cider/files/Makefile.cider b/cad/cider/files/Makefile.cider
index 626c42d0e6d0..aeca60a64e66 100644
--- a/cad/cider/files/Makefile.cider
+++ b/cad/cider/files/Makefile.cider
@@ -3,7 +3,9 @@ all:
 
 install:
 	./util/build FreeBSD install 
-	chmod a+rx ${PREFIX}/bin/cider
+	chmod ${BINMODE} ${PREFIX}/bin/cider
 	strip ${PREFIX}/bin/cider
 	chmod -R a+rX ${PREFIX}/share/cider
-	install -c -m 644 -o bin -g bin doc/cider.1 ${PREFIX}/man/man1/cider.1
+	${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
index 5950acb118b7..d980ba226e66 100644
--- a/cad/cider/files/Makefile.spice
+++ b/cad/cider/files/Makefile.spice
@@ -3,15 +3,17 @@ all:
 
 install:
 	./util/build FreeBSD install 
-	chmod a+rx ${PREFIX}/bin/spice3 ${PREFIX}/bin/nutmeg \
+	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
-	install -c -m 644 -o bin -g bin man/man5/mfbcap.5 ${PREFIX}/man/man5/mfbcap.5
-	install -c -m 644 -o bin -g bin man/man1/sconvert.1 ${PREFIX}/man/man1/sconvert.1
-	install -c -m 644 -o bin -g bin man/man1/nutmeg.1 ${PREFIX}/man/man1/nutmeg.1
-	install -c -m 644 -o bin -g bin man/man1/spice.1 ${PREFIX}/man/man1/spice.1
-	install -c -m 644 -o bin -g bin man/man3/mfb.3 ${PREFIX}/man/man3/mfb.3
+	${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-aa b/cad/cider/files/patch-aa
index 50b2c4222641..8ed1dea755de 100644
--- a/cad/cider/files/patch-aa
+++ b/cad/cider/files/patch-aa
@@ -1,5 +1,5 @@
-*** sim/spice/common/conf/defaults.orig	Sat Jan 29 19:15:53 1994
---- sim/spice/common/conf/defaults	Sun Dec 12 14:40:09 1999
+*** 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
@@ -27,8 +27,8 @@
   S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
   
   #	INSTALL_DIRS lists the directories that need to be created before
-*** sim/spice/common/util/build.orig	Sat Jan 29 19:16:26 1994
---- sim/spice/common/util/build	Sun Dec 12 14:38:33 1999
+*** spice/common/util/build.orig	Sat Jan 29 19:16:26 1994
+--- spice/common/util/build	Sun Dec 12 14:38:33 1999
 ***************
 *** 96,102 ****
   
diff --git a/cad/cider/files/patch-ab b/cad/cider/files/patch-ab
index 9c6425754efb..f3f2012cc8ac 100644
--- a/cad/cider/files/patch-ab
+++ b/cad/cider/files/patch-ab
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/fte/resource.c.orig	Sat Jan 29 18:48:28 1994
---- sim/spice/common/src/lib/fte/resource.c	Sun Dec 12 14:38:33 1999
+*** spice/common/src/lib/fte/resource.c.orig	Sat Jan 29 18:48:28 1994
+--- spice/common/src/lib/fte/resource.c	Sun Dec 12 14:38:33 1999
 ***************
 *** 370,376 ****
 --- 370,378 ----
@@ -12,84 +12,3 @@
   		return 0;
   
   	low = 0;
-*** sim/spice/common/src/include/misc.h.orig	Sat Jan 29 19:14:17 1994
---- sim/spice/common/src/include/misc.h	Sun Dec 12 14:38:33 1999
-***************
-*** 86,92 ****
---- 86,94 ----
-  extern char *realloc();
-  extern char *getenv();
-  extern int errno;
-+ #ifndef __FreeBSD__
-  extern char *sys_errlist[];
-+ #endif
-  extern char *getenv();
-  extern char *getwd();
-  extern int rand();
-***************
-*** 109,120 ****
---- 111,124 ----
-  #    endif /* clearerr */
-  #  endif /* HAS_CLEARERR */
-  
-+ #ifndef __FreeBSD__
-  #  ifndef bzero
-  extern int bzero();
-  #  endif
-  #  ifndef bcopy
-  extern void bcopy();
-  #  endif
-+ #endif /* __FreeBSD__ */
-  
-  #  ifndef index
-  #    ifdef HAS_INDEX
-*** sim/spice/common/src/include/os_bsd.h.orig	Sat Jan 29 19:14:37 1994
---- sim/spice/common/src/include/os_bsd.h	Sun Dec 12 14:38:33 1999
-***************
-*** 8,19 ****
-  
-  #include "os_unix.h"
-  
-  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
-- #define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
-  #define HAS_FTIME		/* ftime( ), <times.h>			*/
-  #define HAS_TERMCAP		/* tgetxxx( )				*/
-  #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
-- #define HAS_INDEX		/* index( ) instead of strchr( )	*/
-  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
-  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
-  #define HAS_BSDTTY		/* <sgtty.h>				*/
---- 8,23 ----
-  
-  #include "os_unix.h"
-  
-+ #ifndef __FreeBSD__
-  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
-  #define HAS_FTIME		/* ftime( ), <times.h>			*/
-+ #define HAS_INDEX		/* index( ) instead of strchr( )	*/
-+ #define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
-+ #endif
-+ 
-+ #define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
-  #define HAS_TERMCAP		/* tgetxxx( )				*/
-  #define HAS_VFORK		/* BSD-ism, should not be necessary	*/
-  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
-  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
-  #define HAS_BSDTTY		/* <sgtty.h>				*/
-***************
-*** 22,25 ****
-  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
-  #define HAS_DUP2
-  #define HAS_GETWD		/* getwd(buf)				*/
-! #define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
---- 26,35 ----
-  #define HAS_BSDRLIMIT		/* getrlimit( )				*/
-  #define HAS_DUP2
-  #define HAS_GETWD		/* getwd(buf)				*/
-! 
-! #ifdef __FreeBSD__
-! #define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
-! #define HAS_BSDTIME		/* gettimeofday( ) return time		*/
-! #define HAS_FLOAT_H		/* float.h				*/
-! #define HAS_STRCHR		/* strchr( ) instead of index( )	*/
-! #endif
diff --git a/cad/cider/files/patch-ac b/cad/cider/files/patch-ac
index def5c2a4c29a..f9e164ca93c2 100644
--- a/cad/cider/files/patch-ac
+++ b/cad/cider/files/patch-ac
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/bin/sconvert.c.orig	Sat Jan 29 19:12:56 1994
---- sim/spice/common/src/bin/sconvert.c	Sun Dec 12 14:49:36 1999
+*** 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 ****
   
@@ -41,8 +41,8 @@
               t = buf[0];
               break;
           default:
-*** sim/spice/common/src/lib/fte/inp.c.orig	Sat Jan 29 18:48:10 1994
---- sim/spice/common/src/lib/fte/inp.c	Sun Dec 12 14:49:36 1999
+*** 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 ****
   
diff --git a/cad/cider/files/patch-ad b/cad/cider/files/patch-ad
index b4d98734600a..84164a6a64d8 100644
--- a/cad/cider/files/patch-ad
+++ b/cad/cider/files/patch-ad
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/bin/main.c.orig	Sat Mar 12 08:22:28 1994
---- sim/spice/common/src/bin/main.c	Sun Dec 12 14:58:04 1999
+*** spice/common/src/bin/main.c.orig	Sat Mar 12 08:22:28 1994
+--- spice/common/src/bin/main.c	Sun Dec 12 14:58:04 1999
 ***************
 *** 25,30 ****
 --- 25,37 ----
diff --git a/cad/cider/files/patch-ae b/cad/cider/files/patch-ae
index d5da1a1cc268..7969e0cf8ca9 100644
--- a/cad/cider/files/patch-ae
+++ b/cad/cider/files/patch-ae
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/cp/history.c.orig	Sat Jan 29 18:44:09 1994
---- sim/spice/common/src/lib/cp/history.c	Sun Dec 12 14:56:43 1999
+*** spice/common/src/lib/cp/history.c.orig	Sat Jan 29 18:44:09 1994
+--- spice/common/src/lib/cp/history.c	Sun Dec 12 14:56:43 1999
 ***************
 *** 11,16 ****
 --- 11,24 ----
diff --git a/cad/cider/files/patch-af b/cad/cider/files/patch-af
index 51654a8c7854..6f736feab5cb 100644
--- a/cad/cider/files/patch-af
+++ b/cad/cider/files/patch-af
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/fte/misccoms.c.orig	Wed Mar  9 04:15:44 1994
---- sim/spice/common/src/lib/fte/misccoms.c	Sun Dec 12 14:56:44 1999
+*** spice/common/src/lib/fte/misccoms.c.orig	Wed Mar  9 04:15:44 1994
+--- spice/common/src/lib/fte/misccoms.c	Sun Dec 12 14:56:44 1999
 ***************
 *** 11,16 ****
 --- 11,24 ----
diff --git a/cad/cider/files/patch-ag b/cad/cider/files/patch-ag
index ad93c6ab991a..9dfb4b374c0e 100644
--- a/cad/cider/files/patch-ag
+++ b/cad/cider/files/patch-ag
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/fte/signal.c.orig	Sat Jan 29 18:48:38 1994
---- sim/spice/common/src/lib/fte/signal.c	Sun Dec 12 14:56:46 1999
+*** spice/common/src/lib/fte/signal.c.orig	Sat Jan 29 18:48:38 1994
+--- spice/common/src/lib/fte/signal.c	Sun Dec 12 14:56:46 1999
 ***************
 *** 32,37 ****
 --- 32,39 ----
diff --git a/cad/cider/files/patch-ah b/cad/cider/files/patch-ah
index ff987746312b..ae6d04ea0d57 100644
--- a/cad/cider/files/patch-ah
+++ b/cad/cider/files/patch-ah
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/fte/x10.c.orig	Sat Jan 29 18:47:11 1994
---- sim/spice/common/src/lib/fte/x10.c	Sun Dec 12 14:56:48 1999
+*** spice/common/src/lib/fte/x10.c.orig	Sat Jan 29 18:47:11 1994
+--- spice/common/src/lib/fte/x10.c	Sun Dec 12 14:56:48 1999
 ***************
 *** 726,737 ****
 --- 726,740 ----
diff --git a/cad/cider/files/patch-ai b/cad/cider/files/patch-ai
index 7e3155bc071c..d763d5e78951 100644
--- a/cad/cider/files/patch-ai
+++ b/cad/cider/files/patch-ai
@@ -1,5 +1,5 @@
-*** sim/spice/common/src/lib/fte/x11.c.orig	Sat Jan 29 18:48:34 1994
---- sim/spice/common/src/lib/fte/x11.c	Sun Dec 12 14:56:50 1999
+*** spice/common/src/lib/fte/x11.c.orig	Sat Jan 29 18:48:34 1994
+--- spice/common/src/lib/fte/x11.c	Sun Dec 12 14:56:50 1999
 ***************
 *** 773,784 ****
 --- 773,787 ----
diff --git a/cad/cider/files/patch-aj b/cad/cider/files/patch-aj
new file mode 100644
index 000000000000..ab918d55a588
--- /dev/null
+++ b/cad/cider/files/patch-aj
@@ -0,0 +1,11 @@
+--- spice/common/util/skeleton/make_def.bd.orig	Thu Feb 24 07:07:01 1994
++++ spice/common/util/skeleton/make_def.bd	Sun Dec 26 17:19:32 1999
+@@ -85,7 +85,7 @@
+ # 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-ak b/cad/cider/files/patch-ak
new file mode 100644
index 000000000000..d4dfcd0751f4
--- /dev/null
+++ b/cad/cider/files/patch-ak
@@ -0,0 +1,11 @@
+--- spice/common/util/skeleton/make_std.bd.orig	Sat Jan 29 19:16:16 1994
++++ spice/common/util/skeleton/make_std.bd	Sun Dec 26 17:19:39 1999
+@@ -23,7 +23,7 @@
+ 			DIR="$${DIR}"
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
++	$(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ 
+ bootstrap: always
+ 	-@if test "x$(DIR)" = "xsrc/"; then				      \
diff --git a/cad/cider/files/patch-al b/cad/cider/files/patch-al
new file mode 100644
index 000000000000..382469373646
--- /dev/null
+++ b/cad/cider/files/patch-al
@@ -0,0 +1,11 @@
+--- 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 @@
+ 			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-am b/cad/cider/files/patch-am
new file mode 100644
index 000000000000..0dc7c6578a61
--- /dev/null
+++ b/cad/cider/files/patch-am
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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-an b/cad/cider/files/patch-an
new file mode 100644
index 000000000000..b7af70da283b
--- /dev/null
+++ b/cad/cider/files/patch-an
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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-ao b/cad/cider/files/patch-ao
new file mode 100644
index 000000000000..d27cfa1f636a
--- /dev/null
+++ b/cad/cider/files/patch-ao
@@ -0,0 +1,80 @@
+--- spice/common/src/bin/makeops.orig	Mon Jan 31 02:14:05 1994
++++ spice/common/src/bin/makeops	Sun Dec 26 18:11:11 1999
+@@ -39,20 +39,20 @@
+ 	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)
++	$(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)
++	$(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 \
++	$(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)
++	$(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 @@
+ 	chmod -w "$@"
+ 
+ cconf.o: $(OBJ_DIR)/cconf.c
+-	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/cconf.c $(ASM_HACK)
++	$(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 @@
+ 	chmod -w "$@"
+ 
+ bconf.o: $(OBJ_DIR)/bconf.c
+-	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(OBJ_DIR)/bconf.c $(ASM_HACK)
++	$(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 @@
+ 	chmod -w "$@"
+ 
+ $(TUNEFILE).o: $(TUNEFILE).c
+-	${CC} ${CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
++	${CC} ${REAL_CFLAGS} ${INCLUDE} -c $(TUNEFILE).c $(ASM_HACK)
+ 
+ nconf.o: nconf.c
+-	${CC} ${CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
++	${CC} ${REAL_CFLAGS} ${INCLUDE} -c nconf.c $(ASM_HACK)
+ 
+ conf.o: conf.c
+-	${CC} ${CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
++	${CC} ${REAL_CFLAGS} ${INCLUDE} -c conf.c $(ASM_HACK)
+ 
+ $(TUNEFILE).c: $(SYS_CONF)/$(OBJECTIVE)
+ 	@echo "Creating $(TUNEFILE).c";					      \
+@@ -122,14 +122,14 @@
+ 	chmod -w "$@"
+ 
+ help.o: help.c $(SYS_CONF)/$(OBJECTIVE) $(SYS_CONF)/$(OBJECTIVE)-cc
+-	$(CC) $(CFLAGS) $(INTERFACE_OPTS) $(INCX) \
++	$(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)
++	$(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)
++	$(CC) $(REAL_CFLAGS) -c $(INCLUDE) $(SRC_DIR)/multidec.c $(ASM_HACK)
+ 
+ LIB	= $(OBJLIB_DIR)
+ 
diff --git a/cad/cider/files/patch-ap b/cad/cider/files/patch-ap
new file mode 100644
index 000000000000..bb5c92461c64
--- /dev/null
+++ b/cad/cider/files/patch-ap
@@ -0,0 +1,13 @@
+--- 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
+@@ -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-aq b/cad/cider/files/patch-aq
new file mode 100644
index 000000000000..5ed2f0bb7940
--- /dev/null
+++ b/cad/cider/files/patch-aq
@@ -0,0 +1,38 @@
+--- spice/common/src/include/misc.h.orig	Sat Jan 29 19:14:17 1994
++++ spice/common/src/include/misc.h	Sun Dec 26 18:49:39 1999
+@@ -5,6 +5,10 @@
+ #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
+@@ -86,7 +90,9 @@
+ 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 +115,14 @@
+ #    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-ar b/cad/cider/files/patch-ar
new file mode 100644
index 000000000000..1f901f377d2a
--- /dev/null
+++ b/cad/cider/files/patch-ar
@@ -0,0 +1,39 @@
+--- spice/common/src/include/os_bsd.h.orig	Sat Jan 29 19:14:37 1994
++++ spice/common/src/include/os_bsd.h	Sun Dec 26 19:05:36 1999
+@@ -6,14 +6,22 @@
+  *	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( )		*/
+ #define HAS_BSDTTY		/* <sgtty.h>				*/
+@@ -22,4 +30,10 @@
+ #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( )	*/
++#endif
diff --git a/cad/cider/files/patch-as b/cad/cider/files/patch-as
new file mode 100644
index 000000000000..24702d6a3955
--- /dev/null
+++ b/cad/cider/files/patch-as
@@ -0,0 +1,24 @@
+--- spice/common/src/include/util.h.orig	Sat Jan 29 19:14:24 1994
++++ spice/common/src/include/util.h	Sun Dec 26 19:26:14 1999
+@@ -6,6 +6,10 @@
+ #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;}}
+@@ -44,8 +48,10 @@
+ #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-at b/cad/cider/files/patch-at
new file mode 100644
index 000000000000..170b48f461e5
--- /dev/null
+++ b/cad/cider/files/patch-at
@@ -0,0 +1,21 @@
+--- 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 @@
+ #include "cpdefs.h"
+ #include "ftedefs.h"
+ #include "suffix.h"
++#include "util.h"
+ 
+ #define POLYGONBUFSIZE 512
+ /* XXX */
+@@ -33,8 +34,10 @@
+                          c |= CODEMAXY;
+ 
+ /* XXX */
++/*
+ #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-ba b/cad/cider/files/patch-ba
index 38e47363608b..c8fe3d953db5 100644
--- a/cad/cider/files/patch-ba
+++ b/cad/cider/files/patch-ba
@@ -1,5 +1,5 @@
-*** sim/cider1b1/common/conf/defaults.orig	Sat Jan 29 19:21:15 1994
---- sim/cider1b1/common/conf/defaults	Sun Dec 12 14:14:43 1999
+*** 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
diff --git a/cad/cider/files/patch-bb b/cad/cider/files/patch-bb
index 5f68e8c080e6..850513159719 100644
--- a/cad/cider/files/patch-bb
+++ b/cad/cider/files/patch-bb
@@ -1,5 +1,5 @@
-*** sim/cider/common/util/build.orig	Sat Jan 29 19:32:01 1994
---- sim/cider/common/util/build	Sun Dec 12 16:45:08 1999
+*** 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 ****
   
diff --git a/cad/cider/files/patch-bc b/cad/cider/files/patch-bc
index c64241465444..8924482f58f7 100644
--- a/cad/cider/files/patch-bc
+++ b/cad/cider/files/patch-bc
@@ -1,5 +1,5 @@
-*** sim/cider/common/src/bin/main.c.orig	Sat Mar 12 08:20:59 1994
---- sim/cider/common/src/bin/main.c	Mon Dec 13 10:16:13 1999
+*** cider/common/src/bin/main.c.orig	Sat Mar 12 08:20:59 1994
+--- cider/common/src/bin/main.c	Mon Dec 13 10:16:13 1999
 ***************
 *** 25,30 ****
 --- 25,37 ----
diff --git a/cad/cider/files/patch-be b/cad/cider/files/patch-be
index 07d27163c159..4a4774d16e5f 100644
--- a/cad/cider/files/patch-be
+++ b/cad/cider/files/patch-be
@@ -1,5 +1,5 @@
-*** sim/cider/common/lib/makedefs.orig	Thu Feb 24 09:11:21 1994
---- sim/cider/common/lib/makedefs	Mon Dec 13 11:34:56 1999
+*** 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 ****
   
diff --git a/cad/cider/files/patch-bf b/cad/cider/files/patch-bf
index 6241452ff7ce..6e6f6e74109a 100644
--- a/cad/cider/files/patch-bf
+++ b/cad/cider/files/patch-bf
@@ -1,5 +1,5 @@
-*** sim/cider/common/lib/makeops.orig	Thu Feb 24 09:11:43 1994
---- sim/cider/common/lib/makeops	Mon Dec 13 11:45:34 1999
+*** 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 ----
diff --git a/cad/cider/files/patch-bg b/cad/cider/files/patch-bg
index 02eb58146c3d..95acfb1546a1 100644
--- a/cad/cider/files/patch-bg
+++ b/cad/cider/files/patch-bg
@@ -1,5 +1,5 @@
-*** sim/cider/common/lib/helpdir/spice.txt.orig	Mon Dec 13 10:57:16 1999
---- sim/cider/common/lib/helpdir/spice.txt	Mon Dec 13 10:50:01 1999
+*** 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 ----
diff --git a/cad/cider/files/patch-bj b/cad/cider/files/patch-bj
new file mode 100644
index 000000000000..9aefe877ab4e
--- /dev/null
+++ b/cad/cider/files/patch-bj
@@ -0,0 +1,11 @@
+--- cider/common/util/skeleton/make_def.bd.orig	Sat Mar 12 13:05:44 1994
++++ cider/common/util/skeleton/make_def.bd	Sun Dec 26 17:17:16 1999
+@@ -76,7 +76,7 @@
+ 
+ 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-bk b/cad/cider/files/patch-bk
new file mode 100644
index 000000000000..451d034c5a87
--- /dev/null
+++ b/cad/cider/files/patch-bk
@@ -0,0 +1,11 @@
+--- cider/common/util/skeleton/make_std.bd.orig	Sat Jan 29 19:31:59 1994
++++ cider/common/util/skeleton/make_std.bd	Sun Dec 26 17:17:37 1999
+@@ -23,7 +23,7 @@
+ 			DIR="$${DIR}"
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
++	$(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(SRC_DIR)/$*.c $(OUTPUT) $(ASM_HACK)
+ 
+ bootstrap: always
+ 	-@if test "x$(DIR)" = "xsrc/"; then				      \
diff --git a/cad/cider/files/patch-bl b/cad/cider/files/patch-bl
new file mode 100644
index 000000000000..9cb68e0e7fe3
--- /dev/null
+++ b/cad/cider/files/patch-bl
@@ -0,0 +1,20 @@
+--- cider/common/src/bin/makeops.orig	Tue Mar  8 03:39:12 1994
++++ cider/common/src/bin/makeops	Sun Dec 26 18:04:08 1999
+@@ -19,14 +19,14 @@
+ 	mkdir $(CIDER_EXEC_DIR)
+ 
+ cider.o: main.c $(SYS_CONF)/$(OBJECTIVE)-cc
+-	$(CC) -c $(CFLAGS) $(INCLUDE) -DSIMULATOR $(SRC_DIR)/main.c $(ASM_HACK)
++	$(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)
++	$(CC) $(REAL_CFLAGS) $(INCLUDE) -c conf.c $(ASM_HACK)
+ 
+ $(TUNEFILE).o: $(TUNEFILE).c
+-	$(CC) $(CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
++	$(CC) $(REAL_CFLAGS) $(INCLUDE) -c $(TUNEFILE).c $(ASM_HACK)
+ 
+ conf.c: config.c $(SYS_CONF)/$(OBJECTIVE)
+ 	@echo Creating "$@":