- Use \special syntax that dvipsk understands.

- Run TeX commands with absolute paths.

14 files changed, 266 insertions, 8 deletions

diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index f1cdd401977..f1708ca850e 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2009/02/25 17:03:03 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2010/09/29 21:57:04 minskim Exp $
 #
 
 DISTNAME=	fastcap-2.0-18Sep92
 PKGNAME=	fastcap-2.0.19920918
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.rle.mit.edu/cpg/codes/
 EXTRACT_SUFX=	.tgz
@@ -12,7 +12,10 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.rle.mit.edu/cpg/research_codes.htm
 COMMENT=	Fast 3-D capacitance solver
 
-BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
+BUILD_DEPENDS+=	dvipsk>=5.99:../../print/dvipsk
+BUILD_DEPENDS+=	tex-amsfonts>=3.0:../../fonts/tex-amsfonts
+BUILD_DEPENDS+=	tex-bibtex>=0.99c:../../print/tex-bibtex
+BUILD_DEPENDS+=	tex-latex-bin>=2009nb1:../../print/tex-latex-bin
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -22,8 +25,8 @@ WRKSRC=			${WRKDIR}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS+=	4
-TEX_DEPMETHOD=	build
-TEX_ACCEPTED=		teTeX3
+MAKE_ENV+=		BIBTEX=${LOCALBASE}/bin/bibtex \
+			LATEX=${LOCALBASE}/bin/latex
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		2.95.3
@@ -37,7 +40,7 @@ post-patch:
 post-build:
 	cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} manual
 .for file in mtt tcad ug
-	cd ${WRKSRC}/doc && dvips -o ${file}.ps ${file}.dvi
+	cd ${WRKSRC}/doc && ${LOCALBASE}/bin/dvips -R0 -o ${file}.ps ${file}.dvi
 .endfor
 
 do-install:
@@ -88,5 +91,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/ug.ps  ${DESTDIR}${PREFIX}/share/doc/fastcap
 	${INSTALL_DATA} ${WRKSRC}/README.docs ${DESTDIR}${PREFIX}/share/doc/fastcap
 
-.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/fastcap/distinfo b/cad/fastcap/distinfo
index adfa027eb49..79579313cc6 100644
--- a/cad/fastcap/distinfo
+++ b/cad/fastcap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 14:59:23 agc Exp $
+$NetBSD: distinfo,v 1.9 2010/09/29 21:57:04 minskim Exp $
 
 SHA1 (fastcap-2.0-18Sep92.tgz) = 7ad255cfe33c60428e934b87298951829331e4d5
 RMD160 (fastcap-2.0-18Sep92.tgz) = 3073f17442abaf67b9d3a7c8bd05054dbb706a9a
@@ -8,3 +8,15 @@ SHA1 (patch-ab) = 4336ebcb0ba385e6937129735653db20d48d186f
 SHA1 (patch-ac) = 3b3b6d461d5875dfdbaf8af16546887f57279b88
 SHA1 (patch-ad) = a9d971f0990d5cf04651afd73689170ce1eb0f13
 SHA1 (patch-ae) = fd04e26454f89661a02e37fc51770746af108fd1
