Reduce TeX dependencies.

math/pari does not need the entire set of teTeX packages.  Rather,
pdftex and a few font packages suffice to build its documentation.

6 files changed, 67 insertions, 35 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 5a3aef02dcc..06f6697c90f 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2010/03/24 19:43:27 asau Exp $
+# $NetBSD: Makefile,v 1.49 2010/10/01 20:50:55 minskim Exp $
 
 DISTNAME=	pari-2.3.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
 
diff --git a/math/pari/PLIST b/math/pari/PLIST
index 1aed46782c1..8b8ee2bb077 100644
--- a/math/pari/PLIST
+++ b/math/pari/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/03/13 22:16:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/10/01 20:50:55 minskim Exp $
 bin/gp
 bin/gp-2.3
 ${PLIST.doc}bin/gphelp
@@ -47,17 +47,16 @@ ${PLIST.doc}share/pari/doc/Makefile
 ${PLIST.doc}share/pari/doc/appa.tex
 ${PLIST.doc}share/pari/doc/appb.tex
 ${PLIST.doc}share/pari/doc/appc.tex
-${PLIST.doc}share/pari/doc/libpari.dvi
+${PLIST.doc}share/pari/doc/libpari.pdf
 ${PLIST.doc}share/pari/doc/paricfg.tex
 ${PLIST.doc}share/pari/doc/parimacro.tex
 ${PLIST.doc}share/pari/doc/pdfmacs.tex
-${PLIST.doc}share/pari/doc/refcard.dvi
-${PLIST.doc}share/pari/doc/refcard.ps
+${PLIST.doc}share/pari/doc/refcard.pdf
 ${PLIST.doc}share/pari/doc/refcard.tex
 ${PLIST.doc}share/pari/doc/translations
-${PLIST.doc}share/pari/doc/tutorial.dvi
+${PLIST.doc}share/pari/doc/tutorial.pdf
 ${PLIST.doc}share/pari/doc/tutorial.tex
-${PLIST.doc}share/pari/doc/users.dvi
+${PLIST.doc}share/pari/doc/users.pdf
 ${PLIST.doc}share/pari/doc/users.tex
 ${PLIST.doc}share/pari/doc/usersch1.tex
 ${PLIST.doc}share/pari/doc/usersch2.tex
diff --git a/math/pari/distinfo b/math/pari/distinfo
index ff6dc7b4fca..084a1327db0 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2010/03/13 22:16:34 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2010/10/01 20:50:55 minskim Exp $
 
 SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966
 RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5
@@ -11,10 +11,10 @@ SHA1 (patch-ae) = 34e174cf1c97ee8b627691f3a5bf19fbbea43324
 SHA1 (patch-af) = 985b3a35f4c69124336c23c9c78690eb7e7d1567
 SHA1 (patch-ag) = 8c50e5b01832bc876874d51df02905dddb7839f3
 SHA1 (patch-ah) = 3febc677f1b94a9b3f4dec79388fdb8f77fa184f
-SHA1 (patch-ai) = 162eddd5b9a1793f79000562a3e6022f3375d773
+SHA1 (patch-ai) = 19b1f467ee0e534c19cce5768de070950e147c67
 SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d
 SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4
-SHA1 (patch-al) = 3cb64ea5b1caeaeeeebb7297a7e061d235925686
+SHA1 (patch-al) = 4b9fe2464fb1136449ab3f46dcd743e937db470f
 SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86
 SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
 SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
diff --git a/math/pari/options.mk b/math/pari/options.mk
index df9fd16a8d0..57f0adb8d1d 100644
--- a/math/pari/options.mk
+++ b/math/pari/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/03/13 22:16:34 schmonz Exp $
+# $NetBSD: options.mk,v 1.5 2010/10/01 20:50:55 minskim Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pari
 PKG_SUPPORTED_OPTIONS=	doc gmp x11
@@ -8,13 +8,12 @@ PKG_SUGGESTED_OPTIONS=	doc gmp x11
 
 PLIST_VARS+=		doc
 .if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=		tex-amsfonts>=3.0:../../fonts/tex-amsfonts
+BUILD_DEPENDS+=		tex-pdftex>=1.40.11:../../print/tex-pdftex
 PLIST.doc=		yes
 BUILD_TARGET+=		doc
 INSTALL_TARGET+=	install-doc
-BUILD_DEPENDS+=		dvipsk-[0-9]*:../../print/dvipsk
-TEX_ACCEPTED=		teTeX3
-TEX_DEPMETHOD=		build
-.include "../../mk/tex.buildlink3.mk"
+MAKE_ENV+=		PDFTEX=${LOCALBASE:Q}/bin/pdftex
 .endif
 
 PLIST_VARS+=		nogmp gmp
diff --git a/math/pari/patches/patch-ai b/math/pari/patches/patch-ai
index 114a6d613f7..a64f297d2bc 100644
--- a/math/pari/patches/patch-ai
+++ b/math/pari/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.3 2010/03/13 22:16:34 schmonz Exp $
+$NetBSD: patch-ai,v 1.4 2010/10/01 20:50:55 minskim Exp $
 
 --- config/Makefile.SH.orig	2010-01-09 17:59:48.000000000 +0000
 +++ config/Makefile.SH
