Add a "doc" option (on by default) to control whether the documentation

is rendered and installed. Disabling the option is helpful e.g. for
web servers supporting OpenID logins, where X and TeX aren't present.
Bump PKGREVISION.

6 files changed, 68 insertions, 50 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 8d8ea701ccd..f6745da340e 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2010/02/19 18:16:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.47 2010/03/13 22:16:34 schmonz Exp $
 
 DISTNAME=	pari-2.3.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
-EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pari.math.u-bordeaux.fr/
@@ -13,15 +12,10 @@ LICENSE=	gnu-gpl-v2
 
 MAKE_JOBS_SAFE=	no
 
-BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-TEX_ACCEPTED=	teTeX3
-TEX_DEPMETHOD=	build
-
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run imake
+USE_TOOLS+=		perl:run
 USE_LANGUAGES+=		c c++
 USE_GNU_READLINE=	yes	# rl_save_prompt()
 HAS_CONFIGURE=		yes
@@ -35,11 +29,12 @@ CONFIGURE_ARGS+=	--share-prefix=${PREFIX}/share
 
 REPLACE_PERL+=		src/desc/PARI/822.pm
 
+BUILD_TARGET=		all
 TEST_TARGET=		test-compat bench
+INSTALL_TARGET=		install
 
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../mk/tex.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/PLIST b/math/pari/PLIST
index c1dab99b32e..1aed46782c1 100644
--- a/math/pari/PLIST
+++ b/math/pari/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2010/02/06 10:37:06 sno Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/03/13 22:16:34 schmonz Exp $
 bin/gp
 bin/gp-2.3
-bin/gphelp
+${PLIST.doc}bin/gphelp
 bin/tex2mail
 include/pari/genpari.h
 include/pari/pari.h
@@ -35,35 +35,35 @@ share/emacs/site-lisp/pari/pari-messages.el
 share/emacs/site-lisp/pari/pari.el
 share/emacs/site-lisp/pari/pariemacs.txt
 share/emacs/site-lisp/pari/sli-tools.el
-share/pari/AUTHORS
-share/pari/CHANGES
-share/pari/COMPAT
-share/pari/COPYING
-share/pari/MACHINES
-share/pari/NEW
+${PLIST.doc}share/pari/AUTHORS
+${PLIST.doc}share/pari/CHANGES
+${PLIST.doc}share/pari/COMPAT
+${PLIST.doc}share/pari/COPYING
+${PLIST.doc}share/pari/MACHINES
+${PLIST.doc}share/pari/NEW
 share/pari/PARI/822.pm