+SHA1 (patch-af) = 899733425e3d7912a27d7c9331f73484de80203a
+SHA1 (patch-ag) = c680b62ca9f79f65a0704164df4e83243a5d781a
+SHA1 (patch-ah) = 0a9f229b51ef04e29500d6548343a73a6ec61cc1
+SHA1 (patch-ai) = 5431b7fa7ddb8f72d7637369082e023670c6e63c
+SHA1 (patch-aj) = 57aaac8cd98abde9e0c6b6b030a9e5a1efb58b63
+SHA1 (patch-ak) = 673550aa4511ec162c1c328a8d1af71f5b799c20
+SHA1 (patch-al) = 9a85aad897783114c8feff69e5d2c2e23ce5d43c
+SHA1 (patch-am) = 85ae0ed426b43ba3018eeb8d7c37d5e2a45e43d7
+SHA1 (patch-an) = 51f9cf9fdf32755ab3b79b093873782e8ce20a41
+SHA1 (patch-ao) = 55fb0926e433b96336a0574e09231e825c717607
+SHA1 (patch-ap) = 63378fe5ceac7b2c76bdb4d6f3a50010cef621f8
+SHA1 (patch-aq) = e0620792ae3bcadfc4d7ec3cdf7f4cd21ce465cd
diff --git a/cad/fastcap/patches/patch-af b/cad/fastcap/patches/patch-af
new file mode 100644
index 00000000000..cfa2caeee55
--- /dev/null
+++ b/cad/fastcap/patches/patch-af
@@ -0,0 +1,31 @@
+$NetBSD: patch-af,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/Makefile.orig	1992-09-19 03:04:40.000000000 +0000
++++ doc/Makefile
+@@ -62,7 +62,7 @@ ug.dvi: $(UGTEX)
+ 	awk -f temp__ ug.tex > temp_ ; \
+ 	mv temp_ ug.tex ; \
+ 	/bin/rm temp__
+-	cd $(UG) ; latex ug ; latex ug ; latex ug 
++	cd $(UG) ; $(LATEX) ug ; $(LATEX) ug ; $(LATEX) ug 
+ 
+ tcad.dvi: $(TCADTEX) $(TCADSTY)
+ 	cd $(TCAD) ; pwd > temp_ ; \
+@@ -71,7 +71,7 @@ tcad.dvi: $(TCADTEX) $(TCADSTY)
+ 	awk -f temp__ tcad.tex > temp_ ; \
+ 	mv temp_ tcad.tex ; \
+ 	/bin/rm temp__
+-	cd $(TCAD) ; latex tcad ; latex tcad ; latex tcad
++	cd $(TCAD) ; $(LATEX) tcad ; $(LATEX) tcad ; $(LATEX) tcad
+ 
+ mtt.dvi: $(MTTTEX) $(MTTBIB) $(MTTSTY)
+ 	cd $(MTT) ; pwd > temp_ ; \
+@@ -80,7 +80,7 @@ mtt.dvi: $(MTTTEX) $(MTTBIB) $(MTTSTY)
+ 	awk -f temp__ mtt.tex > temp_ ; \
+ 	mv temp_ mtt.tex ; \
+ 	/bin/rm temp__
+-	cd $(MTT) ; latex mtt ; bibtex mtt ; latex mtt ; latex mtt
++	cd $(MTT) ; $(LATEX) mtt ; $(BIBTEX) mtt ; $(LATEX) mtt ; $(LATEX) mtt
+ 
+ clean:
+ 	cd $(UG) ; /bin/rm -f *.dvi *.log *.toc *.aux *.bak *.lot *.lof
diff --git a/cad/fastcap/patches/patch-ag b/cad/fastcap/patches/patch-ag
new file mode 100644
index 00000000000..eb8103e73ab
--- /dev/null
+++ b/cad/fastcap/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-adapt.tex.orig	1992-09-19 03:04:38.000000000 +0000
++++ doc/mtt-adapt.tex
+@@ -228,10 +228,10 @@ each lowest-level square has roughly the
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,3.2)
+ \put(0.25,0.2){
+-\special{psfile=\figuredir/adaptg.eps,hoffset=-24,voffset=-106,hscale=0.715068,vscale=0.715068}
++\special{psfile=\figuredir/adaptg.eps hoffset=-24 voffset=-106 hscale=0.715068 vscale=0.715068}
+ }
+ \put(3.35,0.2){
+-\special{psfile=\figuredir/adaptw.eps,hoffset=-23,voffset=-105,hscale=0.710204,vscale=0.710204}
++\special{psfile=\figuredir/adaptw.eps hoffset=-23 voffset=-105 hscale=0.710204 vscale=0.710204}
+ }
+ \put(1.65,0){(a)}
+ \put(4.75,0){(b)}
diff --git a/cad/fastcap/patches/patch-ah b/cad/fastcap/patches/patch-ah
new file mode 100644
index 00000000000..12a952141f5
--- /dev/null
+++ b/cad/fastcap/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-dblevl.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-dblevl.tex
+@@ -5,7 +5,7 @@
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,2.7)
+ \put(1.75,0){
+-\special{psfile=\figuredir/dblevl.ps,hoffset=-186,voffset=-230,hscale=0.947368,vscale=0.947368}
++\special{psfile=\figuredir/dblevl.ps hoffset=-186 voffset=-230 hscale=0.947368 vscale=0.947368}
+ }
+ \put(1.73,1.0){$(r_i,\phi_i,\theta_i)$}
+ \put(2.0,1.48){$r$}
diff --git a/cad/fastcap/patches/patch-ai b/cad/fastcap/patches/patch-ai
new file mode 100644
index 00000000000..51ce262ff80
--- /dev/null
+++ b/cad/fastcap/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-direval.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-direval.tex
+@@ -6,7 +6,7 @@ $(r_i,\phi_i,\theta_i)$.}
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,6.5)
+ \put(0,0.25){
+-\special{psfile=\figuredir/direval.eps,hoffset=-25,voffset=-111,hscale=0.747405,vscale=0.747405}
++\special{psfile=\figuredir/direval.eps hoffset=-25 voffset=-111 hscale=0.747405 vscale=0.747405}
+ }
+ \put(0.1176,4.926){$(r_i,\phi_i,\theta_i)$}
+ \put(0.1176,1.197){$(r_i,\phi_i,\theta_i)$}
diff --git a/cad/fastcap/patches/patch-aj b/cad/fastcap/patches/patch-aj
new file mode 100644
index 00000000000..c91417fba27
--- /dev/null
+++ b/cad/fastcap/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-mulevl.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-mulevl.tex
+@@ -5,7 +5,7 @@
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,2.7)
+ \put(0.25,0){
+-\special{psfile=\figuredir/mulevl.ps,hoffset=-40,voffset=-450,hscale=0.933045,vscale=0.933045}
++\special{psfile=\figuredir/mulevl.ps hoffset=-40 voffset=-450 hscale=0.933045 vscale=0.933045}
+ }
+ \thicklines
+ \put(0.25,2.4){$(r_i,\phi_i,\theta_i)$}
diff --git a/cad/fastcap/patches/patch-ak b/cad/fastcap/patches/patch-ak
new file mode 100644
index 00000000000..a35530165e8
--- /dev/null
+++ b/cad/fastcap/patches/patch-ak
@@ -0,0 +1,21 @@
+$NetBSD: patch-ak,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-screen.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-screen.tex
+@@ -7,13 +7,13 @@ matrices $P(7)$, (a), $P(5)$, (b), and $
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,3.7)
+ \put(2.5,2.6){
+-\special{psfile=\figuredir/cap7.ps,hoffset=-6,voffset=-6,hscale=0.204375,vscale=0.204375}
++\special{psfile=\figuredir/cap7.ps hoffset=-6 voffset=-6 hscale=0.204375 vscale=0.204375}
+ }
+ \put(2.67,1.4){
+-\special{psfile=\figuredir/cap5.ps,hoffset=-4,voffset=-4,hscale=0.15,vscale=0.15}
++\special{psfile=\figuredir/cap5.ps hoffset=-4 voffset=-4 hscale=0.15 vscale=0.15}
+ }
+ \put(2.87,0.2){
+-\special{psfile=\figuredir/cap3.ps,hoffset=-3,voffset=-3,hscale=0.0965625,vscale=0.0965625}
++\special{psfile=\figuredir/cap3.ps hoffset=-3 voffset=-3 hscale=0.0965625 vscale=0.0965625}
+ }
+ %%\put(0,0){\line(0,1){3}}
+ \put(3.2,2.4){(a)}
diff --git a/cad/fastcap/patches/patch-al b/cad/fastcap/patches/patch-al
new file mode 100644
index 00000000000..11df72bf697
--- /dev/null
+++ b/cad/fastcap/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-sqd.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-sqd.tex
+@@ -6,7 +6,7 @@ two plates are $0.02\mu $m appart at the
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,2.5)
+ \put(1.75,0){
+-\special{psfile=\figuredir/sqd.ps,hoffset=-12,voffset=-12,hscale=0.397059,vscale=0.397059}
++\special{psfile=\figuredir/sqd.ps hoffset=-12 voffset=-12 hscale=0.397059 vscale=0.397059}
+ }
+ \put(1.9,0.7){$1000\mu $m}
+ \put(3.9,0.6){$1000\mu $m}
diff --git a/cad/fastcap/patches/patch-am b/cad/fastcap/patches/patch-am
new file mode 100644
index 00000000000..fe0f4bef293
--- /dev/null
+++ b/cad/fastcap/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-via.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-via.tex
+@@ -6,7 +6,7 @@ centers are 2mm appart.}
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,2.5)
+ \put(1.4,0){
+-\special{psfile=\figuredir/exam.ps,hoffset=-15,voffset=-15,hscale=0.489706,vscale=0.489706}
++\special{psfile=\figuredir/exam.ps hoffset=-15 voffset=-15 hscale=0.489706 vscale=0.489706}
+ }
+ \put(1.25,1.8){2}
+ \put(1.3,1.2){1}
diff --git a/cad/fastcap/patches/patch-an b/cad/fastcap/patches/patch-an
new file mode 100644
index 00000000000..33947d545a4
--- /dev/null
+++ b/cad/fastcap/patches/patch-an
@@ -0,0 +1,17 @@
+$NetBSD: patch-an,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt-weave.tex.orig	1992-09-19 03:04:34.000000000 +0000
++++ doc/mtt-weave.tex
+@@ -8,10 +8,10 @@ corresponding set of panels in (b).}
+ \setlength{\unitlength}{1.0in}
+ \begin{picture}(6.5,3.2)
+ \put(0,0.2){
+-\special{psfile=\figuredir/weave2.ps,hoffset=-12,voffset=-12,hscale=0.397059,vscale=0.397059}
++\special{psfile=\figuredir/weave2.ps hoffset=-12 voffset=-12 hscale=0.397059 vscale=0.397059}
+ }
+ \put(3.45,0.2){
+-\special{psfile=\figuredir/weavediscr.ps,hoffset=-9,voffset=-9,hscale=0.298343,vscale=0.298343}
++\special{psfile=\figuredir/weavediscr.ps hoffset=-9 voffset=-9 hscale=0.298343 vscale=0.298343}
+ }
+ \thicklines
+ \put(4.7,2.6){Woven1}
diff --git a/cad/fastcap/patches/patch-ao b/cad/fastcap/patches/patch-ao
new file mode 100644
index 00000000000..0a861860170
--- /dev/null
+++ b/cad/fastcap/patches/patch-ao
@@ -0,0 +1,31 @@
+$NetBSD: patch-ao,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/mtt.tex.orig	2010-09-29 21:39:16.000000000 +0000
++++ doc/mtt.tex
+@@ -11,7 +11,7 @@
+ \newcommand{\fig}[9]{ % filename label caption vsp placement horizo verto horizs verts
+ \begin{figure}[#5]
+ \vspace*{#4pt}
+-\special{psfile=#1,hoffset=#6,voffset=#7,hscale=#8,vscale=#9}
++\special{psfile=#1 hoffset=#6 voffset=#7 hscale=#8 vscale=#9}
+ \caption{#3}
+ \label{#2}
+ \end{figure}
+@@ -22,7 +22,7 @@
+ \newcommand{\sfig}[7]{ % filename vsp placement horizo verto horizs verts
+ \begin{figure}[#3]
+ \vspace*{#2pt}
+-\special{psfile=#1,hoffset=#4,voffset=#5,hscale=#6,vscale=#7}
++\special{psfile=#1 hoffset=#4 voffset=#5 hscale=#6 vscale=#7}
+ \end{figure}
+ }
+ %
+@@ -32,7 +32,7 @@
+ \refstepcounter{figure}
+ \begin{figure}[#4]
+ \vspace*{#3pt}
+-\special{psfile=#1,hoffset=#5,voffset=#6,hscale=#7,vscale=#8}
++\special{psfile=#1 hoffset=#5 voffset=#6 hscale=#7 vscale=#8}
+ \label{#2}
+ \end{figure}
+ }
diff --git a/cad/fastcap/patches/patch-ap b/cad/fastcap/patches/patch-ap
new file mode 100644
index 00000000000..0a54076b813
--- /dev/null
+++ b/cad/fastcap/patches/patch-ap
@@ -0,0 +1,31 @@
+$NetBSD: patch-ap,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/tcad.tex.orig	2010-09-29 21:42:37.000000000 +0000
++++ doc/tcad.tex
+@@ -10,7 +10,7 @@
+ \newcommand{\fig}[9]{ % filename label caption vsp placement horizo verto horizs verts
+ \begin{figure}[#5]
+ \vspace*{#4pt}
+-\special{psfile=#1,hoffset=#6,voffset=#7,hscale=#8,vscale=#9}
++\special{psfile=#1 hoffset=#6 voffset=#7 hscale=#8 vscale=#9}
+ \caption{#3}
+ \label{#2}
+ \end{figure}
+@@ -21,7 +21,7 @@
+ \newcommand{\sfig}[7]{ % filename vsp placement horizo verto horizs verts
+ \begin{figure}[#3]
+ \vspace*{#2pt}
+-\special{psfile=#1,hoffset=#4,voffset=#5,hscale=#6,vscale=#7}
++\special{psfile=#1 hoffset=#4 voffset=#5 hscale=#6 vscale=#7}
+ \end{figure}
+ }
+ %
+@@ -31,7 +31,7 @@
+ \refstepcounter{figure}
+ \begin{figure}[#4]
+ \vspace*{#3pt}
+-\special{psfile=#1,hoffset=#5,voffset=#6,hscale=#7,vscale=#8}
++\special{psfile=#1 hoffset=#5 voffset=#6 hscale=#7 vscale=#8}
+ \label{#2}
+ \end{figure}
+ }
diff --git a/cad/fastcap/patches/patch-aq b/cad/fastcap/patches/patch-aq
new file mode 100644
index 00000000000..5a4b18da3cf
--- /dev/null
+++ b/cad/fastcap/patches/patch-aq
@@ -0,0 +1,31 @@
+$NetBSD: patch-aq,v 1.1 2010/09/29 21:57:04 minskim Exp $
+
+--- doc/ug.tex.orig	2010-09-29 21:42:36.000000000 +0000
++++ doc/ug.tex
+@@ -11,7 +11,7 @@
+ \newcommand{\fig}[9]{ % filename label caption vsp placement horizo verto horizs verts
+ \begin{figure}[#5]
+ \vspace*{#4pt}
+-\special{psfile=#1,hoffset=#6,voffset=#7,hscale=#8,vscale=#9}
++\special{psfile=#1 hoffset=#6 voffset=#7 hscale=#8 vscale=#9}
+ \caption{#3}
+ \label{#2}
+ \end{figure}
+@@ -22,7 +22,7 @@
+ \newcommand{\sfig}[7]{ % filename vsp placement horizo verto horizs verts
+ \begin{figure}[#3]
+ \vspace*{#2pt}
+-\special{psfile=#1,hoffset=#4,voffset=#5,hscale=#6,vscale=#7}
++\special{psfile=#1 hoffset=#4 voffset=#5 hscale=#6 vscale=#7}
+ \end{figure}
+ }
+ %
+@@ -32,7 +32,7 @@
+ \refstepcounter{figure}
+ \begin{figure}[#4]
+ \vspace*{#3pt}
+-\special{psfile=#1,hoffset=#5,voffset=#6,hscale=#7,vscale=#8}
++\special{psfile=#1 hoffset=#5 voffset=#6 hscale=#7 vscale=#8}
+ \label{#2}
+ \end{figure}
+ }