@@ -242,7 +242,23 @@ $NetBSD: patch-ai,v 1.3 2010/03/13 22:16:34 schmonz Exp $
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/appa.tex     \$(DOCDIR)
-@@ -426,20 +386,9 @@ install-data:
+@@ -395,11 +355,10 @@ install-doc::
+ 	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/libpari.dvi    \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/users.dvi    \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/libpari.pdf  \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/users.pdf    \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/refcard.pdf  \$(DOCDIR)
+ 
+ install-examples:
+ 	-mkdir -p \$(EXDIR)
+@@ -426,20 +385,9 @@ install-data:
  	   done; \
  	 fi
  
@@ -265,7 +281,7 @@ $NetBSD: patch-ai,v 1.3 2010/03/13 22:16:34 schmonz Exp $
  
  pariinl.h: parilvl0.h parilvl1.h
  	cat parilvl0.h parilvl1.h > pariinl.h
-@@ -462,63 +411,13 @@ dotest-$i::
+@@ -462,63 +410,13 @@ dotest-$i::
  EOT
  done
  
diff --git a/math/pari/patches/patch-al b/math/pari/patches/patch-al
index 3295c3b6910..bad80e743b2 100644
--- a/math/pari/patches/patch-al
+++ b/math/pari/patches/patch-al
@@ -1,23 +1,30 @@
-$NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $
+$NetBSD: patch-al,v 1.4 2010/10/01 20:50:55 minskim Exp $
 
---- config/DOC_Make.SH.orig	2008-01-16 15:57:02.000000000 +0000
+--- config/DOC_Make.SH.orig	2008-03-31 11:43:59.000000000 +0000
 +++ config/DOC_Make.SH
-@@ -12,7 +12,7 @@ doc all: develop.dvi libpari.dvi users.d
+@@ -8,11 +8,11 @@ MACROS= paricfg.tex parimacro.tex
+ USERS_TEX=\$(MACROS) users.tex usersch1.tex usersch2.tex usersch3.tex
+ PARI_TEX=\$(MACROS) libpari.tex appa.tex appb.tex appc.tex usersch4.tex usersch5.tex
+ 
+-doc all: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
++docdvi: develop.dvi libpari.dvi users.dvi refcard.ps tutorial.dvi
  docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps
- docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
+-docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
++all doc docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
  
 -.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html
 +.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html .ps .pdf .dvi .idx .std
  
  paricfg.tex: paricfg.tex.in
  	sed -e 's/@version@/$version.$patch/'\\
-@@ -20,33 +20,33 @@ paricfg.tex: paricfg.tex.in
+@@ -20,50 +20,50 @@ paricfg.tex: paricfg.tex.in
  	    -e 's!@libdir@!$libdir!'\\
  	    -e 's!@datadir@!$datadir!' paricfg.tex.in > \$@
  
 -%.pdf: %.tex \$(MACROS)
+-	pdftex \$<
 +.tex.pdf: \$*.tex \$(MACROS)
- 	pdftex \$<
++	\$(PDFTEX) \$<
  
 -%.dvi: %.tex \$(MACROS)
 +.tex.dvi: \$*.tex \$(MACROS)
@@ -25,10 +32,12 @@ $NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $
  
  libpari.pdf: \$(PARI_TEX) \$(MACROS)
  	-rm -f libpari.std
- 	pdftex libpari
- 	pdftex libpari
+-	pdftex libpari
+-	pdftex libpari
 -	make libpari.std; pdftex libpari; rm -f libpari.std
-+	\$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std
++	\$(PDFTEX) libpari
++	\$(PDFTEX) libpari
++	\$(MAKE) libpari.std; \$(PDFTEX) libpari; rm -f libpari.std
  libpari.dvi: \$(PARI_TEX) \$(MACROS)
  	-rm -f libpari.std
  	tex libpari
@@ -38,10 +47,12 @@ $NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $
  
  develop.pdf: develop.tex \$(MACROS)
  	-rm -f develop.std
- 	pdftex develop
- 	pdftex develop
+-	pdftex develop
+-	pdftex develop
 -	make develop.std; pdftex develop; rm -f develop.std
-+	\$(MAKE) develop.std; pdftex develop; rm -f develop.std
++	\$(PDFTEX) develop
++	\$(PDFTEX) develop
++	\$(MAKE) develop.std; \$(PDFTEX) develop; rm -f develop.std
  develop.dvi: develop.tex \$(MACROS)
  	-rm -f develop.std
  	tex develop
@@ -51,7 +62,12 @@ $NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $
  
  tutorial.pdf: tutorial.tex \$(MACROS)
  	-rm -f tutorial.std
-@@ -57,13 +57,13 @@ tutorial.dvi: tutorial.tex \$(MACROS)
+-	pdftex tutorial
+-	pdftex tutorial
++	\$(PDFTEX) tutorial
++	\$(PDFTEX) tutorial
+ tutorial.dvi: tutorial.tex \$(MACROS)
+ 	-rm -f tutorial.std
  	tex tutorial
  	tex tutorial
  
@@ -76,10 +92,12 @@ $NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $
  
  users.pdf: \$(USERS_TEX)
  	-rm -f users.std
- 	pdftex users
- 	pdftex users
+-	pdftex users
+-	pdftex users
 -	make users.std; pdftex users; rm -f users.std
-+	\$(MAKE) users.std; pdftex users; rm -f users.std
++	\$(PDFTEX) users
++	\$(PDFTEX) users
++	\$(MAKE) users.std; \$(PDFTEX) users; rm -f users.std
  
  gpman: gp.1
  	nroff -man gp.1 | unix2dos -ascii > gp.man