4 files changed, 131 insertions, 228 deletions
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 218386578ac..2efacbac7c1 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2004/01/22 07:21:54 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:18:36 dmcmahill Exp $
 #
 
-DISTNAME=	gnucap-0.33
+DISTNAME=	gnucap-0.34
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_GNU:=gnucap/}
+MASTER_SITES=	http://www.gnucap.org/ \
+		http://www.geda.seul.org/dist/ \
+		http://www.kettering.edu/~adavis/gnucap/
 
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.geda.seul.org/tools/acs/index.html
 COMMENT=	General purpose circuit simulator
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
 
@@ -18,17 +22,18 @@ do-build:
 	@cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pkgsrc
 
 do-install:
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/*/gnucap ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnucap
 	${INSTALL_DATA} ${WRKSRC}/doc/acs-tutorial ${PREFIX}/share/doc/gnucap
-	${INSTALL_DATA} ${WRKSRC}/man/man.pdf ${PREFIX}/share/doc/gnucap
+	${INSTALL_DATA} ${WRKSRC}/man/gnucap-man.pdf ${PREFIX}/share/doc/gnucap
 	${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${PREFIX}/share/doc/gnucap
-	${INSTALL_DATA} ${WRKSRC}/man/man/* ${PREFIX}/share/doc/gnucap
+	${INSTALL_DATA} ${WRKSRC}/man/html/* ${PREFIX}/share/doc/gnucap
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnucap
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/gnucap
 
 do-test:
 	cd ${WRKSRC}/test && ./test ../src/*/gnucap "" 0001 ==
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnucap/PLIST b/cad/gnucap/PLIST
index 0193aa2cb9f..d27b204c163 100644
--- a/cad/gnucap/PLIST
+++ b/cad/gnucap/PLIST
@@ -1,190 +1,120 @@
-@comment $NetBSD: PLIST,v 1.3 2003/04/21 03:06:29 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/14 17:18:36 dmcmahill Exp $
 bin/gnucap
-share/doc/gnucap/WARNINGS
 share/doc/gnucap/acs-tutorial
