From 13bf86f7619fa6fec356bda12a80ac449377c3d0 Mon Sep 17 00:00:00 2001 From: marino Date: Mon, 18 Aug 2014 15:41:36 +0000 Subject: 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. --- cad/cider/files/patch-aa | 29 ---- cad/cider/files/patch-ab | 20 --- cad/cider/files/patch-ac | 62 -------- cad/cider/files/patch-ad | 25 --- cad/cider/files/patch-aj | 20 --- cad/cider/files/patch-ak | 33 ---- cad/cider/files/patch-al | 11 -- cad/cider/files/patch-am | 11 -- cad/cider/files/patch-an | 11 -- cad/cider/files/patch-ao | 169 --------------------- cad/cider/files/patch-ap | 13 -- cad/cider/files/patch-aq | 45 ------ cad/cider/files/patch-ar | 46 ------ cad/cider/files/patch-as | 35 ----- cad/cider/files/patch-at | 21 --- cad/cider/files/patch-ba | 39 ----- cad/cider/files/patch-bb | 36 ----- cad/cider/files/patch-bc | 25 --- cad/cider/files/patch-be | 26 ---- cad/cider/files/patch-bf | 18 --- cad/cider/files/patch-bg | 22 --- cad/cider/files/patch-bj | 20 --- cad/cider/files/patch-bk | 33 ---- cad/cider/files/patch-bl | 29 ---- cad/cider/files/patch-bm | 16 -- .../patch-cider-common-src-lib-input-meshset.c | 17 --- .../files/patch-cider1b1_common_conf_defaults | 26 ++++ .../patch-cider1b1_common_lib_helpdir_spice.txt | 18 +++ cad/cider/files/patch-cider1b1_common_lib_makedefs | 16 ++ cad/cider/files/patch-cider1b1_common_lib_makeops | 16 ++ .../files/patch-cider1b1_common_src_bin_main.c | 25 +++ .../files/patch-cider1b1_common_src_bin_makeops | 29 ++++ .../patch-cider1b1_common_src_lib_input_meshset.c | 17 +++ .../patch-cider1b1_common_src_lib_support_erfc.c | 16 ++ .../patch-cider1b1_common_src_lib_support_mobil.c | 27 ++++ cad/cider/files/patch-cider1b1_common_util_build | 20 +++ ...atch-cider1b1_common_util_skeleton_make__def.bd | 20 +++ ...atch-cider1b1_common_util_skeleton_make__std.bd | 33 ++++ .../files/patch-spice-common-src-lib-cp-complete.c | 20 --- .../files/patch-spice-common-src-lib-fte-graf.c | 12 -- .../files/patch-spice-common-src-lib-fte-grid.c | 12 -- .../files/patch-spice-common-src-lib-fte-x11.c | 13 -- .../patch-spice-common-src-lib-hlp-readhelp.c | 13 -- .../files/patch-spice-common-src-lib-mfb-mfbcaps.c | 14 -- .../files/patch-spice3f5_common_conf_defaults | 18 +++ .../files/patch-spice3f5_common_src_bin_main.c | 25 +++ .../files/patch-spice3f5_common_src_bin_makeops | 169 +++++++++++++++++++++ .../files/patch-spice3f5_common_src_bin_sconvert.c | 26 ++++ .../files/patch-spice3f5_common_src_include_misc.h | 45 ++++++ .../patch-spice3f5_common_src_include_os__bsd.h | 46 ++++++ .../files/patch-spice3f5_common_src_include_util.h | 35 +++++ .../patch-spice3f5_common_src_lib_cp_complete.c | 20 +++ .../files/patch-spice3f5_common_src_lib_fte_clip.c | 21 +++ .../patch-spice3f5_common_src_lib_fte_device.c | 55 +++++++ .../files/patch-spice3f5_common_src_lib_fte_graf.c | 12 ++ .../files/patch-spice3f5_common_src_lib_fte_grid.c | 12 ++ .../files/patch-spice3f5_common_src_lib_fte_inp.c | 11 ++ .../patch-spice3f5_common_src_lib_fte_makedefs | 11 ++ .../files/patch-spice3f5_common_src_lib_fte_x11.c | 13 ++ .../patch-spice3f5_common_src_lib_hlp_makedefs | 11 ++ .../patch-spice3f5_common_src_lib_hlp_readhelp.c | 13 ++ .../patch-spice3f5_common_src_lib_mfb_mfbcaps.c | 14 ++ .../patch-spice3f5_common_src_lib_sparse_spdefs.h | 13 ++ cad/cider/files/patch-spice3f5_common_util_build | 20 +++ .../files/patch-spice3f5_common_util_makelib.sh | 11 ++ ...atch-spice3f5_common_util_skeleton_make__def.bd | 20 +++ ...atch-spice3f5_common_util_skeleton_make__std.bd | 33 ++++ 67 files changed, 917 insertions(+), 916 deletions(-) delete mode 100644 cad/cider/files/patch-aa delete mode 100644 cad/cider/files/patch-ab delete mode 100644 cad/cider/files/patch-ac delete mode 100644 cad/cider/files/patch-ad delete mode 100644 cad/cider/files/patch-aj delete mode 100644 cad/cider/files/patch-ak delete mode 100644 cad/cider/files/patch-al delete mode 100644 cad/cider/files/patch-am delete mode 100644 cad/cider/files/patch-an delete mode 100644 cad/cider/files/patch-ao delete mode 100644 cad/cider/files/patch-ap delete mode 100644 cad/cider/files/patch-aq delete mode 100644 cad/cider/files/patch-ar delete mode 100644 cad/cider/files/patch-as delete mode 100644 cad/cider/files/patch-at delete mode 100644 cad/cider/files/patch-ba delete mode 100644 cad/cider/files/patch-bb delete mode 100644 cad/cider/files/patch-bc delete mode 100644 cad/cider/files/patch-be delete mode 100644 cad/cider/files/patch-bf delete mode 100644 cad/cider/files/patch-bg delete mode 100644 cad/cider/files/patch-bj delete mode 100644 cad/cider/files/patch-bk delete mode 100644 cad/cider/files/patch-bl delete mode 100644 cad/cider/files/patch-bm delete mode 100644 cad/cider/files/patch-cider-common-src-lib-input-meshset.c create mode 100644 cad/cider/files/patch-cider1b1_common_conf_defaults create mode 100644 cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt create mode 100644 cad/cider/files/patch-cider1b1_common_lib_makedefs create mode 100644 cad/cider/files/patch-cider1b1_common_lib_makeops create mode 100644 cad/cider/files/patch-cider1b1_common_src_bin_main.c create mode 100644 cad/cider/files/patch-cider1b1_common_src_bin_makeops create mode 100644 cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c create mode 100644 cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c create mode 100644 cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c create mode 100644 cad/cider/files/patch-cider1b1_common_util_build create mode 100644 cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd create mode 100644 cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd delete mode 100644 cad/cider/files/patch-spice-common-src-lib-cp-complete.c delete mode 100644 cad/cider/files/patch-spice-common-src-lib-fte-graf.c delete mode 100644 cad/cider/files/patch-spice-common-src-lib-fte-grid.c delete mode 100644 cad/cider/files/patch-spice-common-src-lib-fte-x11.c delete mode 100644 cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c delete mode 100644 cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c create mode 100644 cad/cider/files/patch-spice3f5_common_conf_defaults create mode 100644 cad/cider/files/patch-spice3f5_common_src_bin_main.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_bin_makeops create mode 100644 cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_include_misc.h create mode 100644 cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h create mode 100644 cad/cider/files/patch-spice3f5_common_src_include_util.h create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c create mode 100644 cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h create mode 100644 cad/cider/files/patch-spice3f5_common_util_build create mode 100644 cad/cider/files/patch-spice3f5_common_util_makelib.sh create mode 100644 cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd create mode 100644 cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd (limited to 'cad/cider/files') 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-ab b/cad/cider/files/patch-ab deleted file mode 100644 index cda621b387b8..000000000000 --- a/cad/cider/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - - 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 @@ - 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}" \ - VPATH="${TOP0}/${DIR}/${SUBDIR}" CWD="${CWD}" - echo Done with build at `date` - else 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-ad b/cad/cider/files/patch-ad deleted file mode 100644 index b6f5736836b9..000000000000 --- a/cad/cider/files/patch-ad +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 @@ - #endif - - #include "patchlev.h" -+ -+#ifdef __FreeBSD__ -+#include -+#endif -+ - #include "suffix.h" - - /* (Virtual) Machine architecture parameters */ -@@ -214,6 +219,10 @@ - FILE *fp; - FILE *circuit_file; - -+#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. */ diff --git a/cad/cider/files/patch-aj b/cad/cider/files/patch-aj deleted file mode 100644 index 3c45608e2b06..000000000000 --- a/cad/cider/files/patch-aj +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - 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 @@ - # 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 deleted file mode 100644 index 22801695c1f5..000000000000 --- a/cad/cider/files/patch-ak +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 @@ - 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 @@ - 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 @@ - 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-al b/cad/cider/files/patch-al deleted file mode 100644 index 382469373646..000000000000 --- a/cad/cider/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 <= 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 deleted file mode 100644 index 9d5a04ad81ce..000000000000 --- a/cad/cider/files/patch-aq +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 @@ - #ifndef MISC_H - #define MISC_H - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#endif -+ - #define BSIZE_SP 512 - - #ifdef HAS_EXIT1 -@@ -81,12 +85,16 @@ - # 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 @@ - # 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 deleted file mode 100644 index 1ea4d84e3892..000000000000 --- a/cad/cider/files/patch-ar +++ /dev/null @@ -1,46 +0,0 @@ ---- 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 @@ - * BSD and derivative systems - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#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( ), */ -+#define HAS_INDEX /* index( ) instead of strchr( ) */ -+#define HAS_STRINGS /* use instead of */ -+#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 /* */ -+#else - #define HAS_BSDTTY /* */ -+#endif - #define HAS_BSDDIRS /* */ - #define HAS_BSDRUSAGE /* getrusage( ) */ - #define HAS_BSDRLIMIT /* getrlimit( ) */ - #define HAS_DUP2 - #define HAS_GETWD /* getwd(buf) */ --#define HAS_STRINGS /* use instead of */ -+ -+#if (defined(BSD) && (BSD >= 199306)) -+#define HAS_BSDSOCKETS /* , 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-as b/cad/cider/files/patch-as deleted file mode 100644 index d87b835d7557..000000000000 --- a/cad/cider/files/patch-as +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 @@ - #ifndef UTIL - #define UTIL - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include -+#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 @@ - #include - #endif - #else -+/* - extern char *malloc(); - extern char *calloc(); -+*/ - extern char *realloc(); - extern void free(); - #endif -@@ -44,8 +50,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 deleted file mode 100644 index f772c924e45b..000000000000 --- a/cad/cider/files/patch-at +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 */ -+/* 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-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-bc b/cad/cider/files/patch-bc deleted file mode 100644 index d860044fff49..000000000000 --- a/cad/cider/files/patch-bc +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 @@ - #endif - - #include "patchlev.h" -+ -+#ifdef __FreeBSD__ -+#include -+#endif -+ - #include "suffix.h" - - /* (Virtual) Machine architecture parameters */ -@@ -214,6 +219,10 @@ - FILE *fp; - FILE *circuit_file; - -+#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. */ 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-bj b/cad/cider/files/patch-bj deleted file mode 100644 index 821e81d9a851..000000000000 --- a/cad/cider/files/patch-bj +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - 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 @@ - - 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 deleted file mode 100644 index cb8ac462ba5f..000000000000 --- a/cad/cider/files/patch-bk +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 @@ - 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 @@ - 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 @@ - 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-bl b/cad/cider/files/patch-bl deleted file mode 100644 index f565a3f0d49f..000000000000 --- a/cad/cider/files/patch-bl +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 @@ - 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 @@ - 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-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-cider-common-src-lib-input-meshset.c b/cad/cider/files/patch-cider-common-src-lib-input-meshset.c deleted file mode 100644 index 697492d9d8ec..000000000000 --- a/cad/cider/files/patch-cider-common-src-lib-input-meshset.c +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 @@ - 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_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-cider1b1_common_src_bin_main.c b/cad/cider/files/patch-cider1b1_common_src_bin_main.c new file mode 100644 index 000000000000..86450a4fe302 --- /dev/null +++ b/cad/cider/files/patch-cider1b1_common_src_bin_main.c @@ -0,0 +1,25 @@ +--- 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 ++#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 new file mode 100644 index 000000000000..1245c2598f2f --- /dev/null +++ b/cad/cider/files/patch-cider1b1_common_src_bin_makeops @@ -0,0 +1,29 @@ +--- 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 new file mode 100644 index 000000000000..3b3fa012bcd1 --- /dev/null +++ b/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c @@ -0,0 +1,17 @@ +--- 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 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-cider1b1_common_util_skeleton_make__def.bd b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd new file mode 100644 index 000000000000..60490c0e7d23 --- /dev/null +++ b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..e163e04f43e7 --- /dev/null +++ b/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd @@ -0,0 +1,33 @@ +--- 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-spice-common-src-lib-cp-complete.c b/cad/cider/files/patch-spice-common-src-lib-cp-complete.c deleted file mode 100644 index 745e66d8269c..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-cp-complete.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 @@ - 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-spice-common-src-lib-fte-graf.c b/cad/cider/files/patch-spice-common-src-lib-fte-graf.c deleted file mode 100644 index 8ee6e6862d08..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-fte-graf.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 @@ - #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-spice-common-src-lib-fte-grid.c b/cad/cider/files/patch-spice-common-src-lib-fte-grid.c deleted file mode 100644 index 6252698f94a0..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-fte-grid.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 @@ - #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-spice-common-src-lib-fte-x11.c b/cad/cider/files/patch-spice-common-src-lib-fte-x11.c deleted file mode 100644 index 2de02f989a0c..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-fte-x11.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 @@ - - #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-spice-common-src-lib-hlp-readhelp.c b/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c deleted file mode 100644 index b845a8339786..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 @@ - - 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-spice-common-src-lib-mfb-mfbcaps.c b/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c deleted file mode 100644 index 8338d4b14ae3..000000000000 --- a/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 @@ - - 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_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-spice3f5_common_src_bin_main.c b/cad/cider/files/patch-spice3f5_common_src_bin_main.c new file mode 100644 index 000000000000..a76fac6af175 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_bin_main.c @@ -0,0 +1,25 @@ +--- 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 ++#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 new file mode 100644 index 000000000000..babb11888c86 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_bin_makeops @@ -0,0 +1,169 @@ +--- 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 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-spice3f5_common_src_include_misc.h b/cad/cider/files/patch-spice3f5_common_src_include_misc.h new file mode 100644 index 000000000000..9bff43951a37 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_include_misc.h @@ -0,0 +1,45 @@ +--- 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 ++#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 new file mode 100644 index 000000000000..1132447c5f6f --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h @@ -0,0 +1,46 @@ +--- 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 ++#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( ), */ ++#define HAS_INDEX /* index( ) instead of strchr( ) */ ++#define HAS_STRINGS /* use instead of */ ++#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 /* */ ++#else + #define HAS_BSDTTY /* */ ++#endif + #define HAS_BSDDIRS /* */ + #define HAS_BSDRUSAGE /* getrusage( ) */ + #define HAS_BSDRLIMIT /* getrlimit( ) */ + #define HAS_DUP2 + #define HAS_GETWD /* getwd(buf) */ +-#define HAS_STRINGS /* use instead of */ ++ ++#if (defined(BSD) && (BSD >= 199306)) ++#define HAS_BSDSOCKETS /* , 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 new file mode 100644 index 000000000000..9daa1866f9c8 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_include_util.h @@ -0,0 +1,35 @@ +--- 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 ++#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 + #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 new file mode 100644 index 000000000000..344fbe07a041 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..08e221e78837 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c @@ -0,0 +1,21 @@ +--- 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 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-spice3f5_common_src_lib_fte_graf.c b/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c new file mode 100644 index 000000000000..b7b1793e8340 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c @@ -0,0 +1,12 @@ +--- 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 new file mode 100644 index 000000000000..09edb3596886 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c @@ -0,0 +1,12 @@ +--- 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 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-spice3f5_common_src_lib_fte_makedefs b/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs new file mode 100644 index 000000000000..3fa2aa8a0e20 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..4496a7f75f18 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..5212175d90dd --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..904728e090e0 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..300b6a359ee8 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c @@ -0,0 +1,14 @@ +--- 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 new file mode 100644 index 000000000000..3533217e0ac6 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000000..2be89831b1cb --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_util_build @@ -0,0 +1,20 @@ +--- 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 new file mode 100644 index 000000000000..fca161cdc303 --- /dev/null +++ b/cad/cider/files/patch-spice3f5_common_util_makelib.sh @@ -0,0 +1,11 @@ +--- 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 <> ..\..\$(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" \ -- cgit