-share/pari/README
-share/pari/doc/Makefile
-share/pari/doc/appa.tex
-share/pari/doc/appb.tex
-share/pari/doc/appc.tex
-share/pari/doc/libpari.dvi
-share/pari/doc/paricfg.tex
-share/pari/doc/parimacro.tex
-share/pari/doc/pdfmacs.tex
-share/pari/doc/refcard.dvi
-share/pari/doc/refcard.ps
-share/pari/doc/refcard.tex
-share/pari/doc/translations
-share/pari/doc/tutorial.dvi
-share/pari/doc/tutorial.tex
-share/pari/doc/users.dvi
-share/pari/doc/users.tex
-share/pari/doc/usersch1.tex
-share/pari/doc/usersch2.tex
-share/pari/doc/usersch3.tex
-share/pari/doc/usersch4.tex
-share/pari/doc/usersch5.tex
+${PLIST.doc}share/pari/README
+${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/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.tex
+${PLIST.doc}share/pari/doc/translations
+${PLIST.doc}share/pari/doc/tutorial.dvi
+${PLIST.doc}share/pari/doc/tutorial.tex
+${PLIST.doc}share/pari/doc/users.dvi
+${PLIST.doc}share/pari/doc/users.tex
+${PLIST.doc}share/pari/doc/usersch1.tex
+${PLIST.doc}share/pari/doc/usersch2.tex
+${PLIST.doc}share/pari/doc/usersch3.tex
+${PLIST.doc}share/pari/doc/usersch4.tex
+${PLIST.doc}share/pari/doc/usersch5.tex
 share/pari/examples/EXPLAIN
 share/pari/examples/Inputrc
 share/pari/examples/Makefile
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 320f26664dc..ff6dc7b4fca 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2010/02/12 18:18:29 sno Exp $
+$NetBSD: distinfo,v 1.18 2010/03/13 22:16:34 schmonz Exp $
 
 SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966
 RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5
@@ -11,10 +11,11 @@ SHA1 (patch-ae) = 34e174cf1c97ee8b627691f3a5bf19fbbea43324
 SHA1 (patch-af) = 985b3a35f4c69124336c23c9c78690eb7e7d1567
 SHA1 (patch-ag) = 8c50e5b01832bc876874d51df02905dddb7839f3
 SHA1 (patch-ah) = 3febc677f1b94a9b3f4dec79388fdb8f77fa184f
-SHA1 (patch-ai) = 21877efea2de94cf26e53234c80ef9ae15f6c836
+SHA1 (patch-ai) = 162eddd5b9a1793f79000562a3e6022f3375d773
 SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d
 SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4
 SHA1 (patch-al) = 3cb64ea5b1caeaeeeebb7297a7e061d235925686
 SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86
 SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
 SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
+SHA1 (patch-ap) = 21a20b68b589f8be3036d1f2f9c4b2a7f43210a8
diff --git a/math/pari/options.mk b/math/pari/options.mk
index 4486f9f57c9..df9fd16a8d0 100644
--- a/math/pari/options.mk
+++ b/math/pari/options.mk
@@ -1,24 +1,33 @@
-# $NetBSD: options.mk,v 1.3 2010/02/19 18:16:42 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2010/03/13 22:16:34 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pari
-PKG_SUPPORTED_OPTIONS=	gmp x11
-PKG_SUGGESTED_OPTIONS=	gmp x11
+PKG_SUPPORTED_OPTIONS=	doc gmp x11
+PKG_SUGGESTED_OPTIONS=	doc gmp x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		nogmp gmp
+PLIST_VARS+=		doc
+.if !empty(PKG_OPTIONS:Mdoc)
+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"
+.endif
 
+PLIST_VARS+=		nogmp gmp
 .if !empty(PKG_OPTIONS:Mgmp)
 PLIST.gmp=		yes
-
 CONFIGURE_ARGS+=	--with-gmp=${PREFIX:Q}
-
 .include "../../devel/gmp/buildlink3.mk"
 .else
 PLIST.nogmp=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
+USE_TOOLS+=		imake
 CONFIGURE_ARGS+=	--graphic=X11
 CONFIGURE_ARGS+=	--with-fltk=${PREFIX:Q}
 CONFIGURE_ENV+=		X11BASE=${X11BASE:Q}
diff --git a/math/pari/patches/patch-ai b/math/pari/patches/patch-ai
index 372e12b99c5..114a6d613f7 100644
--- a/math/pari/patches/patch-ai
+++ b/math/pari/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.2 2010/02/06 10:37:06 sno Exp $
+$NetBSD: patch-ai,v 1.3 2010/03/13 22:16:34 schmonz Exp $
 
 --- config/Makefile.SH.orig	2010-01-09 17:59:48.000000000 +0000
 +++ config/Makefile.SH
@@ -158,7 +158,7 @@ $NetBSD: patch-ai,v 1.2 2010/02/06 10:37:06 sno Exp $
  	@touch \$@
  
 -install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
-+install: install-lib install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
++install: install-lib install-include install-bin install-man install-misc install-examples install-cfg install-data
  
  install-include:
  	-mkdir -p \$(INCLUDEDIR)/pari
diff --git a/math/pari/patches/patch-ap b/math/pari/patches/patch-ap
new file mode 100644
index 00000000000..d97d9a7fc80
--- /dev/null
+++ b/math/pari/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.3 2010/03/13 22:16:34 schmonz Exp $
+
+--- config/TOP_Make.SH.orig	2008-10-23 16:30:37.000000000 +0000
++++ config/TOP_Make.SH
+@@ -40,7 +40,7 @@ dft target::
+ 	@echo "Available extra tests: test-all $top_test_extra"
+ 
+ all::
+-	@-cd doc && \$(MAKE) doc
++#	@-cd doc && \$(MAKE) doc
+ 	@\$(MAKE) gp
+ 
+ gp bench test-kernel test-all $top_test_extra $top_dotest_extra install cleanobj cleantest install-bin install-doc install-data install-lib-sta install-bin-sta dobench tune::