update to gnucap-2006-07-08.

Many improvements since the last packaged version including, but not limited
to:

- enhanced transient timestep control algorithm which is significantly more
  accurate than spice now.

- enhanced compatibility with hspice netlists

- named nodes (as opposed to numbered only nodes) work now

- improvements to the bsim3v3 model support

- migration from a custom build system to a GNU autoconf/automake based build
  system.

12 files changed, 188 insertions, 347 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index e11f1f35f4a..626b6138b35 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/06/06 14:33:44 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/09 21:56:27 dmcmahill Exp $
 #
 
-DISTNAME=	gnucap-0.34
-PKGREVISION=	2
+DISTNAME=	gnucap-2006-07-08
 CATEGORIES=	cad
-MASTER_SITES=	http://www.gnucap.org/ \
-		http://www.geda.seul.org/dist/ \
-		http://www.kettering.edu/~adavis/gnucap/
+MASTER_SITES=	http://www.gnucap.org/devel/ \
+		http://www.geda.seul.org/dist/
 
 MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.gnucap.org/
@@ -17,25 +15,16 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 USE_GNU_READLINE=	YES
-INSTALLATION_DIRS=	bin
+GNU_CONFIGURE=		YES
+TEX_DEPMOD=		build
+TEX_ACCEPTED=		teTeX2 teTeX3
 
