Build manual with pdflatex. Drop DVI. Bump revision.

5 files changed, 75 insertions, 6 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 28bf5731600..ce0e21a9ad0 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2014/10/09 14:06:01 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2015/05/03 19:43:21 joerg Exp $
 #
 
 DISTNAME=	gnucap-2006-07-08
 PKGNAME=	gnucap-20060708
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.geda.seul.org/dist/
@@ -12,7 +12,7 @@ MAINTAINER=	dmcmahill@NetBSD.org
 HOMEPAGE=	http://www.gnucap.org/
 COMMENT=	General purpose circuit simulator
 
-BUILD_DEPENDS+=	dvipdfmx>=20100328:../../print/dvipdfmx
+BUILD_DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 BUILD_DEPENDS+=	tex-hyperref>=6.81pnb2:../../print/tex-hyperref
 
 CONFLICTS+=	gnucap-2006-07-[0-9]*
diff --git a/cad/gnucap/PLIST b/cad/gnucap/PLIST
index a03423e11d7..f8c88d6138a 100644
--- a/cad/gnucap/PLIST
+++ b/cad/gnucap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:35:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/05/03 19:43:21 joerg Exp $
 bin/gnucap
 bin/gnucap-modelgen
 man/man1/gnucap-ibis.1
@@ -51,7 +51,6 @@ 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
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 8d1f9bd0a46..d7d09573df9 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.13 2013/02/26 10:22:53 joerg Exp $
+$NetBSD: distinfo,v 1.14 2015/05/03 19:43:21 joerg Exp $
 
 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
 SHA1 (patch-aa) = 60e6484c852adfba3b0bd11a9a5c691e4d228bd7
 SHA1 (patch-ab) = cdb1825722b18784ca54ae0c39183ff0790dc6d9
+SHA1 (patch-man_Makefile.in) = 57ae2e29ff6520e215e0080c536b92d7b361330c
+SHA1 (patch-man_gnucap-man.tex) = 2d643139b271386e68771e40be71a8a6cd1b5335
 SHA1 (patch-modelgen_ap.h) = 323081e63db5148da5706ea8a9470f2c8769467f
 SHA1 (patch-modelgen_io__.h) = 56aa956aa1e49889fea1ad59c2615e7c34f87b4c
 SHA1 (patch-modelgen_mg__.h) = e1464d428a8855124a8ac260041836a043a044ac
diff --git a/cad/gnucap/patches/patch-man_Makefile.in b/cad/gnucap/patches/patch-man_Makefile.in
new file mode 100644
index 00000000000..56feb8ae516
--- /dev/null
+++ b/cad/gnucap/patches/patch-man_Makefile.in
@@ -0,0 +1,55 @@
+$NetBSD: patch-man_Makefile.in,v 1.1 2015/05/03 19:43:21 joerg Exp $
+
+--- man/Makefile.in.orig	2015-05-03 14:03:53.000000000 +0000
++++ man/Makefile.in
+@@ -76,7 +76,6 @@ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DVIPDFM = @DVIPDFM@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+@@ -153,7 +152,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ pkgmanualdir = ${pkgdatadir}/manual
+-dist_pkgmanual_DATA = gnucap-man.pdf gnucap-man.dvi
++dist_pkgmanual_DATA = gnucap-man.pdf
+ EXTRA_DIST = ${TEXSRCS} README
+ TEXSRCS = \
+ 	addmodel.tex behavior.tex circuit.tex commands.tex copying.tex \
+@@ -165,7 +164,7 @@ DISTCLEANFILES = \
+ 	gnucap-man.toc
+ 
+ MAINTAINERCLEANFILES = \
+-	gnucap-man.dvi gnucap-man.pdf
++	gnucap-man.pdf
+ 
+ TEXDIRS = Addmodel Behavior Circuit Commands Tech
+ TEXFILES = ${TEXSRCS} $(foreach __tmp__,$(TEXDIRS),$(wildcard \
+@@ -344,21 +343,9 @@ uninstall-am: uninstall-dist_pkgmanualDA
+ 	uninstall-dist_pkgmanualDATA uninstall-info-am
+ 
+ 
+-gnucap-man.pdf: gnucap-man.dvi
+-@MISSING_DVIPDFM_TRUE@	@echo "WARNING:  dvipdfm was not found on your system but"
+-@MISSING_DVIPDFM_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_DVIPDFM_TRUE@	@echo "          rebuilt.  Changes to gnucap-man.dvi"
+-@MISSING_DVIPDFM_TRUE@	@echo "          will be ignored."
+-@MISSING_DVIPDFM_FALSE@	${DVIPDFM} gnucap-man
+-
+-# run it twice to fix the toc.
+-gnucap-man.dvi: $(TEXFILES)
+-@MISSING_LATEX_TRUE@	@echo "WARNING:  latex was not found on your system but"
+-@MISSING_LATEX_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_LATEX_TRUE@	@echo "          rebuilt from the LaTeX .tex files. Changes to"
+-@MISSING_LATEX_TRUE@	@echo "          the .tex files will be ignored."
+-@MISSING_LATEX_FALSE@	env TEXINPUTS=$(srcdir): ${LATEX} $(srcdir)/gnucap-man
+-@MISSING_LATEX_FALSE@	env TEXINPUTS=$(srcdir): ${LATEX} $(srcdir)/gnucap-man
++gnucap-man.pdf: $(TEXFILES)
++	env TEXINPUTS=$(srcdir): pdflatex $(srcdir)/gnucap-man
++	env TEXINPUTS=$(srcdir): pdflatex $(srcdir)/gnucap-man
+ 
+ html/index.html: $(TEXFILES)
+ @MISSING_HEVEA_TRUE@	${HEVEA} -fix -o html/gnucap-man $(srcdir)/gnucap-man.tex
diff --git a/cad/gnucap/patches/patch-man_gnucap-man.tex b/cad/gnucap/patches/patch-man_gnucap-man.tex
new file mode 100644
index 00000000000..5a6ed39187f
--- /dev/null
+++ b/cad/gnucap/patches/patch-man_gnucap-man.tex
@@ -0,0 +1,13 @@
+$NetBSD: patch-man_gnucap-man.tex,v 1.1 2015/05/03 19:43:21 joerg Exp $
+
+--- man/gnucap-man.tex.orig	2015-05-03 14:03:29.000000000 +0000
++++ man/gnucap-man.tex
+@@ -37,7 +37,7 @@
+ 
+ \setcounter{tocdepth}{1}
+ \makeindex
+-\usepackage[dvipdfm]{hyperref}
++\usepackage{hyperref}
+ 
+ \begin{document}
+