summaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2002-01-26 02:38:30 +0000
committerdmcmahill <dmcmahill>2002-01-26 02:38:30 +0000
commitb89b77a5d1b57943a755a63d58ee5dca836c3fea (patch)
tree57b8b889cab6d25af011086f1b7206a9257fca5e /cad
parentb83018595c11508745f1e30162174b341b39748b (diff)
downloadpkgsrc-b89b77a5d1b57943a755a63d58ee5dca836c3fea.tar.gz
update to ngspice-14
A pkgsrc specific change is that it no longer conflicts with the cad/spice package allowing both to be installed. From the NEWS file: This is a major release in terms of bug-fixes. Some enhancements have been included: BSIM4 model and support for EKV model. The source code for the latter must be obtained from EKV web site (see DEVICE for more info). To enable EKV support you have to obtain the code first and then use the configure switch "--enable-ekv".
Diffstat (limited to 'cad')
-rw-r--r--cad/ng-spice/Makefile12
-rw-r--r--cad/ng-spice/PLIST68
-rw-r--r--cad/ng-spice/distinfo14
-rw-r--r--cad/ng-spice/patches/patch-aa29
-rw-r--r--cad/ng-spice/patches/patch-ab41
-rw-r--r--cad/ng-spice/patches/patch-ac110
-rw-r--r--cad/ng-spice/patches/patch-ad11
-rw-r--r--cad/ng-spice/patches/patch-ae11
8 files changed, 182 insertions, 114 deletions
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index 7506e8d53da..df3a48db2a3 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 22:10:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/01/26 02:38:30 dmcmahill Exp $
#
-DISTNAME= ng-spice-rework-13
-PKGNAME= ng-spice-13
+DISTNAME= ng-spice-rework-14
+PKGNAME= ng-spice-14
CATEGORIES= cad
-MASTER_SITES= ftp://ieee.ing.uniroma1.it/pub/ng-spice/distribution/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngspice/}
MAINTAINER= dmcmahill@netbsd.org
-HOMEPAGE= http://ieee.ing.uniroma1.it/ngspice/
+HOMEPAGE= http://ngspice.sourceforge.net
COMMENT= Next generation circuit simulation program
-CONFLICTS+= spice-[0-9]*
-
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/cad/ng-spice/PLIST b/cad/ng-spice/PLIST
index 20b4ab19801..1fe4adf3766 100644
--- a/cad/ng-spice/PLIST
+++ b/cad/ng-spice/PLIST
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:48:44 zuntum Exp $
-bin/help
-bin/makeidx
-bin/multidec
+@comment $NetBSD: PLIST,v 1.2 2002/01/26 02:38:30 dmcmahill Exp $
+bin/nghelp
+bin/ngmakeidx
+bin/ngmultidec
bin/ngspice
-bin/nutmeg
-bin/proc2mod
-bin/sconvert
-bin/test_cx_j
-bin/test_cx_mag
-bin/test_cx_ph
+bin/ngnutmeg
+bin/ngproc2mod
+bin/ngsconvert
@unexec install-info --delete --info-dir=%D/info %D/info/ngspice.info
info/ngspice.info
info/ngspice.info-1
@@ -18,6 +15,7 @@ info/ngspice.info-4
info/ngspice.info-5
info/ngspice.info-6
info/ngspice.info-7
+info/ngspice.info-8
@exec install-info --info-dir=%D/info %D/info/ngspice.info
lib/libdev.a
lib/ng-spice-rework/libasrc.a
@@ -45,6 +43,21 @@ lib/ng-spice-rework/libbsim3.la
lib/ng-spice-rework/libbsim3.so
lib/ng-spice-rework/libbsim3.so.0
lib/ng-spice-rework/libbsim3.so.0.0
+lib/ng-spice-rework/libbsim3soidd.a
+lib/ng-spice-rework/libbsim3soidd.la
+lib/ng-spice-rework/libbsim3soidd.so
+lib/ng-spice-rework/libbsim3soidd.so.0
+lib/ng-spice-rework/libbsim3soidd.so.0.0
+lib/ng-spice-rework/libbsim3soifd.a
+lib/ng-spice-rework/libbsim3soifd.la
+lib/ng-spice-rework/libbsim3soifd.so
+lib/ng-spice-rework/libbsim3soifd.so.0
+lib/ng-spice-rework/libbsim3soifd.so.0.0
+lib/ng-spice-rework/libbsim3soipd.a
+lib/ng-spice-rework/libbsim3soipd.la
+lib/ng-spice-rework/libbsim3soipd.so
+lib/ng-spice-rework/libbsim3soipd.so.0
+lib/ng-spice-rework/libbsim3soipd.so.0.0
lib/ng-spice-rework/libbsim3v1.a
lib/ng-spice-rework/libbsim3v1.la
lib/ng-spice-rework/libbsim3v1.so
@@ -85,6 +98,16 @@ lib/ng-spice-rework/libdio.la
lib/ng-spice-rework/libdio.so
lib/ng-spice-rework/libdio.so.0
lib/ng-spice-rework/libdio.so.0.0
+lib/ng-spice-rework/libhfet.a
+lib/ng-spice-rework/libhfet.la
+lib/ng-spice-rework/libhfet.so
+lib/ng-spice-rework/libhfet.so.0
+lib/ng-spice-rework/libhfet.so.0.0
+lib/ng-spice-rework/libhfet2.a
+lib/ng-spice-rework/libhfet2.la
+lib/ng-spice-rework/libhfet2.so
+lib/ng-spice-rework/libhfet2.so.0
+lib/ng-spice-rework/libhfet2.so.0.0
lib/ng-spice-rework/libind.a
lib/ng-spice-rework/libind.la
lib/ng-spice-rework/libind.so
@@ -115,6 +138,11 @@ lib/ng-spice-rework/libmes.la
lib/ng-spice-rework/libmes.so
lib/ng-spice-rework/libmes.so.0
lib/ng-spice-rework/libmes.so.0.0
+lib/ng-spice-rework/libmesa.a
+lib/ng-spice-rework/libmesa.la
+lib/ng-spice-rework/libmesa.so
+lib/ng-spice-rework/libmesa.so.0
+lib/ng-spice-rework/libmesa.so.0.0
lib/ng-spice-rework/libmos1.a
lib/ng-spice-rework/libmos1.la
lib/ng-spice-rework/libmos1.so
@@ -135,11 +163,21 @@ lib/ng-spice-rework/libmos6.la
lib/ng-spice-rework/libmos6.so
lib/ng-spice-rework/libmos6.so.0
lib/ng-spice-rework/libmos6.so.0.0
+lib/ng-spice-rework/libmos9.a
+lib/ng-spice-rework/libmos9.la
+lib/ng-spice-rework/libmos9.so
+lib/ng-spice-rework/libmos9.so.0
+lib/ng-spice-rework/libmos9.so.0.0
lib/ng-spice-rework/libres.a
lib/ng-spice-rework/libres.la
lib/ng-spice-rework/libres.so
lib/ng-spice-rework/libres.so.0
lib/ng-spice-rework/libres.so.0.0
+lib/ng-spice-rework/libsoi3.a
+lib/ng-spice-rework/libsoi3.la
+lib/ng-spice-rework/libsoi3.so
+lib/ng-spice-rework/libsoi3.so.0
+lib/ng-spice-rework/libsoi3.so.0.0
lib/ng-spice-rework/libsw.a
lib/ng-spice-rework/libsw.la
lib/ng-spice-rework/libsw.so
@@ -170,11 +208,15 @@ lib/ng-spice-rework/libvsrc.la
lib/ng-spice-rework/libvsrc.so
lib/ng-spice-rework/libvsrc.so.0
lib/ng-spice-rework/libvsrc.so.0.0
-man/man1/nutmeg.1
-man/man1/sconvert.1
-man/man1/spice.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
+@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 1624797c3b9..ea1a59cbe7e 100644
--- a/cad/ng-spice/distinfo
+++ b/cad/ng-spice/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 16:27:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/01/26 02:38:30 dmcmahill Exp $
-SHA1 (ng-spice-rework-13.tar.gz) = 880efc5c9b423415871009aafe7944b775a846d7
-Size (ng-spice-rework-13.tar.gz) = 2042548 bytes
-SHA1 (patch-aa) = af4a43b289754876e5c4e41879cfc1c8111096e3
-SHA1 (patch-ab) = b927feffc851bf4c2010f17491edbcae166fc8a9
-SHA1 (patch-ac) = e4a58c57bb068fdc80240c34fca1a0ca5af5735b
-SHA1 (patch-ad) = 81e592affeddd42b6bb16e34849690e0574e76ce
-SHA1 (patch-ae) = e4431156381ff7135034cc90d69948b17fe0ab8a
+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
diff --git a/cad/ng-spice/patches/patch-aa b/cad/ng-spice/patches/patch-aa
index 9a01a49f2d2..5cebffc305d 100644
--- a/cad/ng-spice/patches/patch-aa
+++ b/cad/ng-spice/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/14 14:28:14 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $
---- src/include/ngspice.h.orig Sun Oct 15 03:48:57 2000
-+++ src/include/ngspice.h Sat Nov 11 12:20:12 2000
-@@ -13,4 +13,8 @@
- #include <stddef.h>
+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;
-+#ifdef HAVE_LIMITS_H
-+# include <machine/limits.h>
-+#endif
-+
- #include "memory.h"
- #include "defines.h"
+-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 2843a93451a..6db203f3d6d 100644
--- a/cad/ng-spice/patches/patch-ab
+++ b/cad/ng-spice/patches/patch-ab
@@ -1,10 +1,33 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/14 14:28:14 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $
---- ./src/maths/cmaths/test_cx_ph.c.orig Sun Oct 15 03:49:18 2000
-+++ ./src/maths/cmaths/test_cx_ph.c Sat Nov 11 13:04:33 2000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
- #include <math.h>
-+#include <float.h>
-
- #include <config.h>
+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
+
+-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 @@
+ misc/libmisc.a
+
+-## makeidx:
++## ngmakeidx:
+
+-makeidx_SOURCES = makeidx.c
++ngmakeidx_SOURCES = makeidx.c
+
+-makeidx_LDADD = \
++ngmakeidx_LDADD = \
+ misc/libmisc.a
+
+@@ -158,5 +158,5 @@
+
+ all:
+- ./makeidx $(srcdir)/ngspice.txt
++ ./ngmakeidx $(srcdir)/ngspice.txt
+
+
diff --git a/cad/ng-spice/patches/patch-ac b/cad/ng-spice/patches/patch-ac
index 7061368959c..ea526493ec0 100644
--- a/cad/ng-spice/patches/patch-ac
+++ b/cad/ng-spice/patches/patch-ac
@@ -1,46 +1,68 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/14 14:28:14 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/26 02:38:32 dmcmahill Exp $
---- src/frontend/parser/complete.c.orig Wed Oct 25 13:30:06 2000
-+++ src/frontend/parser/complete.c Sat Nov 11 13:56:56 2000
-@@ -415,4 +415,9 @@
- # ifdef HAVE_TERMIOS_H
-
-+# ifdef __NetBSD__
-+# define TCGETS
-+# define TCSETS
-+# endif
-+
- # define TERM_GET TCGETS
- # define TERM_SET TCSETS
-@@ -423,5 +428,5 @@
- # endif
-
--# ifdef TERM_GET
-+# if defined(TERM_GET) || defined(__NetBSD__)
- static bool ison = FALSE;
-
-@@ -431,12 +436,24 @@
-
- if (ison == TRUE) {
-+#ifdef __NetBSD__
-+ tcgetattr(fileno(cp_in),&OS_Buf);
-+#else
- (void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
-+#endif
- sbuf = OS_Buf;
- sbuf.c_cc[VEOF] = 0;
- sbuf.c_cc[VEOL] = ESCAPE;
- sbuf.c_cc[VEOL2] = CNTRL_D;
-+#ifdef __NetBSD__
-+ tcsetattr(fileno(cp_in),TCSANOW,&sbuf);
-+#else
- (void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
-+#endif
- } else {
-+#ifdef __NetBSD__
-+ tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf);
-+#else
- (void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
-+#endif
- }
+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
+
+-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 @@
+
+
+-makeidx_SOURCES = makeidx.c
++ngmakeidx_SOURCES = makeidx.c
+
+-makeidx_LDADD = misc/libmisc.a
++ngmakeidx_LDADD = misc/libmisc.a
+
+
+@@ -142,5 +142,5 @@
+ 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 @@
+ ngmultidec_DEPENDENCIES = maths/sparse/libsparse.a misc/libmisc.a
+ ngmultidec_LDFLAGS =
+-makeidx_OBJECTS = makeidx.$(OBJEXT)
+-makeidx_DEPENDENCIES = misc/libmisc.a
+-makeidx_LDFLAGS =
++ngmakeidx_OBJECTS = makeidx.$(OBJEXT)
++ngmakeidx_DEPENDENCIES = misc/libmisc.a
++ngmakeidx_LDFLAGS =
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -221,6 +221,6 @@
+ TAR = tar
+ GZIP_ENV = --best
+-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 @@
+ $(LINK) $(ngmultidec_LDFLAGS) $(ngmultidec_OBJECTS) $(ngmultidec_LDADD) $(LIBS)
+
+-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)
+
+ install-helpdataDATA: $(helpdata_DATA)
+@@ -574,5 +574,5 @@
+
+ all:
+- ./makeidx $(srcdir)/ngspice.txt
++ ./ngmakeidx $(srcdir)/ngspice.txt
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/cad/ng-spice/patches/patch-ad b/cad/ng-spice/patches/patch-ad
deleted file mode 100644
index 1d39fee79ea..00000000000
--- a/cad/ng-spice/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/14 14:28:14 dmcmahill Exp $
-
---- configure.in.orig Wed Nov 1 17:18:01 2000
-+++ configure.in Sat Nov 11 18:25:41 2000
-@@ -174,5 +174,5 @@
-
- AC_DEFINE_UNQUOTED(NGSPICEBINDIR, "`echo $dprefix/bin`" )
--AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice`" )
-+AC_DEFINE_UNQUOTED(NGSPICEDATADIR, "`echo $dprefix/share/ng-spice-rework`" )
- AC_DEFINE_UNQUOTED(NGSPICEBUILDDATE, "`date`" )
-
diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae
deleted file mode 100644
index 8c4f7eca12d..00000000000
--- a/cad/ng-spice/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/11/14 14:28:14 dmcmahill Exp $
-
---- configure.orig Sun Nov 5 12:25:24 2000
-+++ configure Sat Nov 11 18:27:40 2000
-@@ -4288,5 +4288,5 @@
-
- cat >> confdefs.h <<EOF
--#define NGSPICEDATADIR "`echo $dprefix/share/ng-spice`"
-+#define NGSPICEDATADIR "`echo $dprefix/share/ng-spice-rework`"
- EOF
-