-do-build:
-	@cd ${WRKSRC}/modelgen && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pkgsrc
-	@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/gnucap-man.pdf ${PREFIX}/share/doc/gnucap
-	${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${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 ==
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/gnucap/manual/html
+	for f in ${WRKSRC}/man/html/*.html ${WRKSRC}/man/html/*.css ; do \
+		${INSTALL_DATA} $$f ${PREFIX}/share/gnucap/manual/html ; \
+	done
 
 .include "../../devel/readline/buildlink3.mk"
+.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnucap/PLIST b/cad/gnucap/PLIST
index d27b204c163..b3222150980 100644
--- a/cad/gnucap/PLIST
+++ b/cad/gnucap/PLIST
@@ -1,157 +1,172 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/14 17:18:36 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/07/09 21:56:27 dmcmahill Exp $
 bin/gnucap
-share/doc/gnucap/acs-tutorial
-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/whatisit
-share/examples/gnucap/README
-share/examples/gnucap/eq.doc
-share/examples/gnucap/eq2-145.ckt
-share/examples/gnucap/eq2-289.ckt
-share/examples/gnucap/eq2-577.ckt
-share/examples/gnucap/eq3-1153.ckt
-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-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
-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
-share/examples/gnucap/killzap.ckt
-share/examples/gnucap/killzap.doc
-share/examples/gnucap/nmos.doc
-share/examples/gnucap/nmos100.ckt
-share/examples/gnucap/nmos15.ckt
-share/examples/gnucap/nmos18.ckt
-share/examples/gnucap/nmos30.ckt
-share/examples/gnucap/nmosgen.c
-share/examples/gnucap/nmp100.ckt
-share/examples/gnucap/nmpgen.c
-share/examples/gnucap/opamp-ol.ckt
-share/examples/gnucap/opamp-vf.ckt
-share/examples/gnucap/opamp.doc
-share/examples/gnucap/runall
-share/examples/gnucap/runall.out
-share/examples/gnucap/sc18.ckt
-@dirrm share/examples/gnucap
-@dirrm share/doc/gnucap
+bin/gnucap-modelgen
+man/man1/gnucap-ibis.1
+man/man1/gnucap.1
+share/gnucap/doc/COPYING
+share/gnucap/doc/INSTALL
+share/gnucap/doc/acs-tutorial
+share/gnucap/doc/history
+share/gnucap/doc/relnotes.029
+share/gnucap/doc/relnotes.030
+share/gnucap/doc/relnotes.031
+share/gnucap/doc/relnotes.032
+share/gnucap/doc/relnotes.033
+share/gnucap/doc/relnotes.034
+share/gnucap/doc/whatisit
+share/gnucap/examples/README
+share/gnucap/examples/eq.doc
+share/gnucap/examples/eq2-145.ckt
+share/gnucap/examples/eq2-289.ckt
+share/gnucap/examples/eq2-577.ckt
+share/gnucap/examples/eq3-1153.ckt
+share/gnucap/examples/eq4-2305.ckt
+share/gnucap/examples/eq4-4609.ckt
+share/gnucap/examples/eq4-6913.ckt
+share/gnucap/examples/eq4-9217.ckt
+share/gnucap/examples/eq4-9217.tran-slow.ckt
+share/gnucap/examples/eq4-9217.tran.ckt
+share/gnucap/examples/eq5-.tran.ckt
+share/gnucap/examples/eq5-.tran.fast.ckt
+share/gnucap/examples/eq5-.tran.like-spice.ckt
+share/gnucap/examples/eq5-.tran.slow.ckt
+share/gnucap/examples/eq5-.tran.vfast.ckt
+share/gnucap/examples/eq5-.tran.vvfast.ckt
+share/gnucap/examples/eqboost.ckt
+share/gnucap/examples/eqflat.ckt
+share/gnucap/examples/eqmodify.ckt
+share/gnucap/examples/killzap.ckt
+share/gnucap/examples/killzap.doc
+share/gnucap/examples/nmos.doc
+share/gnucap/examples/nmos100.ckt
+share/gnucap/examples/nmos15.ckt
+share/gnucap/examples/nmos18.ckt
+share/gnucap/examples/nmos30.ckt
+share/gnucap/examples/nmosgen.c
+share/gnucap/examples/nmp100.ckt
+share/gnucap/examples/nmpgen.c
+share/gnucap/examples/opamp-ol.ckt
+share/gnucap/examples/opamp-vf.ckt
+share/gnucap/examples/opamp.doc
+share/gnucap/examples/runall
+share/gnucap/examples/runall.out
+share/gnucap/examples/sc18.ckt
+share/gnucap/manual/gnucap-man.dvi
+share/gnucap/manual/gnucap-man.pdf
+share/gnucap/manual/html/gnucap-man.css
+share/gnucap/manual/html/gnucap-man001.html
+share/gnucap/manual/html/gnucap-man002.html
+share/gnucap/manual/html/gnucap-man003.html
+share/gnucap/manual/html/gnucap-man004.html
+share/gnucap/manual/html/gnucap-man005.html
+share/gnucap/manual/html/gnucap-man006.html
+share/gnucap/manual/html/gnucap-man007.html
+share/gnucap/manual/html/gnucap-man008.html
+share/gnucap/manual/html/gnucap-man009.html
+share/gnucap/manual/html/gnucap-man010.html
+share/gnucap/manual/html/gnucap-man011.html
+share/gnucap/manual/html/gnucap-man012.html
+share/gnucap/manual/html/gnucap-man013.html
+share/gnucap/manual/html/gnucap-man014.html
+share/gnucap/manual/html/gnucap-man015.html
+share/gnucap/manual/html/gnucap-man016.html
+share/gnucap/manual/html/gnucap-man017.html
+share/gnucap/manual/html/gnucap-man018.html
+share/gnucap/manual/html/gnucap-man019.html
+share/gnucap/manual/html/gnucap-man020.html
+share/gnucap/manual/html/gnucap-man021.html
+share/gnucap/manual/html/gnucap-man022.html
+share/gnucap/manual/html/gnucap-man023.html
+share/gnucap/manual/html/gnucap-man024.html
+share/gnucap/manual/html/gnucap-man025.html
+share/gnucap/manual/html/gnucap-man026.html
+share/gnucap/manual/html/gnucap-man027.html
+share/gnucap/manual/html/gnucap-man028.html
+share/gnucap/manual/html/gnucap-man029.html
+share/gnucap/manual/html/gnucap-man030.html
+share/gnucap/manual/html/gnucap-man031.html
+share/gnucap/manual/html/gnucap-man032.html
+share/gnucap/manual/html/gnucap-man033.html
+share/gnucap/manual/html/gnucap-man034.html
+share/gnucap/manual/html/gnucap-man035.html
+share/gnucap/manual/html/gnucap-man036.html
+share/gnucap/manual/html/gnucap-man037.html
+share/gnucap/manual/html/gnucap-man038.html
+share/gnucap/manual/html/gnucap-man039.html
+share/gnucap/manual/html/gnucap-man040.html
+share/gnucap/manual/html/gnucap-man041.html
+share/gnucap/manual/html/gnucap-man042.html
+share/gnucap/manual/html/gnucap-man043.html
+share/gnucap/manual/html/gnucap-man044.html
+share/gnucap/manual/html/gnucap-man045.html
+share/gnucap/manual/html/gnucap-man046.html
+share/gnucap/manual/html/gnucap-man047.html
+share/gnucap/manual/html/gnucap-man048.html
+share/gnucap/manual/html/gnucap-man049.html
+share/gnucap/manual/html/gnucap-man050.html
+share/gnucap/manual/html/gnucap-man051.html
+share/gnucap/manual/html/gnucap-man052.html
+share/gnucap/manual/html/gnucap-man053.html
+share/gnucap/manual/html/gnucap-man054.html
+share/gnucap/manual/html/gnucap-man055.html
+share/gnucap/manual/html/gnucap-man056.html
+share/gnucap/manual/html/gnucap-man057.html
+share/gnucap/manual/html/gnucap-man058.html
+share/gnucap/manual/html/gnucap-man059.html
+share/gnucap/manual/html/gnucap-man060.html
+share/gnucap/manual/html/gnucap-man061.html
+share/gnucap/manual/html/gnucap-man062.html
+share/gnucap/manual/html/gnucap-man063.html
+share/gnucap/manual/html/gnucap-man064.html
+share/gnucap/manual/html/gnucap-man065.html
+share/gnucap/manual/html/gnucap-man066.html
+share/gnucap/manual/html/gnucap-man067.html
+share/gnucap/manual/html/gnucap-man068.html
+share/gnucap/manual/html/gnucap-man069.html
+share/gnucap/manual/html/gnucap-man070.html
+share/gnucap/manual/html/gnucap-man071.html
+share/gnucap/manual/html/gnucap-man072.html
+share/gnucap/manual/html/gnucap-man073.html
+share/gnucap/manual/html/gnucap-man074.html
+share/gnucap/manual/html/gnucap-man075.html
+share/gnucap/manual/html/gnucap-man076.html
+share/gnucap/manual/html/gnucap-man077.html
+share/gnucap/manual/html/gnucap-man078.html
+share/gnucap/manual/html/gnucap-man079.html
+share/gnucap/manual/html/gnucap-man080.html
+share/gnucap/manual/html/gnucap-man081.html
+share/gnucap/manual/html/gnucap-man082.html
+share/gnucap/manual/html/gnucap-man083.html
+share/gnucap/manual/html/gnucap-man084.html
+share/gnucap/manual/html/gnucap-man085.html
+share/gnucap/manual/html/gnucap-man086.html
+share/gnucap/manual/html/gnucap-man087.html
+share/gnucap/manual/html/gnucap-man088.html
+share/gnucap/manual/html/gnucap-man089.html
+share/gnucap/manual/html/gnucap-man090.html
+share/gnucap/manual/html/gnucap-man091.html
+share/gnucap/manual/html/gnucap-man092.html
+share/gnucap/manual/html/gnucap-man093.html
+share/gnucap/manual/html/gnucap-man094.html
+share/gnucap/manual/html/gnucap-man095.html
+share/gnucap/manual/html/gnucap-man096.html
+share/gnucap/manual/html/gnucap-man097.html
+share/gnucap/manual/html/gnucap-man098.html
+share/gnucap/manual/html/gnucap-man099.html
+share/gnucap/manual/html/gnucap-man100.html
+share/gnucap/manual/html/gnucap-man101.html
+share/gnucap/manual/html/gnucap-man102.html
+share/gnucap/manual/html/gnucap-man103.html
+share/gnucap/manual/html/gnucap-man104.html
+share/gnucap/manual/html/gnucap-man105.html
+share/gnucap/manual/html/gnucap-man106.html
+share/gnucap/manual/html/gnucap-man107.html
+share/gnucap/manual/html/gnucap-man108.html
+share/gnucap/manual/html/gnucap-man109.html
+share/gnucap/manual/html/gnucap-man110.html
+share/gnucap/manual/html/index.html
+@dirrm share/gnucap/manual/html
+@dirrm share/gnucap/manual
+@dirrm share/gnucap/examples
+@dirrm share/gnucap/doc
+@dirrm share/gnucap
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 6f35c585e0f..c4bc2ceb0ab 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,14 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/12/20 12:02:15 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/07/09 21:56:27 dmcmahill Exp $
 
-SHA1 (gnucap-0.34.tar.gz) = 2094c3b9d6bcc1c036ec2cef5ff35216da24868a
-RMD160 (gnucap-0.34.tar.gz) = 41661927ca5fc1b9ff358ada007c8ff5eb15c9cd
-Size (gnucap-0.34.tar.gz) = 1412004 bytes
-SHA1 (patch-aa) = 404d6f926f4985a7d117e1361e9c2c9cabd6323b
-SHA1 (patch-ab) = 62d69152ebeb23257cc08727bbe03ed9b1251469
-SHA1 (patch-ac) = b87c6eb33b427a154b03802e7633048b4ed003ab
-SHA1 (patch-ad) = 58ddab0864cc950e39f46c2230da2280ab26e19c
-SHA1 (patch-ae) = 1104114b205ed3d520ca56c39e453f82a18b1d52
-SHA1 (patch-af) = 07811937aa01335ef461a27dae4f7f36c959a46a
-SHA1 (patch-ag) = f40f5bdb386bb364cd7277d47ae8eaf1ff319539
-SHA1 (patch-ah) = 16a96aafa9cdc2c3354c90ea7a93ee912f82b179
-SHA1 (patch-ai) = 8bf5cf190e02026b52fb7d21b360681a0324fdc6
+SHA1 (gnucap-2006-07-08.tar.gz) = dafdfa1f78ee37b247066ccac7a2e63f99a7d8f0
+RMD160 (gnucap-2006-07-08.tar.gz) = 8006dffd189095b81dbf7358caacea870bc054df
+Size (gnucap-2006-07-08.tar.gz) = 1546670 bytes
diff --git a/cad/gnucap/patches/patch-aa b/cad/gnucap/patches/patch-aa
deleted file mode 100644
index 24f8902c721..00000000000
--- a/cad/gnucap/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/04/21 03:06:30 dmcmahill Exp $
-
---- 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
deleted file mode 100644
index 8f7600ff8e7..00000000000
--- a/cad/gnucap/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2005/12/20 12:02:15 joerg Exp $
-
---- modelgen/mg_.h.orig	2005-12-13 15:26:08.000000000 +0000
-+++ modelgen/mg_.h
-@@ -118,7 +118,7 @@ class List
- 	}
- 	T* p = new T(file);
- 	{if (!file.stuck(&here)) {
--	  _list.push_back(p);
-+	  this->_list.push_back(p);
- 	}else {
- 	  delete p;
- 	  file.warn(0, "not valid here");
-@@ -137,7 +137,7 @@ class Collection
-     int here = file.cursor();
-     T* m = new T(file);
-     {if (!file.stuck(&here)) {
--      _list.push_back(m);
-+      this->_list.push_back(m);
-     }else{
-       delete m;
-       file.warn(0, "what's this??");
diff --git a/cad/gnucap/patches/patch-ac b/cad/gnucap/patches/patch-ac
deleted file mode 100644
index 0b5eefe3b45..00000000000
--- a/cad/gnucap/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/11/08 00:54:22 dmcmahill Exp $
-
---- modelgen/Makefile.orig	2002-11-06 02:47:55.000000000 -0500
-+++ modelgen/Makefile
-@@ -77,6 +77,11 @@ netbsd: nothing
- 	cat Make1 Make2.g++ Make3 Make.depend >NETBSD/Makefile
- 	(cd NETBSD; ${MAKE} -k)
- #-----------------------------------------------------------------------------
-+pkgsrc: nothing
-+	-mkdir PKGSRC
-+	cat Make1 Make2.g++ Make3 Make.depend >PKGSRC/Makefile
-+	(cd PKGSRC; ${MAKE} -k)
-+#-----------------------------------------------------------------------------
- next: nothing
- 	-mkdir NEXT
- 	cat Make1 Make2.g++ Make3 Make.depend >NEXT/Makefile
diff --git a/cad/gnucap/patches/patch-ad b/cad/gnucap/patches/patch-ad
deleted file mode 100644
index f5d547a053b..00000000000
--- a/cad/gnucap/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/11/08 00:54:22 dmcmahill Exp $
-
---- src/Makefile.orig	2002-11-06 02:47:55.000000000 -0500
-+++ src/Makefile
-@@ -77,6 +77,11 @@ netbsd: nothing
- 	cat Make1 Make2.g++ Make3 Make.depend >NETBSD/Makefile
- 	(cd NETBSD; ${MAKE} -k)
- #-----------------------------------------------------------------------------
-+pkgsrc: nothing
-+	-mkdir PKGSRC
-+	cat Make1 Make2.g++ Make3 Make.depend >PKGSRC/Makefile
-+	(cd PKGSRC; ${MAKE} -k)
-+#-----------------------------------------------------------------------------
- next: nothing
- 	-mkdir NEXT
- 	cat Make1 Make2.g++ Make3 Make.depend >NEXT/Makefile
diff --git a/cad/gnucap/patches/patch-ae b/cad/gnucap/patches/patch-ae
deleted file mode 100644
index dc51d5200e5..00000000000
--- a/cad/gnucap/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/03/20 00:31:07 dmcmahill Exp $
-
---- test/test.orig	Sun Feb  1 22:49:09 2004
-+++ test/test
-@@ -1,5 +1,5 @@
- #!/bin/sh
--if [ $# == 0 ] ; then
-+if [ $# -eq 0 ] ; then
-     echo "usage: ./test gnucap \"testcases\" targetdir refdir"
-     echo "usual testcases is \"\", usual refdir is =="
-     echo "example: ./test gnucap \"\" myversion =="
diff --git a/cad/gnucap/patches/patch-af b/cad/gnucap/patches/patch-af
deleted file mode 100644
index 85b25bdea9e..00000000000
--- a/cad/gnucap/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/12/20 12:02:15 joerg Exp $
-
---- src/l_ftos.cc.orig	2004-02-01 21:13:19.000000000 +0000
-+++ src/l_ftos.cc
-@@ -36,8 +36,16 @@
-  * there is a finite pool, so repeated calls work, to a point.
-  * after that, the space is overwritten, every POOLSIZE calls
-  */
-+
-+#include <math.h>
- #include "l_lib.h"
- #include "constant.h"
-+
-+#if defined(_GLIBCXX_USE_C99_MATH) && !defined(_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC)
-+using std::isinf;
-+using std::isnan;
-+#endif
-+
- /*--------------------------------------------------------------------------*/
- 	char*	utos(unsigned,char*,int);
- 	char*	itos(int,char*,int,int);
diff --git a/cad/gnucap/patches/patch-ag b/cad/gnucap/patches/patch-ag
deleted file mode 100644
index 8a6354c91bf..00000000000
--- a/cad/gnucap/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/20 12:02:15 joerg Exp $
-
---- src/test_isnan.cc.orig	2005-12-13 15:36:50.000000000 +0000
-+++ src/test_isnan.cc
-@@ -1,5 +1,7 @@
--#include "md.h"
--void foo()
-+#include <math.h>
-+
-+double val;
-+int foo()
- {
--  double x = isnan(2.3);
-+	return isnan(val);
- }
diff --git a/cad/gnucap/patches/patch-ah b/cad/gnucap/patches/patch-ah
deleted file mode 100644
index c465030b937..00000000000
--- a/cad/gnucap/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/12/20 12:02:15 joerg Exp $
-
---- src/test_isinf.cc.orig	2005-12-13 15:37:57.000000000 +0000
-+++ src/test_isinf.cc
-@@ -1,5 +1,7 @@
--#include "md.h"
--void foo()
-+#include <math.h>
-+
-+double val;
-+int foo()
- {
--  double x = isnan(2.3);
-+	return isinf(val);
- }
diff --git a/cad/gnucap/patches/patch-ai b/cad/gnucap/patches/patch-ai
deleted file mode 100644
index ef66673b52a..00000000000
--- a/cad/gnucap/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/20 12:02:15 joerg Exp $
-
---- src/m_cpoly.h.orig	2005-12-19 16:50:18.000000000 +0000
-+++ src/m_cpoly.h
-@@ -67,7 +67,7 @@ struct CPOLY1{		/* first order polynomia
-   double   c0;		/* f(x) - x*f'(x), or f0 - x*f1 */
-   double   c1;		/* the first derivative		*/
-   explicit CPOLY1() : x(0), c0(0), c1(0) {}
--  explicit CPOLY1(const CPOLY1& p) : x(p.x), c0(p.c0), c1(p.c1){untested();}
-+  CPOLY1(const CPOLY1& p) : x(p.x), c0(p.c0), c1(p.c1){untested();}
-   explicit CPOLY1(double X,double C0,double C1) : x(X), c0(C0), c1(C1) {}
-   explicit CPOLY1(const FPOLY1& p);
-