-share/doc/gnucap/contents.png
-share/doc/gnucap/images.aux
-share/doc/gnucap/images.idx
-share/doc/gnucap/images.log
-share/doc/gnucap/images.pl
-share/doc/gnucap/images.tex,v
-share/doc/gnucap/img1.png
-share/doc/gnucap/img10.png
-share/doc/gnucap/img11.png
-share/doc/gnucap/img12.png
-share/doc/gnucap/img13.png
-share/doc/gnucap/img14.png
-share/doc/gnucap/img15.png
-share/doc/gnucap/img16.png
-share/doc/gnucap/img17.png
-share/doc/gnucap/img18.png
-share/doc/gnucap/img19.png
-share/doc/gnucap/img2.png
-share/doc/gnucap/img20.png
-share/doc/gnucap/img21.png
-share/doc/gnucap/img22.png
-share/doc/gnucap/img23.png
-share/doc/gnucap/img24.png
-share/doc/gnucap/img25.png
-share/doc/gnucap/img26.png
-share/doc/gnucap/img27.png
-share/doc/gnucap/img28.png
-share/doc/gnucap/img29.png
-share/doc/gnucap/img3.png
-share/doc/gnucap/img30.png
-share/doc/gnucap/img31.png
-share/doc/gnucap/img32.png
-share/doc/gnucap/img33.png
-share/doc/gnucap/img34.png
-share/doc/gnucap/img35.png
-share/doc/gnucap/img36.png
-share/doc/gnucap/img37.png
-share/doc/gnucap/img38.png
-share/doc/gnucap/img39.png
-share/doc/gnucap/img4.png
-share/doc/gnucap/img40.png
-share/doc/gnucap/img41.png
-share/doc/gnucap/img42.png
-share/doc/gnucap/img43.png
-share/doc/gnucap/img44.png
-share/doc/gnucap/img45.png
-share/doc/gnucap/img46.png
-share/doc/gnucap/img47.png
-share/doc/gnucap/img48.png
-share/doc/gnucap/img49.png
-share/doc/gnucap/img5.png
-share/doc/gnucap/img50.png
-share/doc/gnucap/img51.png
-share/doc/gnucap/img52.png
-share/doc/gnucap/img53.png
-share/doc/gnucap/img54.png
-share/doc/gnucap/img6.png
-share/doc/gnucap/img7.png
-share/doc/gnucap/img8.png
-share/doc/gnucap/img9.png
+share/doc/gnucap/gnucap-man.hidx
+share/doc/gnucap/gnucap-man.hind
+share/doc/gnucap/gnucap-man.pdf
+share/doc/gnucap/gnucap-man001.html
+share/doc/gnucap/gnucap-man002.html
+share/doc/gnucap/gnucap-man003.html
+share/doc/gnucap/gnucap-man004.html
+share/doc/gnucap/gnucap-man005.html
+share/doc/gnucap/gnucap-man006.html
+share/doc/gnucap/gnucap-man007.html
+share/doc/gnucap/gnucap-man008.html
+share/doc/gnucap/gnucap-man009.html
+share/doc/gnucap/gnucap-man010.html
+share/doc/gnucap/gnucap-man011.html
+share/doc/gnucap/gnucap-man012.html
+share/doc/gnucap/gnucap-man013.html
+share/doc/gnucap/gnucap-man014.html
+share/doc/gnucap/gnucap-man015.html
+share/doc/gnucap/gnucap-man016.html
+share/doc/gnucap/gnucap-man017.html
+share/doc/gnucap/gnucap-man018.html
+share/doc/gnucap/gnucap-man019.html
+share/doc/gnucap/gnucap-man020.html
+share/doc/gnucap/gnucap-man021.html
+share/doc/gnucap/gnucap-man022.html
+share/doc/gnucap/gnucap-man023.html
+share/doc/gnucap/gnucap-man024.html
+share/doc/gnucap/gnucap-man025.html
+share/doc/gnucap/gnucap-man026.html
+share/doc/gnucap/gnucap-man027.html
+share/doc/gnucap/gnucap-man028.html
+share/doc/gnucap/gnucap-man029.html
+share/doc/gnucap/gnucap-man030.html
+share/doc/gnucap/gnucap-man031.html
+share/doc/gnucap/gnucap-man032.html
+share/doc/gnucap/gnucap-man033.html
+share/doc/gnucap/gnucap-man034.html
+share/doc/gnucap/gnucap-man035.html
+share/doc/gnucap/gnucap-man036.html
+share/doc/gnucap/gnucap-man037.html
+share/doc/gnucap/gnucap-man038.html
+share/doc/gnucap/gnucap-man039.html
+share/doc/gnucap/gnucap-man040.html
+share/doc/gnucap/gnucap-man041.html
+share/doc/gnucap/gnucap-man042.html
+share/doc/gnucap/gnucap-man043.html
+share/doc/gnucap/gnucap-man044.html
+share/doc/gnucap/gnucap-man045.html
+share/doc/gnucap/gnucap-man046.html
+share/doc/gnucap/gnucap-man047.html
+share/doc/gnucap/gnucap-man048.html
+share/doc/gnucap/gnucap-man049.html
+share/doc/gnucap/gnucap-man050.html
+share/doc/gnucap/gnucap-man051.html
+share/doc/gnucap/gnucap-man052.html
+share/doc/gnucap/gnucap-man053.html
+share/doc/gnucap/gnucap-man054.html
+share/doc/gnucap/gnucap-man055.html
+share/doc/gnucap/gnucap-man056.html
+share/doc/gnucap/gnucap-man057.html
+share/doc/gnucap/gnucap-man058.html
+share/doc/gnucap/gnucap-man059.html
+share/doc/gnucap/gnucap-man060.html
+share/doc/gnucap/gnucap-man061.html
+share/doc/gnucap/gnucap-man062.html
+share/doc/gnucap/gnucap-man063.html
+share/doc/gnucap/gnucap-man064.html
+share/doc/gnucap/gnucap-man065.html
+share/doc/gnucap/gnucap-man066.html
+share/doc/gnucap/gnucap-man067.html
+share/doc/gnucap/gnucap-man068.html
+share/doc/gnucap/gnucap-man069.html
+share/doc/gnucap/gnucap-man070.html
+share/doc/gnucap/gnucap-man071.html
+share/doc/gnucap/gnucap-man072.html
+share/doc/gnucap/gnucap-man073.html
+share/doc/gnucap/gnucap-man074.html
+share/doc/gnucap/gnucap-man075.html
+share/doc/gnucap/gnucap-man076.html
+share/doc/gnucap/gnucap-man077.html
+share/doc/gnucap/gnucap-man078.html
+share/doc/gnucap/gnucap-man079.html
+share/doc/gnucap/gnucap-man080.html
+share/doc/gnucap/gnucap-man081.html
+share/doc/gnucap/gnucap-man082.html
+share/doc/gnucap/gnucap-man083.html
+share/doc/gnucap/gnucap-man084.html
+share/doc/gnucap/gnucap-man085.html
+share/doc/gnucap/gnucap-man086.html
+share/doc/gnucap/gnucap-man087.html
+share/doc/gnucap/gnucap-man088.html
+share/doc/gnucap/gnucap-man089.html
+share/doc/gnucap/gnucap-man090.html
+share/doc/gnucap/gnucap-man091.html
+share/doc/gnucap/gnucap-man092.html
+share/doc/gnucap/gnucap-man093.html
+share/doc/gnucap/gnucap-man094.html
+share/doc/gnucap/gnucap-man095.html
+share/doc/gnucap/gnucap-man096.html
+share/doc/gnucap/gnucap-man097.html
+share/doc/gnucap/gnucap-man098.html
+share/doc/gnucap/gnucap-man099.html
+share/doc/gnucap/gnucap-man100.html
+share/doc/gnucap/gnucap-man101.html
+share/doc/gnucap/gnucap-man102.html
+share/doc/gnucap/gnucap-man103.html
+share/doc/gnucap/gnucap-man104.html
+share/doc/gnucap/gnucap-man105.html
+share/doc/gnucap/gnucap-man106.html
+share/doc/gnucap/gnucap-man107.html
+share/doc/gnucap/gnucap-man108.html
+share/doc/gnucap/gnucap-man109.html
+share/doc/gnucap/gnucap-man110.html
 share/doc/gnucap/index.html
