Date: Mon, 18 Aug 2014 15:41:36 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365318 - in head/cad/cider: . files Message-ID: <201408181541.s7IFfaHw043830@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Aug 18 15:41:36 2014 New Revision: 365318 URL: http://svnweb.freebsd.org/changeset/ports/365318 QAT: https://qat.redports.org/buildarchive/r365318/ Log: 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. Added: head/cad/cider/files/patch-cider1b1_common_conf_defaults (contents, props changed) head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt (contents, props changed) head/cad/cider/files/patch-cider1b1_common_lib_makedefs (contents, props changed) head/cad/cider/files/patch-cider1b1_common_lib_makeops (contents, props changed) head/cad/cider/files/patch-cider1b1_common_src_bin_main.c (contents, props changed) head/cad/cider/files/patch-cider1b1_common_src_bin_makeops (contents, props changed) head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c (contents, props changed) head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c (contents, props changed) head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c (contents, props changed) head/cad/cider/files/patch-cider1b1_common_util_build (contents, props changed) head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd (contents, props changed) head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd (contents, props changed) head/cad/cider/files/patch-spice3f5_common_conf_defaults (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_bin_main.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_bin_makeops (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_include_misc.h (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_include_util.h (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c (contents, props changed) head/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h (contents, props changed) head/cad/cider/files/patch-spice3f5_common_util_build (contents, props changed) head/cad/cider/files/patch-spice3f5_common_util_makelib.sh (contents, props changed) head/cad/cider/files/patch-spice3f5_common_util_skeleton_make__def.bd (contents, props changed) head/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd (contents, props changed) Deleted: head/cad/cider/files/patch-aa head/cad/cider/files/patch-ab head/cad/cider/files/patch-ac head/cad/cider/files/patch-ad head/cad/cider/files/patch-aj head/cad/cider/files/patch-ak head/cad/cider/files/patch-al head/cad/cider/files/patch-am head/cad/cider/files/patch-an head/cad/cider/files/patch-ao head/cad/cider/files/patch-ap head/cad/cider/files/patch-aq head/cad/cider/files/patch-ar head/cad/cider/files/patch-as head/cad/cider/files/patch-at head/cad/cider/files/patch-ba head/cad/cider/files/patch-bb head/cad/cider/files/patch-bc head/cad/cider/files/patch-be head/cad/cider/files/patch-bf head/cad/cider/files/patch-bg head/cad/cider/files/patch-bj head/cad/cider/files/patch-bk head/cad/cider/files/patch-bl head/cad/cider/files/patch-bm head/cad/cider/files/patch-cider-common-src-lib-input-meshset.c head/cad/cider/files/patch-spice-common-src-lib-cp-complete.c head/cad/cider/files/patch-spice-common-src-lib-fte-graf.c head/cad/cider/files/patch-spice-common-src-lib-fte-grid.c head/cad/cider/files/patch-spice-common-src-lib-fte-x11.c head/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c head/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c Modified: head/cad/cider/Makefile head/cad/cider/pkg-descr head/cad/cider/pkg-plist Modified: head/cad/cider/Makefile ============================================================================== --- head/cad/cider/Makefile Mon Aug 18 15:18:23 2014 (r365317) +++ head/cad/cider/Makefile Mon Aug 18 15:41:36 2014 (r365318) @@ -3,7 +3,7 @@ PORTNAME= cider PORTVERSION= 1.b1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mita @@ -14,45 +14,77 @@ COMMENT= Mixed-level circuit and device CONFLICTS= spice-[0-9]* WRKSRC= ${WRKDIR}/sim -MAN1= sconvert.1 nutmeg.1 spice.1 cider.1 -MAN3= mfb.3 -MAN5= mfbcap.5 -MLINKS= spice.1 spice3.1 USE_XORG= xt xaw xmu -NO_STAGE= yes - -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= EXAMPLES .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000100 +# cider has a generated makefile that is passed to make via stdin. +# bmake doesn't understand its generic static library targets, but +# continues on failure. The result is several programs aren't built. +# Using USE+=fmake even with patching won't fix it on FreeBSD 10. make +# must be hardcoded somewhere because fmake ends up calling make. +BROKEN= Will not build with bmake and USES=fmake will not solve the issue +.endif + pre-patch: - @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt ${WRKSRC}/cider/common/lib/helpdir/spice.txt + @${CP} -f ${WRKSRC}/spice/common/lib/helpdir/spice.txt \ + ${WRKSRC}/cider/common/lib/helpdir/spice.txt post-patch: - @${LN} -fs ../../../spice/common/util/makelib.sh ${WRKSRC}/cider/common/util - @${LN} -fs ../../../../spice/common/src/lib/sparse/spdefs.h ${WRKSRC}/cider/common/src/include + @${LN} -fs ../../../spice/common/util/makelib.sh \ + ${WRKSRC}/cider/common/util + @${LN} -fs ../../../../spice/common/src/lib/sparse/spdefs.h \ + ${WRKSRC}/cider/common/src/include @${CP} -f ${FILESDIR}/Makefile.spice ${WRKSRC}/spice/common/Makefile @${CP} -f ${FILESDIR}/Makefile.cider ${WRKSRC}/cider/common/Makefile @${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/spice/common/conf @${CP} -f ${FILESDIR}/FreeBSD ${WRKSRC}/cider/common/conf do-build: - @(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE}) - @(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE}) + @(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) + @(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}) do-install: - @(cd ${WRKSRC}/spice/common && ${SETENV} ${MAKE_ENV} ${MAKE} install) - @(cd ${WRKSRC}/cider/common && ${SETENV} ${MAKE_ENV} ${MAKE} install) - -post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${PREFIX}/share/examples/spice3 - @${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir ${PREFIX}/share/examples/spice3 - @${MKDIR} ${PREFIX}/share/examples/cider - @${TAR} -cf - -C ${WRKSRC}/cider/common/examples . | ${TAR} -xf - -C ${PREFIX}/share/examples/cider - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/cider + @${MKDIR} ${STAGEDIR}${DATADIR}/spice3/helpdir \ + ${STAGEDIR}${DATADIR}/spice3/scripts \ + ${STAGEDIR}${DATADIR}/cider/helpdir \ + ${STAGEDIR}${DATADIR}/cider/scripts + ${INSTALL_PROGRAM} ${WRKSRC}/cider/FreeBSD/obj/bin/cider \ + ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/cider/common/doc/cider.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/cider/common/lib/helpdir/*.txt \ + ${STAGEDIR}${DATADIR}/cider/helpdir + ${INSTALL_SCRIPT} ${WRKSRC}/cider/common/lib/scripts/dev* \ + ${STAGEDIR}${DATADIR}/cider/scripts + (cd ${WRKSRC}/spice/FreeBSD/obj/bin && ${INSTALL_PROGRAM} \ + spice3 nutmeg sconvert help proc2mod multidec \ + ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/spice/common/man/man1 && ${INSTALL_MAN} nutmeg.1 \ + sconvert.1 spice.1 ${STAGEDIR}${MANPREFIX}/man/man1) + (cd ${STAGEDIR}${MANPREFIX}/man/man1 && \ + ${LN} -s spice.1 spice3.1) + ${INSTALL_MAN} ${WRKSRC}/spice/common/man/man3/mfb.3 \ + ${STAGEDIR}${MANPREFIX}/man/man3 + ${INSTALL_MAN} ${WRKSRC}/spice/common/man/man5/mfbcap.5 \ + ${STAGEDIR}${MANPREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/spice/common/lib/helpdir/spice.txt \ + ${STAGEDIR}${DATADIR}/spice3/helpdir + (cd ${WRKSRC}/spice/common/lib && ${INSTALL_DATA} news mfbcap \ + ${STAGEDIR}${DATADIR}/spice3) + ${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/s* \ + ${STAGEDIR}${DATADIR}/spice3/scripts + ${INSTALL_SCRIPT} ${WRKSRC}/spice/common/lib/scripts/spinit \ + ${STAGEDIR}${DATADIR}/cider/scripts +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/spice3 + ${INSTALL_DATA} ${WRKSRC}/spice/common/examples/*.cir \ + ${STAGEDIR}${EXAMPLESDIR}/spice3 + cd ${WRKSRC}/cider/common/examples && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .endif - @${LN} -fs ${PREFIX}/share/spice3/scripts/spinit ${PREFIX}/share/cider/scripts .include <bsd.port.mk> Added: head/cad/cider/files/patch-cider1b1_common_conf_defaults ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_conf_defaults Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-cider1b1_common_lib_makedefs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_lib_makedefs Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-cider1b1_common_lib_makeops ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_lib_makeops Mon Aug 18 15:41:36 2014 (r365318) @@ -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) + Added: head/cad/cider/files/patch-cider1b1_common_src_bin_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_src_bin_main.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 <ieeefp.h> ++#endif ++ + #include "suffix.h" + + /* (Virtual) Machine architecture parameters */ +@@ -216,6 +221,10 @@ main(ac, av) + + #endif + ++#ifdef __FreeBSD__ ++ fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL); ++#endif ++ + /* MFB tends to jump to 0 on errors. This tends to catch it. */ + if (started) { + fprintf(cp_err, "main: Internal Error: jump to zero\n"); Added: head/cad/cider/files/patch-cider1b1_common_src_bin_makeops ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_src_bin_makeops Mon Aug 18 15:41:36 2014 (r365318) @@ -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) Added: head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 */ Added: head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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); + } Added: head/cad/cider/files/patch-cider1b1_common_util_build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_util_build Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd Mon Aug 18 15:41:36 2014 (r365318) @@ -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 + Added: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd Mon Aug 18 15:41:36 2014 (r365318) @@ -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" \ Added: head/cad/cider/files/patch-spice3f5_common_conf_defaults ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_conf_defaults Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-spice3f5_common_src_bin_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_main.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 <ieeefp.h> ++#endif ++ + #include "suffix.h" + + /* (Virtual) Machine architecture parameters */ +@@ -216,6 +221,10 @@ main(ac, av) + + #endif + ++#ifdef __FreeBSD__ ++ fpsetmask(fpgetmask() & ~FP_X_INV & ~FP_X_DZ & ~FP_X_OFL); ++#endif ++ + /* MFB tends to jump to 0 on errors. This tends to catch it. */ + if (started) { + fprintf(cp_err, "main: Internal Error: jump to zero\n"); Added: head/cad/cider/files/patch-spice3f5_common_src_bin_makeops ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_makeops Mon Aug 18 15:41:36 2014 (r365318) @@ -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) Added: head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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: Added: head/cad/cider/files/patch-spice3f5_common_src_include_misc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_include_misc.h Mon Aug 18 15:41:36 2014 (r365318) @@ -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 <sys/param.h> ++#endif ++ + #define BSIZE_SP 512 + + #ifdef HAS_EXIT1 +@@ -81,12 +85,16 @@ extern void srandom(); + # define srandom srand + # endif + ++/* + extern char *calloc(); + extern char *malloc(); ++*/ + extern char *realloc(); + extern char *getenv(); + extern int errno; ++#if !(defined(BSD) && (BSD >= 199306)) + extern char *sys_errlist[]; ++#endif + extern char *getenv(); + extern char *getwd(); + extern int rand(); +@@ -109,12 +117,14 @@ extern void clearerr(); + # endif /* clearerr */ + # endif /* HAS_CLEARERR */ + ++#if !(defined(BSD) && (BSD >= 199306)) + # ifndef bzero + extern int bzero(); + # endif + # ifndef bcopy + extern void bcopy(); + # endif ++#endif + + # ifndef index + # ifdef HAS_INDEX Added: head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h Mon Aug 18 15:41:36 2014 (r365318) @@ -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 <sys/param.h> ++#endif ++ + #include "os_unix.h" + ++#if !(defined(BSD) && (BSD >= 199306)) + #define HAS_NO_ATRIGH_DECL /* if asinh( ) is not in math.h */ +-#define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */ + #define HAS_FTIME /* ftime( ), <times.h> */ ++#define HAS_INDEX /* index( ) instead of strchr( ) */ ++#define HAS_STRINGS /* use <strings.h> instead of <string.h> */ ++#endif ++ ++#define HAS_ATRIGH /* acosh( ), asinh( ), atanh( ) */ + #define HAS_TERMCAP /* tgetxxx( ) */ + #define HAS_VFORK /* BSD-ism, should not be necessary */ +-#define HAS_INDEX /* index( ) instead of strchr( ) */ + #define HAS_BCOPY /* bcopy( ), bzero( ) */ + #define HAS_BSDRANDOM /* srandom( ) and random( ) */ ++#ifdef __FreeBSD__ ++#define HAS_POSIXTTY /* <termios.h> */ ++#else + #define HAS_BSDTTY /* <sgtty.h> */ ++#endif + #define HAS_BSDDIRS /* <sys/dir.h> */ + #define HAS_BSDRUSAGE /* getrusage( ) */ + #define HAS_BSDRLIMIT /* getrlimit( ) */ + #define HAS_DUP2 + #define HAS_GETWD /* getwd(buf) */ +-#define HAS_STRINGS /* use <strings.h> instead of <string.h> */ ++ ++#if (defined(BSD) && (BSD >= 199306)) ++#define HAS_BSDSOCKETS /* <net/inet.h>, socket( ), etc. */ ++#define HAS_BSDTIME /* gettimeofday( ) return time */ ++#define HAS_FLOAT_H /* float.h */ ++#define HAS_STRCHR /* strchr( ) instead of index( ) */ ++#define HAS_INTWAITSTATUS /* wait(3) takes an int *, not a union */ ++#undef HAS_UNIX_SEGMENT_HACK ++#endif Added: head/cad/cider/files/patch-spice3f5_common_src_include_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_include_util.h Mon Aug 18 15:41:36 2014 (r365318) @@ -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 <sys/param.h> ++#endif ++ + /* #define MALLOC(x) calloc(1,(unsigned)(x)) */ + #define MALLOC(x) tmalloc((unsigned)(x)) + #define FREE(x) {if (x) {free((char *)(x));(x) = 0;}} +@@ -18,8 +22,10 @@ Author: 1985 Thomas L. Quarles + #include <stdlib.h> + #endif + #else ++/* + extern char *malloc(); + extern char *calloc(); ++*/ + extern char *realloc(); + extern void free(); + #endif +@@ -44,8 +50,10 @@ double fabs(); + #endif + + /* XXX Move these into the above ifdef someday */ ++#if !(defined(BSD) && (BSD >= 199306)) + #define MIN(a,b) ((a) < (b) ? (a) : (b)) + #define MAX(a,b) ((a) > (b) ? (a) : (b)) ++#endif + #define SIGN(a,b) ( b >= 0 ? (a >= 0 ? a : - a) : (a >= 0 ? - a : a)) + + #define ABORT() fflush(stderr);fflush(stdout);abort(); Added: head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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) { Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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. */ + Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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( ); Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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); Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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; Added: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs Mon Aug 18 15:41:36 2014 (r365318) @@ -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 Added: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c Mon Aug 18 15:41:36 2014 (r365318) @@ -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(); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181541.s7IFfaHw043830>