From b9f7b65c941ddc8170d29122151e8a06de47ecba Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Sun, 28 Feb 2010 18:00:19 +0000 Subject: Update to version 20. ---------------- Release 20 ---------------- * Fixes: model names starting with a number (1n4001) are now correctly parsed. The .global command has been reinstated (it was previously disabled) and error messages now display the corresponding line numberin the input deck. * New Features: .measure command for transient, ac and dc analyses (still not complete, e.g. DERIV is missing). * Devices: Updated BISM4 model to revision 4.6.5. Added PWL (PieceWise Linear) functionality for B (arbitrary generator) sources. ---------------- Release 19 ---------------- Reveals an important work in compile scripts, many bug fixes in memory management, interface, and work in device models. * Compile scripts: tclspice and ADMS compiling fixes. Architecture compiling fixes for SunOS, MS Visual Studio, MINGW, Cygwin. * Memory management: fixed memory leaks, modifies memory management for MS Windos, integration of espice bugfixes and enhancements, bug fixes in plots and cli interface. * Rework of BSim models, integration of EPFL-EKV model V2.63, ADMS models mextram, hicum0, hicum2. ---------------- Release 18 ---------------- Rework-18 is introduces several new features into ngspice. This is a major release that comes after more than three years. During the silent years ngspice developers worked in CVS to stabilize and introduce new features into the simulator. - Tclspice simulator library has been merged with ngspice. Now you can compile ngapice or tclspice by asserting a configure switch. See README.tcl - New options have been introduced: brief, listing, autostop and scale - Support for .lib file has been introduced. This allows the use of third party model libraries in ngspice. - .measure statements: avg, integ, rms, max, min, delay, param - .global statements t support for global nodes whose name is not expanded when flattening the netlist. - .func macros for inlining functions into netlists. - Improved the numparam library to support fully parametrized netlists. - BSIM model binning. - new multi-input gate VCVS using XSPICE extensions. --- cad/ng-spice/Makefile | 9 +++--- cad/ng-spice/PLIST | 16 +++++----- cad/ng-spice/distinfo | 20 +++--------- cad/ng-spice/patches/patch-aa | 13 -------- cad/ng-spice/patches/patch-ab | 32 ------------------- cad/ng-spice/patches/patch-ac | 72 ------------------------------------------- cad/ng-spice/patches/patch-ad | 13 -------- cad/ng-spice/patches/patch-ae | 12 -------- cad/ng-spice/patches/patch-af | 20 ------------ cad/ng-spice/patches/patch-ag | 14 --------- cad/ng-spice/patches/patch-ah | 15 --------- cad/ng-spice/patches/patch-ai | 13 -------- cad/ng-spice/patches/patch-aj | 13 -------- cad/ng-spice/patches/patch-ak | 13 ++++---- 14 files changed, 24 insertions(+), 251 deletions(-) delete mode 100644 cad/ng-spice/patches/patch-aa delete mode 100644 cad/ng-spice/patches/patch-ab delete mode 100644 cad/ng-spice/patches/patch-ac delete mode 100644 cad/ng-spice/patches/patch-ad delete mode 100644 cad/ng-spice/patches/patch-ae delete mode 100644 cad/ng-spice/patches/patch-af delete mode 100644 cad/ng-spice/patches/patch-ag delete mode 100644 cad/ng-spice/patches/patch-ah delete mode 100644 cad/ng-spice/patches/patch-ai delete mode 100644 cad/ng-spice/patches/patch-aj diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index e703898837f..0c751761ba3 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2009/05/20 00:58:07 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2010/02/28 18:00:19 dmcmahill Exp $ # -DISTNAME= ng-spice-rework-17 -PKGNAME= ng-spice-17 -PKGREVISION= 3 +DISTNAME= ng-spice-rework-20 +PKGNAME= ng-spice-20 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngspice/} @@ -13,7 +12,7 @@ COMMENT= Next generation circuit simulation program PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/ng-spice-rework-17 +WRKSRC= ${WRKDIR}/ngspice-20 USE_LIBTOOL= YES USE_TOOLS+= gmake makeinfo USE_GNU_READLINE= uses rl_* interface diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST index 08e35f7e667..a1477444cd3 100644 --- a/cad/ng-spice/PLIST +++ b/cad/ng-spice/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.10 2009/06/14 17:35:55 joerg Exp $ -bin/nghelp +@comment $NetBSD: PLIST,v 1.11 2010/02/28 18:00:19 dmcmahill Exp $ +@comment bin/nghelp bin/ngmakeidx bin/ngmultidec bin/ngnutmeg @@ -7,12 +7,12 @@ bin/ngproc2mod bin/ngsconvert bin/ngspice info/ngspice.info -lib/ng-spice-rework/libbsim4.a +man/man1/ngmultidec.1 man/man1/ngnutmeg.1 man/man1/ngsconvert.1 man/man1/ngspice.1 -share/ng-spice-rework/helpdir/ngspice.idx -share/ng-spice-rework/helpdir/ngspice.txt -share/ng-spice-rework/scripts/setplot -share/ng-spice-rework/scripts/spectrum -share/ng-spice-rework/scripts/spinit +share/ngspice/helpdir/ngspice.idx +share/ngspice/helpdir/ngspice.txt +share/ngspice/scripts/setplot +share/ngspice/scripts/spectrum +share/ngspice/scripts/spinit diff --git a/cad/ng-spice/distinfo b/cad/ng-spice/distinfo index 107a67b02a2..2e877502b47 100644 --- a/cad/ng-spice/distinfo +++ b/cad/ng-spice/distinfo @@ -1,16 +1,6 @@ -$NetBSD: distinfo,v 1.12 2006/10/11 05:03:49 dmcmahill Exp $ +$NetBSD: distinfo,v 1.13 2010/02/28 18:00:19 dmcmahill Exp $ -SHA1 (ng-spice-rework-17.tar.gz) = 5ce17a6dff309fae069e0b1e7309eb1c16b4671b -RMD160 (ng-spice-rework-17.tar.gz) = 2345cbdb608bfb182d33c1a6497408b22acffb77 -Size (ng-spice-rework-17.tar.gz) = 5919637 bytes -SHA1 (patch-aa) = 2a6706d4ab993b7145307d4cb65a3dc1f1b63147 -SHA1 (patch-ab) = 7c35038ded76ef434572019371af3a3476746501 -SHA1 (patch-ac) = fd7d99226ec6c1b56a0653a15114c726e12d71ef -SHA1 (patch-ad) = b6d65b7edc4e17180687a8a46573a14615937330 -SHA1 (patch-ae) = 0a238d948c3cafeeda9986c8798a03b213c3aa6f -SHA1 (patch-af) = d0b29fadc1c2ac56b0f0700e9c822ce9fcb96090 -SHA1 (patch-ag) = 4cc9952823421b57fffb512e6d50483f706a5211 -SHA1 (patch-ah) = f76c5c400ee588f482211997f2d405811b945518 -SHA1 (patch-ai) = 874de21ac028eeaf1eada3fa78563a2383d6b3f1 -SHA1 (patch-aj) = 6555ae3e2e8f8c63795334e192a6d7c149afc164 -SHA1 (patch-ak) = 934a1eab94881ed57a9116f69d4c72c921451a27 +SHA1 (ng-spice-rework-20.tar.gz) = 870d69b88d6cc0d83a8a0416a6782a4abd296de0 +RMD160 (ng-spice-rework-20.tar.gz) = 73eff9cd601253523816a7c8a93e88a795ce96bb +Size (ng-spice-rework-20.tar.gz) = 7167239 bytes +SHA1 (patch-ak) = c5c08a75b6d41eaad75ac121566dd1b289579a39 diff --git a/cad/ng-spice/patches/patch-aa b/cad/ng-spice/patches/patch-aa deleted file mode 100644 index 723713deafa..00000000000 --- a/cad/ng-spice/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/frontend/com_shell.c.orig 2005-05-30 20:28:30.000000000 +0000 -+++ src/frontend/com_shell.c -@@ -8,7 +8,7 @@ - #include - - #include "com_shell.h" -- -+#include "cpextern.h" - - /* Fork a shell. */ - diff --git a/cad/ng-spice/patches/patch-ab b/cad/ng-spice/patches/patch-ab deleted file mode 100644 index 69d43bb7842..00000000000 --- a/cad/ng-spice/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/Makefile.am.orig 2005-05-20 11:28:03.000000000 +0000 -+++ src/Makefile.am -@@ -3,7 +3,7 @@ - SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ - DIST_SUBDIRS = misc maths frontend spicelib include xspice ciderlib - --bin_PROGRAMS = ngspice ngnutmeg nghelp makeidx -+bin_PROGRAMS = ngspice ngnutmeg nghelp ngmakeidx - - if !WINDOWS - bin_PROGRAMS += ngsconvert ngproc2mod ngmultidec -@@ -185,14 +185,14 @@ ngmultidec_LDADD = \ - - endif !WINDOWS - --## makeidx: -+## ngmakeidx: - --makeidx_SOURCES = makeidx.c -+ngmakeidx_SOURCES = makeidx.c - - ## create index for online help: - --ngspice.idx: makeidx -- ./makeidx $(srcdir)/ngspice.txt -+ngspice.idx: ngmakeidx -+ ./ngmakeidx $(srcdir)/ngspice.txt - - - ## General Includes and libraries: diff --git a/cad/ng-spice/patches/patch-ac b/cad/ng-spice/patches/patch-ac deleted file mode 100644 index 1d3a1bbec6c..00000000000 --- a/cad/ng-spice/patches/patch-ac +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ac,v 1.5 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/Makefile.in.orig 2005-08-30 07:58:00.000000000 +0000 -+++ src/Makefile.in -@@ -38,7 +38,7 @@ POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ - bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \ -- makeidx$(EXEEXT) $(am__EXEEXT_1) -+ ngmakeidx$(EXEEXT) $(am__EXEEXT_1) - @WINDOWS_FALSE@am__append_1 = ngsconvert ngproc2mod ngmultidec - @WINDOWS_TRUE@am__append_2 = winmain.c - @WINDOWS_TRUE@am__append_3 = winmain.c -@@ -59,9 +59,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" - "$(DESTDIR)$(initdatadir)" - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - PROGRAMS = $(bin_PROGRAMS) --am_makeidx_OBJECTS = makeidx.$(OBJEXT) --makeidx_OBJECTS = $(am_makeidx_OBJECTS) --makeidx_LDADD = $(LDADD) -+am_ngmakeidx_OBJECTS = makeidx.$(OBJEXT) -+ngmakeidx_OBJECTS = $(am_ngmakeidx_OBJECTS) -+ngmakeidx_LDADD = $(LDADD) - am__nghelp_SOURCES_DIST = conf.c nghelp.c winmain.c - @WINDOWS_TRUE@am__objects_1 = winmain.$(OBJEXT) - am_nghelp_OBJECTS = conf.$(OBJEXT) nghelp.$(OBJEXT) $(am__objects_1) -@@ -151,10 +151,10 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ -+SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ - $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) \ - $(ngsconvert_SOURCES) $(ngspice_SOURCES) --DIST_SOURCES = $(makeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \ -+DIST_SOURCES = $(ngmakeidx_SOURCES) $(am__nghelp_SOURCES_DIST) \ - $(am__ngmultidec_SOURCES_DIST) $(am__ngnutmeg_SOURCES_DIST) \ - $(am__ngproc2mod_SOURCES_DIST) $(am__ngsconvert_SOURCES_DIST) \ - $(am__ngspice_SOURCES_DIST) -@@ -427,7 +427,7 @@ nghelp_LDADD = \ - @WINDOWS_FALSE@ maths/sparse/libsparse.a \ - @WINDOWS_FALSE@ misc/libmisc.a - --makeidx_SOURCES = makeidx.c -+ngmakeidx_SOURCES = makeidx.c - INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ - MAINTAINERCLEANFILES = Makefile.in - all: all-recursive -@@ -493,9 +493,9 @@ clean-binPROGRAMS: - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done --makeidx$(EXEEXT): $(makeidx_OBJECTS) $(makeidx_DEPENDENCIES) -- @rm -f makeidx$(EXEEXT) -- $(LINK) $(makeidx_LDFLAGS) $(makeidx_OBJECTS) $(makeidx_LDADD) $(LIBS) -+ngmakeidx$(EXEEXT): $(ngmakeidx_OBJECTS) $(ngmakeidx_DEPENDENCIES) -+ @rm -f ngmakeidx$(EXEEXT) -+ $(LINK) $(ngmakeidx_LDFLAGS) $(ngmakeidx_OBJECTS) $(ngmakeidx_LDADD) $(LIBS) - nghelp$(EXEEXT): $(nghelp_OBJECTS) $(nghelp_DEPENDENCIES) - @rm -f nghelp$(EXEEXT) - $(LINK) $(nghelp_LDFLAGS) $(nghelp_OBJECTS) $(nghelp_LDADD) $(LIBS) -@@ -881,8 +881,8 @@ winmain.o: winmain.c - spice.o: main.c - $(COMPILE) -DSIMULATOR -o spice.o -c $(srcdir)/main.c - --ngspice.idx: makeidx -- ./makeidx $(srcdir)/ngspice.txt -+ngspice.idx: ngmakeidx -+ ./ngmakeidx $(srcdir)/ngspice.txt - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/cad/ng-spice/patches/patch-ad b/cad/ng-spice/patches/patch-ad deleted file mode 100644 index 8474b9c7802..00000000000 --- a/cad/ng-spice/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/frontend/terminal.c.orig 2001-04-22 10:08:46.000000000 +0000 -+++ src/frontend/terminal.c -@@ -27,6 +27,8 @@ Author: 1986 Wayne A. Christopher, U. C. - #include - #endif - -+#include -+ - #include - #include - diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae deleted file mode 100644 index cca022663ae..00000000000 --- a/cad/ng-spice/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.6 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/makeidx.c.orig 2005-05-19 15:21:59.000000000 +0000 -+++ src/makeidx.c -@@ -5,6 +5,7 @@ Copyright 1990 Regents of the University - /* from FILENAME.txt, make FILENAME.idx */ - - #include -+#include - #include - #include "cpdefs.h" - #include "hlpdefs.h" diff --git a/cad/ng-spice/patches/patch-af b/cad/ng-spice/patches/patch-af deleted file mode 100644 index 11902d72251..00000000000 --- a/cad/ng-spice/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.3 2005/11/17 13:17:56 dmcmahill Exp $ - ---- doc/ngspice.texi.orig 2005-08-15 22:24:58.000000000 +0000 -+++ doc/ngspice.texi -@@ -3,6 +3,15 @@ - @c %**start of header - @setfilename ngspice.info - @include version.texi -+@format -+INFO-DIR-SECTION Simulation -+START-INFO-DIR-ENTRY -+* Ngspice: (ngspice). General-purpose circuit simulation program for -+ nonlinear dc, nonlinear transient, and linear -+ ac analyses -+END-INFO-DIR-ENTRY -+@end format -+ - @settitle NGSPICE User Manual - @setchapternewpage odd - @c %**end of header diff --git a/cad/ng-spice/patches/patch-ag b/cad/ng-spice/patches/patch-ag deleted file mode 100644 index afac0ef0f4c..00000000000 --- a/cad/ng-spice/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/frontend/parse.h.orig 2005-05-26 19:29:52.000000000 +0000 -+++ src/frontend/parse.h -@@ -11,7 +11,9 @@ - #include - - struct pnode * ft_getpnames(wordlist *wl, bool check); -+#ifndef free_pnode - #define free_pnode(ptr) free_pnode_x(ptr); ptr=NULL; -+#endif - void free_pnode_x(struct pnode *t); - - diff --git a/cad/ng-spice/patches/patch-ah b/cad/ng-spice/patches/patch-ah deleted file mode 100644 index 28887a7eba4..00000000000 --- a/cad/ng-spice/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2005/11/17 13:17:56 dmcmahill Exp $ - ---- src/frontend/display.c.orig 2005-05-31 00:12:18.000000000 +0000 -+++ src/frontend/display.c -@@ -102,8 +102,9 @@ DISPDEVICE device[] = { - - DISPDEVICE *dispdev = device + NUMELEMS(device) - 1; - -+#ifndef XtNumber - #define XtNumber(arr) (sizeof(arr) / sizeof(arr[0])) -- -+#endif - - DISPDEVICE *FindDev(char *name) - { diff --git a/cad/ng-spice/patches/patch-ai b/cad/ng-spice/patches/patch-ai deleted file mode 100644 index b18473134a1..00000000000 --- a/cad/ng-spice/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2005/12/28 16:06:37 joerg Exp $ - ---- src/misc/missing_math.c.orig 2005-12-28 15:49:50.000000000 +0000 -+++ src/misc/missing_math.c -@@ -100,7 +100,7 @@ erfc(double x) - - - --#ifndef HAVE_ISNAN -+#if !defined(HAVE_ISNAN) && !defined(isnan) - /* isnan (originally) for SOI devices in MINGW32 hvogt (dev.c) */ - - union ieee754_double diff --git a/cad/ng-spice/patches/patch-aj b/cad/ng-spice/patches/patch-aj deleted file mode 100644 index 3e0b7ac3e38..00000000000 --- a/cad/ng-spice/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2005/12/28 16:06:37 joerg Exp $ - ---- src/misc/missing_math.h.orig 2005-12-28 15:49:19.000000000 +0000 -+++ src/misc/missing_math.h -@@ -20,7 +20,7 @@ double scalb(double, int); - # endif - #endif - --#ifndef HAVE_ISNAN -+#if !defined(HAVE_ISNAN) && !defined(isnan) - int isnan(double value); - #endif /* HAVE_ISNAN */ - diff --git a/cad/ng-spice/patches/patch-ak b/cad/ng-spice/patches/patch-ak index 36e99a79b45..e8c07513530 100644 --- a/cad/ng-spice/patches/patch-ak +++ b/cad/ng-spice/patches/patch-ak @@ -1,24 +1,25 @@ -$NetBSD: patch-ak,v 1.1 2006/10/11 05:03:49 dmcmahill Exp $ +$NetBSD: patch-ak,v 1.2 2010/02/28 18:00:19 dmcmahill Exp $ ---- src/frontend/aspice.c.orig 2005-05-30 16:28:30.000000000 -0400 +--- src/frontend/aspice.c.orig 2008-05-31 08:38:56.000000000 +0000 +++ src/frontend/aspice.c -@@ -168,14 +168,11 @@ sigchild(void) +@@ -177,15 +177,11 @@ sigchild(void) * whether the exit was normal or not. */ --#if defined(__NetBSD__) || defined(SOLARIS) +-#if defined(__NetBSD__) - pid_t status; --#elif defined(__FreeBSD__) || defined(__APPLE__) +-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(SOLARIS) - int status; -#else - union wait status; -#endif - +- +/* + * On posix systems, wait() is: + * pid_t wait(int *status); + */ +int status; - void + ft_checkkids(void) -- cgit v1.2.3