-share/doc/gnucap/labels.pl
-share/doc/gnucap/man.css
-share/doc/gnucap/man.html
-share/doc/gnucap/man.pdf
-share/doc/gnucap/next.png
-share/doc/gnucap/next_g.png
-share/doc/gnucap/node1.html
-share/doc/gnucap/node10.html
-share/doc/gnucap/node100.html
-share/doc/gnucap/node101.html
-share/doc/gnucap/node102.html
-share/doc/gnucap/node103.html
-share/doc/gnucap/node104.html
-share/doc/gnucap/node105.html
-share/doc/gnucap/node106.html
-share/doc/gnucap/node107.html
-share/doc/gnucap/node108.html
-share/doc/gnucap/node109.html
-share/doc/gnucap/node110.html
-share/doc/gnucap/node111.html
-share/doc/gnucap/node112.html
-share/doc/gnucap/node11.html
-share/doc/gnucap/node12.html
-share/doc/gnucap/node13.html
-share/doc/gnucap/node14.html
-share/doc/gnucap/node15.html
-share/doc/gnucap/node16.html
-share/doc/gnucap/node17.html
-share/doc/gnucap/node18.html
-share/doc/gnucap/node19.html
-share/doc/gnucap/node2.html
-share/doc/gnucap/node20.html
-share/doc/gnucap/node21.html
-share/doc/gnucap/node22.html
-share/doc/gnucap/node23.html
-share/doc/gnucap/node24.html
-share/doc/gnucap/node25.html
-share/doc/gnucap/node26.html
-share/doc/gnucap/node27.html
-share/doc/gnucap/node28.html
-share/doc/gnucap/node29.html
-share/doc/gnucap/node3.html
-share/doc/gnucap/node30.html
-share/doc/gnucap/node31.html
-share/doc/gnucap/node32.html
-share/doc/gnucap/node33.html
-share/doc/gnucap/node34.html
-share/doc/gnucap/node35.html
-share/doc/gnucap/node36.html
-share/doc/gnucap/node37.html
-share/doc/gnucap/node38.html
-share/doc/gnucap/node39.html
-share/doc/gnucap/node4.html
-share/doc/gnucap/node40.html
-share/doc/gnucap/node41.html
-share/doc/gnucap/node42.html
-share/doc/gnucap/node43.html
-share/doc/gnucap/node44.html
-share/doc/gnucap/node45.html
-share/doc/gnucap/node46.html
-share/doc/gnucap/node47.html
-share/doc/gnucap/node48.html
-share/doc/gnucap/node49.html
-share/doc/gnucap/node5.html
-share/doc/gnucap/node50.html
-share/doc/gnucap/node51.html
-share/doc/gnucap/node52.html
-share/doc/gnucap/node53.html
-share/doc/gnucap/node54.html
-share/doc/gnucap/node55.html
-share/doc/gnucap/node56.html
-share/doc/gnucap/node57.html
-share/doc/gnucap/node58.html
-share/doc/gnucap/node59.html
-share/doc/gnucap/node6.html
-share/doc/gnucap/node60.html
-share/doc/gnucap/node61.html
-share/doc/gnucap/node62.html
-share/doc/gnucap/node63.html
-share/doc/gnucap/node64.html
-share/doc/gnucap/node65.html
-share/doc/gnucap/node66.html
-share/doc/gnucap/node67.html
-share/doc/gnucap/node68.html
-share/doc/gnucap/node69.html
-share/doc/gnucap/node7.html
-share/doc/gnucap/node70.html
-share/doc/gnucap/node71.html
-share/doc/gnucap/node72.html
-share/doc/gnucap/node73.html
-share/doc/gnucap/node74.html
-share/doc/gnucap/node75.html
-share/doc/gnucap/node76.html
-share/doc/gnucap/node77.html
-share/doc/gnucap/node78.html
-share/doc/gnucap/node79.html
-share/doc/gnucap/node8.html
-share/doc/gnucap/node80.html
-share/doc/gnucap/node81.html
-share/doc/gnucap/node82.html
-share/doc/gnucap/node83.html
-share/doc/gnucap/node84.html
-share/doc/gnucap/node85.html
-share/doc/gnucap/node86.html
-share/doc/gnucap/node87.html
-share/doc/gnucap/node88.html
-share/doc/gnucap/node89.html
-share/doc/gnucap/node9.html
-share/doc/gnucap/node90.html
-share/doc/gnucap/node91.html
-share/doc/gnucap/node92.html
-share/doc/gnucap/node93.html
-share/doc/gnucap/node94.html
-share/doc/gnucap/node95.html
-share/doc/gnucap/node96.html
-share/doc/gnucap/node97.html
-share/doc/gnucap/node98.html
-share/doc/gnucap/node99.html
-share/doc/gnucap/prev.png
-share/doc/gnucap/prev_g.png
-share/doc/gnucap/up.png
-share/doc/gnucap/up_g.png
 share/doc/gnucap/whatisit
 share/examples/gnucap/README
 share/examples/gnucap/eq.doc
