Index: head/cad/cider/Makefile =================================================================== --- head/cad/cider/Makefile (revision 365317) +++ head/cad/cider/Makefile (revision 365318) @@ -1,58 +1,90 @@ # Created by: AMAKAWA Shuhei # $FreeBSD$ PORTNAME= cider PORTVERSION= 1.b1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mita DISTNAME= cider1b1 MAINTAINER= ports@FreeBSD.org COMMENT= Mixed-level circuit and device simulator (includes SPICE3) CONFLICTS= spice-[0-9]* WRKSRC= ${WRKDIR}/sim -MAN1= sconvert.1 nutmeg.1 spice.1 cider.1 -MAN3= mfb.3 -MAN5= mfbcap.5 -MLINKS= spice.1 spice3.1 USE_XORG= xt xaw xmu -NO_STAGE= yes +OPTIONS_DEFINE= EXAMPLES -OPTIONS_DEFINE= DOCS - .include +.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 Index: head/cad/cider/files/patch-at =================================================================== --- head/cad/cider/files/patch-at (revision 365317) +++ head/cad/cider/files/patch-at (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-at ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-as =================================================================== --- head/cad/cider/files/patch-as (revision 365317) +++ head/cad/cider/files/patch-as (nonexistent) @@ -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(); Property changes on: head/cad/cider/files/patch-as ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-aa =================================================================== --- head/cad/cider/files/patch-aa (revision 365317) +++ head/cad/cider/files/patch-aa (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-aa ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ab =================================================================== --- head/cad/cider/files/patch-ab (revision 365317) +++ head/cad/cider/files/patch-ab (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-ab ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ac =================================================================== --- head/cad/cider/files/patch-ac (revision 365317) +++ head/cad/cider/files/patch-ac (nonexistent) @@ -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); Property changes on: head/cad/cider/files/patch-ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ad =================================================================== --- head/cad/cider/files/patch-ad (revision 365317) +++ head/cad/cider/files/patch-ad (nonexistent) @@ -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. */ Property changes on: head/cad/cider/files/patch-ad ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-aj =================================================================== --- head/cad/cider/files/patch-aj (revision 365317) +++ head/cad/cider/files/patch-aj (nonexistent) @@ -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 - Property changes on: head/cad/cider/files/patch-aj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ak =================================================================== --- head/cad/cider/files/patch-ak (revision 365317) +++ head/cad/cider/files/patch-ak (nonexistent) @@ -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" \ Property changes on: head/cad/cider/files/patch-ak ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-al =================================================================== --- head/cad/cider/files/patch-al (revision 365317) +++ head/cad/cider/files/patch-al (nonexistent) @@ -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)) Property changes on: head/cad/cider/files/patch-ap ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-aq =================================================================== --- head/cad/cider/files/patch-aq (revision 365317) +++ head/cad/cider/files/patch-aq (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-aq ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ar =================================================================== --- head/cad/cider/files/patch-ar (revision 365317) +++ head/cad/cider/files/patch-ar (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-ar ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bm =================================================================== --- head/cad/cider/files/patch-bm (revision 365317) +++ head/cad/cider/files/patch-bm (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-bm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bl =================================================================== --- head/cad/cider/files/patch-bl (revision 365317) +++ head/cad/cider/files/patch-bl (nonexistent) @@ -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) Property changes on: head/cad/cider/files/patch-bl ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bk =================================================================== --- head/cad/cider/files/patch-bk (revision 365317) +++ head/cad/cider/files/patch-bk (nonexistent) @@ -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" \ Property changes on: head/cad/cider/files/patch-bk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bj =================================================================== --- head/cad/cider/files/patch-bj (revision 365317) +++ head/cad/cider/files/patch-bj (nonexistent) @@ -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 - Property changes on: head/cad/cider/files/patch-bj ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bg =================================================================== --- head/cad/cider/files/patch-bg (revision 365317) +++ head/cad/cider/files/patch-bg (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-bg ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bf =================================================================== --- head/cad/cider/files/patch-bf (revision 365317) +++ head/cad/cider/files/patch-bf (nonexistent) @@ -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) - Property changes on: head/cad/cider/files/patch-bf ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-be =================================================================== --- head/cad/cider/files/patch-be (revision 365317) +++ head/cad/cider/files/patch-be (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-be ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bc =================================================================== --- head/cad/cider/files/patch-bc (revision 365317) +++ head/cad/cider/files/patch-bc (nonexistent) @@ -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. */ Property changes on: head/cad/cider/files/patch-bc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-bb =================================================================== --- head/cad/cider/files/patch-bb (revision 365317) +++ head/cad/cider/files/patch-bb (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-bb ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-ba =================================================================== --- head/cad/cider/files/patch-ba (revision 365317) +++ head/cad/cider/files/patch-ba (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-ba ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c (nonexistent) @@ -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; - Property changes on: head/cad/cider/files/patch-spice-common-src-lib-hlp-readhelp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-cp-complete.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-cp-complete.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-cp-complete.c (nonexistent) @@ -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 Property changes on: head/cad/cider/files/patch-spice-common-src-lib-cp-complete.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-fte-graf.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-fte-graf.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-fte-graf.c (nonexistent) @@ -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. */ - Property changes on: head/cad/cider/files/patch-spice-common-src-lib-fte-graf.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-fte-x11.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-fte-x11.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-fte-x11.c (nonexistent) @@ -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; Property changes on: head/cad/cider/files/patch-spice-common-src-lib-fte-x11.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c (nonexistent) @@ -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(); Property changes on: head/cad/cider/files/patch-spice-common-src-lib-mfb-mfbcaps.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider-common-src-lib-input-meshset.c =================================================================== --- head/cad/cider/files/patch-cider-common-src-lib-input-meshset.c (revision 365317) +++ head/cad/cider/files/patch-cider-common-src-lib-input-meshset.c (nonexistent) @@ -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 */ Property changes on: head/cad/cider/files/patch-cider-common-src-lib-input-meshset.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice-common-src-lib-fte-grid.c =================================================================== --- head/cad/cider/files/patch-spice-common-src-lib-fte-grid.c (revision 365317) +++ head/cad/cider/files/patch-spice-common-src-lib-fte-grid.c (nonexistent) @@ -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( ); Property changes on: head/cad/cider/files/patch-spice-common-src-lib-fte-grid.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_conf_defaults =================================================================== --- head/cad/cider/files/patch-cider1b1_common_conf_defaults (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_conf_defaults (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-cider1b1_common_conf_defaults ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt =================================================================== --- head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-cider1b1_common_lib_helpdir_spice.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_lib_makedefs =================================================================== --- head/cad/cider/files/patch-cider1b1_common_lib_makedefs (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_lib_makedefs (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-cider1b1_common_lib_makedefs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_lib_makeops =================================================================== --- head/cad/cider/files/patch-cider1b1_common_lib_makeops (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_lib_makeops (revision 365318) @@ -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) + Property changes on: head/cad/cider/files/patch-cider1b1_common_lib_makeops ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_src_bin_main.c =================================================================== --- head/cad/cider/files/patch-cider1b1_common_src_bin_main.c (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_src_bin_main.c (revision 365318) @@ -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"); Property changes on: head/cad/cider/files/patch-cider1b1_common_src_bin_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_src_bin_makeops =================================================================== --- head/cad/cider/files/patch-cider1b1_common_src_bin_makeops (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_src_bin_makeops (revision 365318) @@ -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) Property changes on: head/cad/cider/files/patch-cider1b1_common_src_bin_makeops ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c =================================================================== --- head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c (revision 365318) @@ -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 */ Property changes on: head/cad/cider/files/patch-cider1b1_common_src_lib_input_meshset.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c =================================================================== --- head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-cider1b1_common_src_lib_support_erfc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c =================================================================== --- head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c (revision 365318) @@ -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); + } Property changes on: head/cad/cider/files/patch-cider1b1_common_src_lib_support_mobil.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_util_build =================================================================== --- head/cad/cider/files/patch-cider1b1_common_util_build (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_util_build (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-cider1b1_common_util_build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd =================================================================== --- head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd (revision 365318) @@ -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 + Property changes on: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__def.bd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd =================================================================== --- head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd (nonexistent) +++ head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd (revision 365318) @@ -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" \ Property changes on: head/cad/cider/files/patch-cider1b1_common_util_skeleton_make__std.bd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_conf_defaults =================================================================== --- head/cad/cider/files/patch-spice3f5_common_conf_defaults (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_conf_defaults (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_conf_defaults ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_bin_main.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_bin_main.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_main.c (revision 365318) @@ -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"); Property changes on: head/cad/cider/files/patch-spice3f5_common_src_bin_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_bin_makeops =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_bin_makeops (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_makeops (revision 365318) @@ -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) Property changes on: head/cad/cider/files/patch-spice3f5_common_src_bin_makeops ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c (revision 365318) @@ -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: Property changes on: head/cad/cider/files/patch-spice3f5_common_src_bin_sconvert.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_include_misc.h =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_include_misc.h (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_include_misc.h (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_include_misc.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_include_os__bsd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_include_util.h =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_include_util.h (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_include_util.h (revision 365318) @@ -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(); Property changes on: head/cad/cider/files/patch-spice3f5_common_src_include_util.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_cp_complete.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_clip.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c (revision 365318) @@ -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) { Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_device.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c (revision 365318) @@ -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. */ + Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_graf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c (revision 365318) @@ -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( ); Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_grid.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c (revision 365318) @@ -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); Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_inp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_makedefs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c (revision 365318) @@ -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; Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_fte_x11.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_makedefs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c (revision 365318) @@ -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; + Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_hlp_readhelp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c (revision 365318) @@ -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(); Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_mfb_mfbcaps.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h =================================================================== --- head/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h (revision 365318) @@ -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)) Property changes on: head/cad/cider/files/patch-spice3f5_common_src_lib_sparse_spdefs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_util_build =================================================================== --- head/cad/cider/files/patch-spice3f5_common_util_build (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_util_build (revision 365318) @@ -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 Property changes on: head/cad/cider/files/patch-spice3f5_common_util_build ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/files/patch-spice3f5_common_util_makelib.sh =================================================================== --- head/cad/cider/files/patch-spice3f5_common_util_makelib.sh (nonexistent) +++ head/cad/cider/files/patch-spice3f5_common_util_makelib.sh (revision 365318) @@ -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" \ Property changes on: head/cad/cider/files/patch-spice3f5_common_util_skeleton_make__std.bd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/cad/cider/pkg-descr =================================================================== --- head/cad/cider/pkg-descr (revision 365317) +++ head/cad/cider/pkg-descr (revision 365318) @@ -1,34 +1,24 @@ -CIDER is a mixed-level circuit and device simulator. -CIDER attempts to provide greater simulation accuracy than a stand-alone -circuit or device simulator can provide. -CIDER is based on the sequential mixed-level circuit and -device simulator, CODECS. In common with CODECS, CIDER embeds the circuit -simulator, SPICE3, which provides circuit simulation capabilities, -analytical models for semiconductor devices, and an interactive -user interface. An interface to the captive device simulator, DSIM, -provides accurate, one- and two-dimensional numerical models -based on the solution of Poisson's equation, and the electron and hole -current-continuity equations. The input format of CIDER couples -SPICE-like circuit descriptions -to a device description format similar to the one +CIDER is a mixed-level circuit and device simulator. CIDER attempts to +provide greater simulation accuracy than a stand-alone circuit or device +simulator can provide. CIDER is based on the sequential mixed-level +circuit and device simulator, CODECS. In common with CODECS, CIDER embeds +the circuit simulator, SPICE3, which provides circuit simulation +capabilities, analytical models for semiconductor devices, and an +interactive user interface. An interface to the captive device simulator, +DSIM, provides accurate, one- and two-dimensional numerical models based +on the solution of Poisson's equation, and the electron and hole current- +continuity equations. The input format of CIDER couples SPICE-like +circuit descriptions to a device description format similar to the one used by the PISCES device simulator developed at Stanford University. -As a result, CIDER should seem reasonably familiar to designers -already accustomed to both these tools. +As a result, CIDER should seem reasonably familiar to designers already +accustomed to both these tools. - From the Cider help file. - - SPICE is a general-purpose circuit simulation program for nonlinear DC, nonlinear transient, and linear AC analyses. Circuits may contain resistors, capacitors, inductors, mutual inductors, independent voltage and current sources, four types of dependent sources, lossless and lossy transmission lines (two separate implementations), switches, uniform distributed RC lines, and the five most common semiconductor devices: diodes, BJTs, JFETs, MESFETs, and MOSFETs. - - From the SPICE3 Version3f3 User's Manual. - This is available as a postscript document from: - ftp://ic.eecs.berkeley.edu/pub/Spice3/um.3f3.ps - or you can read the online documentation on the homepage. WWW: http://infopad.eecs.berkeley.edu/~icdesign/SPICE/ Index: head/cad/cider/pkg-plist =================================================================== --- head/cad/cider/pkg-plist (revision 365317) +++ head/cad/cider/pkg-plist (revision 365318) @@ -1,108 +1,113 @@ bin/cider bin/help bin/multidec bin/nutmeg bin/proc2mod bin/sconvert bin/spice3 -share/cider/helpdir/cider.idx -share/cider/helpdir/cider.txt -share/cider/helpdir/spice.idx -share/cider/helpdir/spice.txt -share/cider/scripts/devaxis -share/cider/scripts/devload -share/cider/scripts/spinit -%%PORTDOCS%%share/examples/cider/bicmos/bicmos.lib -%%PORTDOCS%%share/examples/cider/bicmos/bicmpd.cir -%%PORTDOCS%%share/examples/cider/bjt/astable.cir -%%PORTDOCS%%share/examples/cider/bjt/colposc.cir -%%PORTDOCS%%share/examples/cider/bjt/ecp.cir -%%PORTDOCS%%share/examples/cider/bjt/invchain.cir -%%PORTDOCS%%share/examples/cider/bjt/meclgate.cir -%%PORTDOCS%%share/examples/cider/bjt/pebjt.lib -%%PORTDOCS%%share/examples/cider/bjt/pz.cir -%%PORTDOCS%%share/examples/cider/bjt/rtlinv.cir -%%PORTDOCS%%share/examples/cider/bjt/vco.cir -%%PORTDOCS%%share/examples/cider/diode/diode.cir -%%PORTDOCS%%share/examples/cider/diode/diotran.cir -%%PORTDOCS%%share/examples/cider/diode/pindiode.cir -%%PORTDOCS%%share/examples/cider/jfet/jfet.cir -%%PORTDOCS%%share/examples/cider/mos/bootinv.cir -%%PORTDOCS%%share/examples/cider/mos/charge.cir -%%PORTDOCS%%share/examples/cider/mos/cmosinv.cir -%%PORTDOCS%%share/examples/cider/mos/nmosinv.cir -%%PORTDOCS%%share/examples/cider/mos/pass.cir -%%PORTDOCS%%share/examples/cider/mos/ringosc.cir -%%PORTDOCS%%share/examples/cider/parallel/BICMOS.LIB -%%PORTDOCS%%share/examples/cider/parallel/bicmpd.cir -%%PORTDOCS%%share/examples/cider/parallel/bicmpu.cir -%%PORTDOCS%%share/examples/cider/parallel/clkfeed.cir -%%PORTDOCS%%share/examples/cider/parallel/cmosamp.cir -%%PORTDOCS%%share/examples/cider/parallel/eclinv.cir -%%PORTDOCS%%share/examples/cider/parallel/ecpal.cir -%%PORTDOCS%%share/examples/cider/parallel/foobar -%%PORTDOCS%%share/examples/cider/parallel/gmamp.cir -%%PORTDOCS%%share/examples/cider/parallel/latch.cir -%%PORTDOCS%%share/examples/cider/parallel/ppef.1d.cir -%%PORTDOCS%%share/examples/cider/parallel/ppef.2d.cir -%%PORTDOCS%%share/examples/cider/parallel/readme -%%PORTDOCS%%share/examples/cider/parallel/ringosc.1u.cir -%%PORTDOCS%%share/examples/cider/parallel/ringosc.2u.cir -%%PORTDOCS%%share/examples/cider/readme -%%PORTDOCS%%share/examples/cider/resistor/gaasres.cir -%%PORTDOCS%%share/examples/cider/resistor/sires.cir -%%PORTDOCS%%share/examples/cider/serial/astable.cir -%%PORTDOCS%%share/examples/cider/serial/charge.cir -%%PORTDOCS%%share/examples/cider/serial/colposc.cir -%%PORTDOCS%%share/examples/cider/serial/dbridge.cir -%%PORTDOCS%%share/examples/cider/serial/invchain.cir -%%PORTDOCS%%share/examples/cider/serial/meclgate.cir -%%PORTDOCS%%share/examples/cider/serial/nmosinv.cir -%%PORTDOCS%%share/examples/cider/serial/pass.cir -%%PORTDOCS%%share/examples/cider/serial/pullup.cir -%%PORTDOCS%%share/examples/cider/serial/readme -%%PORTDOCS%%share/examples/cider/serial/recovery.cir -%%PORTDOCS%%share/examples/cider/serial/rtlinv.cir -%%PORTDOCS%%share/examples/cider/serial/vco.cir -%%PORTDOCS%%share/examples/spice3/bjtnoise.cir -%%PORTDOCS%%share/examples/spice3/bsim1tst.cir -%%PORTDOCS%%share/examples/spice3/bsim2tst.cir -%%PORTDOCS%%share/examples/spice3/diffpair.cir -%%PORTDOCS%%share/examples/spice3/diodisto.cir -%%PORTDOCS%%share/examples/spice3/ltra_1.cir -%%PORTDOCS%%share/examples/spice3/ltra_2.cir -%%PORTDOCS%%share/examples/spice3/ltra_3.cir -%%PORTDOCS%%share/examples/spice3/mixdisto.cir -%%PORTDOCS%%share/examples/spice3/mos6inv.cir -%%PORTDOCS%%share/examples/spice3/mosamp2.cir -%%PORTDOCS%%share/examples/spice3/mosmem.cir -%%PORTDOCS%%share/examples/spice3/pz2.cir -%%PORTDOCS%%share/examples/spice3/pzt.cir -%%PORTDOCS%%share/examples/spice3/rc.cir -%%PORTDOCS%%share/examples/spice3/rca3040.cir -%%PORTDOCS%%share/examples/spice3/resnoise.cir -%%PORTDOCS%%share/examples/spice3/rtlinv.cir -%%PORTDOCS%%share/examples/spice3/schmitt.cir -%%PORTDOCS%%share/examples/spice3/simplepz.cir -share/spice3/helpdir/spice.idx -share/spice3/helpdir/spice.txt -share/spice3/mfbcap -share/spice3/news -share/spice3/scripts/setplot -share/spice3/scripts/spinit -@dirrm share/cider/helpdir -@dirrm share/cider/scripts +man/man1/sconvert.1.gz +man/man1/nutmeg.1.gz +man/man1/spice.1.gz +man/man1/spice3.1.gz +man/man1/cider.1.gz +man/man3/mfb.3.gz +man/man5/mfbcap.5.gz +share/cider/cider/helpdir/cider.txt +share/cider/cider/helpdir/spice.txt +share/cider/cider/scripts/devaxis +share/cider/cider/scripts/devload +share/cider/cider/scripts/spinit +share/cider/spice3/helpdir/spice.txt +share/cider/spice3/mfbcap +share/cider/spice3/news +share/cider/spice3/scripts/setplot +share/cider/spice3/scripts/spinit +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicmos/bicmos.lib +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicmos/bicmpd.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/astable.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/colposc.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/ecp.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/invchain.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/meclgate.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/pebjt.lib +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/pz.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/rtlinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjt/vco.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/diode.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/diotran.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diode/pindiode.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jfet/jfet.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/bootinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/charge.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/cmosinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/nmosinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/pass.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos/ringosc.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/BICMOS.LIB +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/bicmpd.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/bicmpu.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/clkfeed.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/cmosamp.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/eclinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ecpal.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/foobar +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/gmamp.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/latch.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ppef.1d.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ppef.2d.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ringosc.1u.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/parallel/ringosc.2u.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resistor/gaasres.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resistor/sires.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/astable.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/charge.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/colposc.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/dbridge.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/invchain.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/meclgate.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/nmosinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/pass.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/pullup.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/readme +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/recovery.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/rtlinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/serial/vco.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bjtnoise.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bsim1tst.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/bsim2tst.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/diffpair.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/diodisto.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_1.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_2.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/ltra_3.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mixdisto.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mos6inv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mosamp2.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/mosmem.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/pz2.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/pzt.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rc.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rca3040.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/resnoise.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/rtlinv.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/schmitt.cir +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spice3/simplepz.cir +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/spice3 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bicmos +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/bjt +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/diode +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/jfet +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/mos +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/parallel +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/resistor +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/serial +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrm share/cider/cider/helpdir +@dirrm share/cider/cider/scripts +@dirrm share/cider/cider +@dirrm share/cider/spice3/helpdir +@dirrm share/cider/spice3/scripts +@dirrm share/cider/spice3 @dirrm share/cider -%%PORTDOCS%%@dirrm share/examples/cider/bicmos -%%PORTDOCS%%@dirrm share/examples/cider/bjt -%%PORTDOCS%%@dirrm share/examples/cider/diode -%%PORTDOCS%%@dirrm share/examples/cider/jfet -%%PORTDOCS%%@dirrm share/examples/cider/mos -%%PORTDOCS%%@dirrm share/examples/cider/parallel -%%PORTDOCS%%@dirrm share/examples/cider/resistor -%%PORTDOCS%%@dirrm share/examples/cider/serial -%%PORTDOCS%%@dirrm share/examples/cider -%%PORTDOCS%%@dirrm share/examples/spice3 -@dirrm share/spice3/helpdir -@dirrm share/spice3/scripts -@dirrm share/spice3