diff options
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/gnucap/Makefile | 15 | ||||
| -rw-r--r-- | cad/gnucap/PLIST | 9 | ||||
| -rw-r--r-- | cad/gnucap/distinfo | 9 | ||||
| -rw-r--r-- | cad/gnucap/patches/patch-aa | 34 | ||||
| -rw-r--r-- | cad/gnucap/patches/patch-ab | 31 |
5 files changed, 77 insertions, 21 deletions
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile index 00ab3004b42..0a08844d282 100644 --- a/cad/gnucap/Makefile +++ b/cad/gnucap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2002/03/29 02:24:42 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.3 2003/04/21 03:06:29 dmcmahill Exp $ # -DISTNAME= gnucap-0.31 +DISTNAME= gnucap-0.33 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GNU:=gnucap/} @@ -9,11 +9,13 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.geda.seul.org/tools/acs/index.html COMMENT= general purpose circuit simulator -USE_GMAKE= YES +USE_BUILDLINK2= YES +USE_GMAKE= YES +USE_GNU_READLINE= YES do-build: - cd ${WRKSRC}/modelgen && ${MAKE_PROGRAM} ${LOWER_OPSYS} - cd ${WRKSRC}/src && ${MAKE_PROGRAM} ${LOWER_OPSYS} + @cd ${WRKSRC}/modelgen && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${LOWER_OPSYS} + @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${LOWER_OPSYS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/*/gnucap ${PREFIX}/bin/ @@ -27,6 +29,7 @@ do-install: test: build cd ${WRKSRC}/test && ./test ../src/*/gnucap "" 0001 == 2>&1 | \ - tee ${WRKDIR}/test.log + ${TEE} ${WRKDIR}/test.log +.include "../../devel/readline/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gnucap/PLIST b/cad/gnucap/PLIST index 2dca28f689a..0193aa2cb9f 100644 --- a/cad/gnucap/PLIST +++ b/cad/gnucap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/03/29 02:24:42 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/04/21 03:06:29 dmcmahill Exp $ bin/gnucap share/doc/gnucap/WARNINGS share/doc/gnucap/acs-tutorial @@ -197,6 +197,13 @@ share/examples/gnucap/eq4-4609.ckt share/examples/gnucap/eq4-6913.ckt share/examples/gnucap/eq4-9217.ckt share/examples/gnucap/eq4-9217.tran.ckt +share/examples/gnucap/eq4-9217.tran-slow.ckt +share/examples/gnucap/eq5-.tran.ckt +share/examples/gnucap/eq5-.tran.fast.ckt +share/examples/gnucap/eq5-.tran.like-spice.ckt +share/examples/gnucap/eq5-.tran.slow.ckt +share/examples/gnucap/eq5-.tran.vfast.ckt +share/examples/gnucap/eq5-.tran.vvfast.ckt share/examples/gnucap/eqboost.ckt share/examples/gnucap/eqflat.ckt share/examples/gnucap/eqmodify.ckt diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo index ddfcf75bddb..92fff048aba 100644 --- a/cad/gnucap/distinfo +++ b/cad/gnucap/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/03/29 02:24:42 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2003/04/21 03:06:29 dmcmahill Exp $ -SHA1 (gnucap-0.31.tar.gz) = d85cc1ab88e79210e850b991eac0d5f4cde6813e -Size (gnucap-0.31.tar.gz) = 1250595 bytes -SHA1 (patch-aa) = af391bd5db0a367caed0e4891b842972ad9a29b7 +SHA1 (gnucap-0.33.tar.gz) = 67fe6ccc4e16807d842c5f0377b66a16c2904edf +Size (gnucap-0.33.tar.gz) = 1387565 bytes +SHA1 (patch-aa) = 404d6f926f4985a7d117e1361e9c2c9cabd6323b +SHA1 (patch-ab) = 519cd313b023be49ee19018d4eb88697fcb739e3 diff --git a/cad/gnucap/patches/patch-aa b/cad/gnucap/patches/patch-aa index 67ea5ac9553..24f8902c721 100644 --- a/cad/gnucap/patches/patch-aa +++ b/cad/gnucap/patches/patch-aa @@ -1,11 +1,25 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/11/15 02:58:50 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2003/04/21 03:06:30 dmcmahill Exp $ ---- src/md.h.orig Sat Jun 30 03:20:53 2001 -+++ src/md.h Thu Jul 5 06:40:14 2001 -@@ -46,5 +46,5 @@ - }; - /*--------------------------------------------------------------------------*/ --#if defined(__unix__) -+#if defined(__unix__) || defined(UNIX) - /* usual but non-standard collection of includes */ - #include <unistd.h> /* chdir, access, getcwd */ +--- src/Make2.g++.orig Wed Nov 6 02:47:55 2002 ++++ src/Make2.g++ +@@ -23,17 +23,17 @@ VPATH = .:.. + + # Standard base for g++. + +-CCC = g++ ++CCC = ${CXX} + + CCFLAGS = \ + -DHAS_READLINE \ +--DUNIX -O2 -DNDEBUG -I.. -I. -fno-exceptions -W ++-DUNIX ${CXXFLAGS} ${CPPFLAGS} -DNDEBUG -I.. -I. -fno-exceptions -W + + LIBS = \ + -lreadline -ltermcap \ + + +-LDFLAGS = ++#LDFLAGS = + + .SUFFIXES : .o .cc + .cc.o:; $(CCC) $(CCFLAGS) -c $< diff --git a/cad/gnucap/patches/patch-ab b/cad/gnucap/patches/patch-ab new file mode 100644 index 00000000000..849fea647ec --- /dev/null +++ b/cad/gnucap/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.1 2003/04/21 03:06:30 dmcmahill Exp $ + +--- src/bm_tanh.cc.orig Wed Nov 6 02:47:52 2002 ++++ src/bm_tanh.cc +@@ -65,13 +65,23 @@ void EVAL_BM_TANH::print(OMSTREAM& where + print_base(where); + } + /*--------------------------------------------------------------------------*/ ++const double LOGBIGBIG = log(BIGBIG); + void EVAL_BM_TANH::tr_eval(ELEMENT* d)const + { + double x = ioffset(d->_y0.x); + double aa = x * _gain/_limit; +- double cosine = cosh(aa); +- double f1 = _gain / (cosine*cosine); +- double f0 = _limit * tanh(aa); ++ double f1, f0; ++ {if (aa > LOGBIGBIG) { ++ f1 = 0; ++ f0 = _limit; ++ }else if (aa < -LOGBIGBIG) { ++ f1 = 0; ++ f0 = -_limit; ++ }else{ ++ double cosine = cosh(aa); ++ f1 = _gain / (cosine*cosine); ++ f0 = _limit * tanh(aa); ++ }} + d->_y0 = FPOLY1(x, f0, f1); + tr_final_adjust(&(d->_y0), d->f_is_value()); + } |