From 60d84daf3ac4a6a9bfdb1e64c89a30f84f4da139 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Thu, 2 Dec 2004 00:06:40 +0000 Subject: update to ng-spice-15 there have been many many bug fixes since the ng-spice-14. Notable updates include bug fixes in the bjt pole/zero code, updates to the bsim1,2,3 models, updated hsim model, updates the jfet model and much code cleanup. --- cad/ng-spice/Makefile | 15 +++++++----- cad/ng-spice/PLIST | 44 ++------------------------------- cad/ng-spice/distinfo | 17 +++++++------ cad/ng-spice/patches/patch-aa | 20 --------------- cad/ng-spice/patches/patch-ab | 29 +++++++++++----------- cad/ng-spice/patches/patch-ac | 57 ++++++++++++++++++++++++++----------------- cad/ng-spice/patches/patch-ad | 14 +++++------ cad/ng-spice/patches/patch-ae | 25 ++++++++----------- cad/ng-spice/patches/patch-af | 18 ++++++++++++++ cad/ng-spice/patches/patch-ag | 14 +++++++++++ 10 files changed, 118 insertions(+), 135 deletions(-) delete mode 100644 cad/ng-spice/patches/patch-aa create mode 100644 cad/ng-spice/patches/patch-af create mode 100644 cad/ng-spice/patches/patch-ag (limited to 'cad') diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index 45f2a0fd466..e035f4023af 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.22 2004/10/03 00:13:13 tv Exp $ +# $NetBSD: Makefile,v 1.23 2004/12/02 00:06:40 dmcmahill Exp $ # -DISTNAME= ng-spice-rework-14 -PKGNAME= ng-spice-14 -PKGREVISION= 2 +DISTNAME= ngspice-rework15 +PKGNAME= ng-spice-15 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngspice/} +EXTRACT_SUFX= .tgz MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://ngspice.sourceforge.net/ @@ -13,18 +13,21 @@ COMMENT= Next generation circuit simulation program CONFLICTS= spice-[0-9]* +WRKSRC= ${WRKDIR}/ng-spice-rework-15 USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +USE_GNU_TOOLS+= make +USE_GNU_READLINE= uses rl_* interface GNU_CONFIGURE= YES CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --with-readline LIBS+= ${LIBGETOPT} INFO_FILES= ngspice.info .include "../../devel/libgetopt/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" - +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST index b0761cd97cf..8d7f8978451 100644 --- a/cad/ng-spice/PLIST +++ b/cad/ng-spice/PLIST @@ -1,50 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:19 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/12/02 00:06:40 dmcmahill Exp $ bin/nghelp bin/ngmakeidx bin/ngmultidec -bin/ngspice bin/ngnutmeg bin/ngproc2mod bin/ngsconvert -lib/libdev.a -lib/ng-spice-rework/libasrc.la -lib/ng-spice-rework/libbjt.la -lib/ng-spice-rework/libbsim1.la -lib/ng-spice-rework/libbsim2.la -lib/ng-spice-rework/libbsim3.la -lib/ng-spice-rework/libbsim3soidd.la -lib/ng-spice-rework/libbsim3soifd.la -lib/ng-spice-rework/libbsim3soipd.la -lib/ng-spice-rework/libbsim3v1.la -lib/ng-spice-rework/libbsim3v2.la -lib/ng-spice-rework/libbsim4.la -lib/ng-spice-rework/libcap.la -lib/ng-spice-rework/libcccs.la -lib/ng-spice-rework/libccvs.la -lib/ng-spice-rework/libcsw.la -lib/ng-spice-rework/libdio.la -lib/ng-spice-rework/libhfet.la -lib/ng-spice-rework/libhfet2.la -lib/ng-spice-rework/libind.la -lib/ng-spice-rework/libisrc.la -lib/ng-spice-rework/libjfet.la -lib/ng-spice-rework/libjfet2.la -lib/ng-spice-rework/libltra.la -lib/ng-spice-rework/libmes.la -lib/ng-spice-rework/libmesa.la -lib/ng-spice-rework/libmos1.la -lib/ng-spice-rework/libmos2.la -lib/ng-spice-rework/libmos3.la -lib/ng-spice-rework/libmos6.la -lib/ng-spice-rework/libmos9.la -lib/ng-spice-rework/libres.la -lib/ng-spice-rework/libsoi3.la -lib/ng-spice-rework/libsw.la -lib/ng-spice-rework/libtra.la -lib/ng-spice-rework/liburc.la -lib/ng-spice-rework/libvccs.la -lib/ng-spice-rework/libvcvs.la -lib/ng-spice-rework/libvsrc.la +bin/ngspice man/man1/ngnutmeg.1 man/man1/ngsconvert.1 man/man1/ngspice.1 @@ -56,4 +17,3 @@ share/ng-spice-rework/scripts/spinit @dirrm share/ng-spice-rework/scripts @dirrm share/ng-spice-rework/helpdir @dirrm share/ng-spice-rework -@dirrm lib/ng-spice-rework diff --git a/cad/ng-spice/distinfo b/cad/ng-spice/distinfo index d8e30cbe3b2..fdf48ea311b 100644 --- a/cad/ng-spice/distinfo +++ b/cad/ng-spice/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.5 2003/06/27 10:18:55 seb Exp $ +$NetBSD: distinfo,v 1.6 2004/12/02 00:06:40 dmcmahill Exp $ -SHA1 (ng-spice-rework-14.tar.gz) = 4610d694dc0bacf4828ec480a88b7f89ba1140a0 -Size (ng-spice-rework-14.tar.gz) = 2762582 bytes -SHA1 (patch-aa) = c17bac29ddd4e1a682afc34a1216e795bb77eb74 -SHA1 (patch-ab) = 2537cf3f4afb96c2e79a4a2e4a7053e1def02a01 -SHA1 (patch-ac) = 54d879f5d82b535d4553705d5610e8694353e4cc -SHA1 (patch-ad) = 5061e4e3366a230600fba9a3f1d44c29bae6b78c -SHA1 (patch-ae) = 5d800d68b5d90e80193080201ffb8f64b7e69322 +SHA1 (ngspice-rework15.tgz) = 4b6674c3342b69c573fce16e727c6f498286c2ad +Size (ngspice-rework15.tgz) = 4813438 bytes +SHA1 (patch-ab) = 1bbe7b422c130aee4c3cb601afdf3d7b70b42012 +SHA1 (patch-ac) = e03f74c08f801094dab5a2c82ca3726c2623b312 +SHA1 (patch-ad) = 385430708a5cd73d1d709121613058e2d4189ea8 +SHA1 (patch-ae) = cacf17a97fa8edcb70a6f8b89ddb97657643afcc +SHA1 (patch-af) = 06bc6f9bbf08c28304e4c2eb786f3c7039c83a94 +SHA1 (patch-ag) = 524b9ae6ab3c8980f4649dd65d83db89360a2aa8 diff --git a/cad/ng-spice/patches/patch-aa b/cad/ng-spice/patches/patch-aa deleted file mode 100644 index 5cebffc305d..00000000000 --- a/cad/ng-spice/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $ - -update to reflect current reality - ---- src/conf.c.orig Mon Dec 10 15:21:11 2001 -+++ src/conf.c Thu Jan 24 10:13:59 2002 -@@ -6,5 +6,5 @@ - - char Spice_Version[ ] = VERSION; --char Spice_Notice[ ] = "Please submit bug-reports to: ng-spice-bugs@ieee.ing.uniroma1.it"; -+char Spice_Notice[ ] = "Please submit bug-reports to: ngspice-devel@lists.sourceforge.net"; - char Spice_Build_Date[ ] = NGSPICEBUILDDATE; - char *Spice_Exec_Dir = NGSPICEBINDIR; -@@ -13,5 +13,5 @@ - int AsciiRawFile = 0; - --char *Bug_Addr = "ng-spice-bugs@ieee.ing.uniroma1.it"; -+char *Bug_Addr = "ngspice-devel@lists.sourceforge.net"; - char *Spice_Host = ""; - char *Spiced_Log = ""; diff --git a/cad/ng-spice/patches/patch-ab b/cad/ng-spice/patches/patch-ab index 6db203f3d6d..55f3166a770 100644 --- a/cad/ng-spice/patches/patch-ab +++ b/cad/ng-spice/patches/patch-ab @@ -1,17 +1,18 @@ -$NetBSD: patch-ab,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.3 2004/12/02 00:06:40 dmcmahill Exp $ -remove conflict with cad/spice - ---- src/Makefile.am.orig Mon Dec 10 15:21:11 2001 -+++ src/Makefile.am Thu Jan 24 10:17:51 2002 -@@ -3,5 +3,5 @@ - SUBDIRS = misc maths frontend spicelib include +--- src/Makefile.am.orig Tue Jan 27 21:57:20 2004 ++++ src/Makefile.am +@@ -2,7 +2,7 @@ + + SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ -bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec makeidx +bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec ngmakeidx - EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum -@@ -148,9 +148,9 @@ + EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum @CIDERSCRIPTS@ + +@@ -166,14 +166,14 @@ ngmultidec_LDADD = \ + maths/sparse/libsparse.a \ misc/libmisc.a -## makeidx: @@ -20,14 +21,12 @@ remove conflict with cad/spice -makeidx_SOURCES = makeidx.c +ngmakeidx_SOURCES = makeidx.c --makeidx_LDADD = \ -+ngmakeidx_LDADD = \ - misc/libmisc.a - -@@ -158,5 +158,5 @@ + ## create index for online help: - all: +-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 index ea526493ec0..3301d7fdd7d 100644 --- a/cad/ng-spice/patches/patch-ac +++ b/cad/ng-spice/patches/patch-ac @@ -1,54 +1,62 @@ -$NetBSD: patch-ac,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.3 2004/12/02 00:06:40 dmcmahill Exp $ -reflect patch-ab change to src/Makefile.am - ---- src/Makefile.in.orig Thu Jan 24 07:27:13 2002 -+++ src/Makefile.in Thu Jan 24 10:17:16 2002 -@@ -80,5 +80,5 @@ - SUBDIRS = misc maths frontend spicelib include +--- src/Makefile.in.orig Wed Jan 28 00:25:46 2004 ++++ src/Makefile.in +@@ -106,7 +106,7 @@ YACC = @YACC@ + + SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ -bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec makeidx +bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec ngmakeidx - EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum -@@ -127,7 +127,7 @@ + EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum @CIDERSCRIPTS@ + +@@ -153,7 +153,7 @@ ngmultidec_SOURCES = ngmultidec.c + ngmultidec_LDADD = maths/sparse/libsparse.a misc/libmisc.a -makeidx_SOURCES = makeidx.c +ngmakeidx_SOURCES = makeidx.c --makeidx_LDADD = misc/libmisc.a -+ngmakeidx_LDADD = misc/libmisc.a + INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ - -@@ -142,5 +142,5 @@ +@@ -165,7 +165,7 @@ CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = spinit bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \ ngsconvert$(EXEEXT) ngproc2mod$(EXEEXT) ngmultidec$(EXEEXT) \ -makeidx$(EXEEXT) +ngmakeidx$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -204,7 +204,7 @@ + +@@ -233,10 +233,10 @@ ngproc2mod_LDFLAGS = + ngmultidec_OBJECTS = ngmultidec.$(OBJEXT) ngmultidec_DEPENDENCIES = maths/sparse/libsparse.a misc/libmisc.a ngmultidec_LDFLAGS = -makeidx_OBJECTS = makeidx.$(OBJEXT) --makeidx_DEPENDENCIES = misc/libmisc.a +-makeidx_LDADD = $(LDADD) +-makeidx_DEPENDENCIES = -makeidx_LDFLAGS = +ngmakeidx_OBJECTS = makeidx.$(OBJEXT) -+ngmakeidx_DEPENDENCIES = misc/libmisc.a ++ngmakeidx_LDADD = $(LDADD) ++ngmakeidx_DEPENDENCIES = +ngmakeidx_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -221,6 +221,6 @@ - TAR = tar - GZIP_ENV = --best + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -254,8 +254,8 @@ GZIP_ENV = --best + DEP_FILES = .deps/conf.P .deps/main.P .deps/makeidx.P .deps/nghelp.P \ + .deps/ngmultidec.P .deps/ngnutmeg.P .deps/ngproc2mod.P \ + .deps/ngsconvert.P .deps/ngspice.P -SOURCES = $(ngspice_SOURCES) $(ngnutmeg_SOURCES) $(nghelp_SOURCES) $(ngsconvert_SOURCES) $(ngproc2mod_SOURCES) $(ngmultidec_SOURCES) $(makeidx_SOURCES) -OBJECTS = $(ngspice_OBJECTS) $(ngnutmeg_OBJECTS) $(nghelp_OBJECTS) $(ngsconvert_OBJECTS) $(ngproc2mod_OBJECTS) $(ngmultidec_OBJECTS) $(makeidx_OBJECTS) +SOURCES = $(ngspice_SOURCES) $(ngnutmeg_SOURCES) $(nghelp_SOURCES) $(ngsconvert_SOURCES) $(ngproc2mod_SOURCES) $(ngmultidec_SOURCES) $(ngmakeidx_SOURCES) +OBJECTS = $(ngspice_OBJECTS) $(ngnutmeg_OBJECTS) $(nghelp_OBJECTS) $(ngsconvert_OBJECTS) $(ngproc2mod_OBJECTS) $(ngmultidec_OBJECTS) $(ngmakeidx_OBJECTS) all: all-redirect -@@ -328,7 +328,7 @@ + .SUFFIXES: +@@ -357,9 +357,9 @@ ngmultidec$(EXEEXT): $(ngmultidec_OBJECT + @rm -f ngmultidec$(EXEEXT) $(LINK) $(ngmultidec_LDFLAGS) $(ngmultidec_OBJECTS) $(ngmultidec_LDADD) $(LIBS) -makeidx$(EXEEXT): $(makeidx_OBJECTS) $(makeidx_DEPENDENCIES) @@ -59,10 +67,15 @@ reflect patch-ab change to src/Makefile.am + $(LINK) $(ngmakeidx_LDFLAGS) $(ngmakeidx_OBJECTS) $(ngmakeidx_LDADD) $(LIBS) install-helpdataDATA: $(helpdata_DATA) -@@ -574,5 +574,5 @@ + @$(NORMAL_INSTALL) +@@ -644,8 +644,8 @@ winmain.o: winmain.c + spice.o: main.c + $(COMPILE) -DSIMULATOR -o spice.o -c $(srcdir)/main.c - all: +-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. diff --git a/cad/ng-spice/patches/patch-ad b/cad/ng-spice/patches/patch-ad index d3f00df8f66..01a536020f7 100644 --- a/cad/ng-spice/patches/patch-ad +++ b/cad/ng-spice/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.3 2002/04/04 01:24:58 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.4 2004/12/02 00:06:40 dmcmahill Exp $ -only remove -g not all CFLAGS!! - ---- configure.orig Wed Apr 3 03:26:44 2002 -+++ configure Wed Apr 3 09:29:20 2002 -@@ -1311,5 +1311,5 @@ +--- configure.in.orig Wed Jan 28 00:07:29 2004 ++++ configure.in +@@ -160,7 +160,7 @@ fi + if test "$enable_debug" = "no"; then - echo "configure: warning: Removing debugging option!" 1>&2 + AC_MSG_WARN(Removing debugging option!) - CFLAGS=" " + CFLAGS="`echo $CFLAGS | sed 's;-g;;g'`" fi + diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae index f026615400c..526688f47aa 100644 --- a/cad/ng-spice/patches/patch-ae +++ b/cad/ng-spice/patches/patch-ae @@ -1,18 +1,13 @@ -$NetBSD: patch-ae,v 1.3 2003/06/27 10:18:55 seb Exp $ +$NetBSD: patch-ae,v 1.4 2004/12/02 00:06:40 dmcmahill Exp $ ---- doc/ngspice.info.orig 2001-12-10 20:26:23.000000000 +0000 -+++ doc/ngspice.info -@@ -1,6 +1,13 @@ - This is ngspice.info, produced by makeinfo version 4.0b from - ngspice.texi. +--- configure.orig Wed Jan 28 00:25:53 2004 ++++ configure +@@ -2986,7 +2986,7 @@ fi + if test "$enable_debug" = "no"; then + { echo "$as_me:$LINENO: WARNING: Removing debugging option!" >&5 + echo "$as_me: WARNING: Removing debugging option!" >&2;} +- CFLAGS=" " ++ CFLAGS="`echo $CFLAGS | sed 's;-g;;g'`" + fi -+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 -+ - This file documents NGSPICE. - Copyright 1996 The Regents of the University of California. diff --git a/cad/ng-spice/patches/patch-af b/cad/ng-spice/patches/patch-af new file mode 100644 index 00000000000..e8643ff2ec5 --- /dev/null +++ b/cad/ng-spice/patches/patch-af @@ -0,0 +1,18 @@ +$NetBSD: patch-af,v 1.1 2004/12/02 00:06:40 dmcmahill Exp $ + +--- doc/ngspice.texi.orig Sun Nov 2 14:16:21 2003 ++++ doc/ngspice.texi +@@ -6,6 +6,13 @@ + @c %**end of header + + @ifinfo ++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 ++ + This file documents NGSPICE. + + Copyright 1996 The Regents of the University of California. diff --git a/cad/ng-spice/patches/patch-ag b/cad/ng-spice/patches/patch-ag new file mode 100644 index 00000000000..7637437a42e --- /dev/null +++ b/cad/ng-spice/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2004/12/02 00:06:40 dmcmahill Exp $ + +--- src/spicelib/analysis/cktncdump.c.orig Sun Jan 11 18:38:20 2004 ++++ src/spicelib/analysis/cktncdump.c +@@ -4,7 +4,8 @@ Author: 1999 Alan Gillespie + **********/ + + #include "ngspice.h" +-#include "cktdefs.h" #include "suffix.h" ++#include "cktdefs.h" ++#include "suffix.h" + + void + CKTncDump(ckt) -- cgit v1.2.3