@@ -196,8 +126,8 @@ share/examples/gnucap/eq4-2305.ckt
 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/eq4-9217.tran.ckt
 share/examples/gnucap/eq5-.tran.ckt
 share/examples/gnucap/eq5-.tran.fast.ckt
 share/examples/gnucap/eq5-.tran.like-spice.ckt
@@ -223,5 +153,5 @@ share/examples/gnucap/opamp.doc
 share/examples/gnucap/runall
 share/examples/gnucap/runall.out
 share/examples/gnucap/sc18.ckt
-@dirrm share/doc/gnucap
 @dirrm share/examples/gnucap
+@dirrm share/doc/gnucap
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 8345c93017b..87bfc8440d1 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/11/08 00:54:22 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2004/02/14 17:18:36 dmcmahill Exp $
 
-SHA1 (gnucap-0.33.tar.gz) = 67fe6ccc4e16807d842c5f0377b66a16c2904edf
-Size (gnucap-0.33.tar.gz) = 1387565 bytes
+SHA1 (gnucap-0.34.tar.gz) = 2094c3b9d6bcc1c036ec2cef5ff35216da24868a
+Size (gnucap-0.34.tar.gz) = 1412004 bytes
 SHA1 (patch-aa) = 404d6f926f4985a7d117e1361e9c2c9cabd6323b
-SHA1 (patch-ab) = 519cd313b023be49ee19018d4eb88697fcb739e3
 SHA1 (patch-ac) = b87c6eb33b427a154b03802e7633048b4ed003ab
 SHA1 (patch-ad) = 58ddab0864cc950e39f46c2230da2280ab26e19c
diff --git a/cad/gnucap/patches/patch-ab b/cad/gnucap/patches/patch-ab
deleted file mode 100644
index 849fea647ec..00000000000
--- a/cad/gnucap/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$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());
- }