upgrade to 2.1.1

PR:		28454
Submitted by:	David Bremner <bremner@unb.ca>

6 files changed, 196 insertions, 95 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 34c13efccf22..e65b23422132 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	pari
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 CATEGORIES=	math
-MASTER_SITES=	ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/
+MASTER_SITES=	ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.1/ \
+		http://www.gn-50uma.de/ftp/pari-2.1/
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 
@@ -17,12 +18,12 @@ ONLY_FOR_ARCHS=	i386
 INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ARGS=	--prefix=${PREFIX} --share-prefix=${PREFIX}/share
 
 USE_GMAKE=	yes
 MAKE_ARGS=	gp
 
-MAN1=		gp.1 gphelp.1
+MAN1=		gp.1 gphelp.1 tex2mail.1
 MLINKS=		gp.1 pari.1
 
 HAVE_EMACS!=	which emacs || echo nope
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 2791bb0957bc..932a784259b1 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1 +1 @@
-MD5 (pari-2.1.0.tar.gz) = 7cff208a621d2368ca0052c457b3b3cd
+MD5 (pari-2.1.1.tar.gz) = e10ccee348c38e979ff73e0f1d6f2908
diff --git a/math/pari/files/patch-af b/math/pari/files/patch-af
index d2c9abfba2e5..9b74ee14b51b 100644
--- a/math/pari/files/patch-af
+++ b/math/pari/files/patch-af
@@ -1,31 +1,50 @@
---- config/Makefile.SH.orig	Tue Mar 28 02:33:26 2000
-+++ config/Makefile.SH	Sat Jul 15 10:52:27 2000
-@@ -290,7 +290,8 @@
- install-doc:
- 	-mkdir -p \$(MISCDIR)
- 	-mkdir -p \$(BINDIR)
+--- config/Makefile.SH.orig	Wed Apr 18 08:40:57 2001
++++ config/Makefile.SH	Tue Jun 26 12:26:00 2001
+@@ -167,7 +167,7 @@
+ LIBDIR = \$(DESTDIR)$libdir
+ BINDIR = \$(DESTDIR)$bindir
+ DATADIR= \$(DESTDIR)$datadir
+-MANDIR = \$(DESTDIR)$mandir
++MANDIR = \$(DESTDIR)\${PREFIX}/man/man1
+ ALLDIR = \$(DESTDIR)$miscdir
+ DOCDIR  = \$(ALLDIR)/doc
+ EMACSDIR= \$(ALLDIR)/emacs
+@@ -327,7 +327,7 @@
+ 
+ install-doc::
+ 	-mkdir -p \$(ALLDIR) \$(BINDIR) \$(DOCDIR)
 -	-cd $doc; \$(MAKE) all
 +#	-cd $doc; \$(MAKE) all
-+	-\$(INSTALL_PROGRAM) $doc/Makefile    \$(BINDIR)
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
- 	-\$(INSTALL_DATA) $doc/translations \$(MISCDIR)
- 	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(MISCDIR)
-@@ -300,10 +301,10 @@
- 	-\$(INSTALL_DATA) $doc/usersch3.tex \$(MISCDIR)
- 	-\$(INSTALL_DATA) $doc/usersch4.tex \$(MISCDIR)
- 	-\$(INSTALL_DATA) $doc/usersch5.tex \$(MISCDIR)
--	-\$(INSTALL_DATA) $doc/users.dvi    \$(MISCDIR)
--	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(MISCDIR)
--	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(MISCDIR)
--	-\$(INSTALL_DATA) $doc/refcard.ps   \$(MISCDIR)
-+#	-\$(INSTALL_DATA) $doc/users.dvi    \$(MISCDIR)
-+#	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(MISCDIR)
-+#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(MISCDIR)
-+#	-\$(INSTALL_DATA) $doc/refcard.ps   \$(MISCDIR)
+ 	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
+@@ -345,10 +345,10 @@
+ 	-\$(INSTALL_DATA) $doc/usersch3.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/usersch5.tex \$(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/users.dvi    \$(DOCDIR)
++#	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
++#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
++#	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
+ 
+ install-examples:
+ 	-mkdir -p \$(EXDIR)
+@@ -366,8 +366,8 @@
+ 	-\$(INSTALL_DATA) $ex/taylor.gp   \$(EXDIR)
  
  install-data:
- 	-mkdir -p \$(DATADIR)
-@@ -377,13 +378,13 @@
+-	-mkdir -p \$(DATADIR)
+-	-for f in $data/*; do \$(INSTALL_DATA)  \$\$f \$(DATADIR); done 2>/dev/null
++#	-mkdir -p \$(DATADIR)
++#	-for f in $data/*; do \$(INSTALL_DATA)  \$\$f \$(DATADIR); done 2>/dev/null
+ 
+ install-lib-sta: \$(LIBPARI_STA)
+ 	-mkdir -p \$(LIBDIR)
+@@ -435,13 +435,13 @@
  
  if test -n "$emacs"; then
    cat >> $file << EOT
@@ -37,10 +56,10 @@
 +#	-cd $emx; $emacs -batch -l compile
  
 -$install_emacs_files: $pari_elc
-+$install_emacs_files: #$pari_elc
- 	-mkdir -p \$(MISCDIR)
--	-\$(INSTALL_DATA)   $pari_elc           \$(MISCDIR)
-+#	-\$(INSTALL_DATA)   $pari_elc           \$(MISCDIR)
- 	\$(INSTALL_DATA)    $emx/pari.el        \$(MISCDIR)
- 	\$(INSTALL_DATA)    $emx/pariemacs.txt  \$(MISCDIR)
- 	\$(INSTALL_DATA)    $emx/with-syntax.el     \$(MISCDIR)
++$install_emacs_files: # $pari_elc
+ 	-mkdir -p \$(EMACSDIR)
+-	-\$(INSTALL_DATA)   $pari_elc           \$(EMACSDIR)
++#	-\$(INSTALL_DATA)   $pari_elc           \$(EMACSDIR)
+ 	\$(INSTALL_DATA)    $emx/pari.el        \$(EMACSDIR)
+ 	\$(INSTALL_DATA)    $emx/pariemacs.txt  \$(EMACSDIR)
+ 	\$(INSTALL_DATA)    $emx/with-syntax.el     \$(EMACSDIR)
diff --git a/math/pari/pkg-message b/math/pari/pkg-message
index 1e734297ea4d..ad56da4b7e4f 100644
--- a/math/pari/pkg-message
+++ b/math/pari/pkg-message
@@ -1,18 +1,22 @@
-*************************************************************************
-Copyright notice:
+This is PARI/GP, version 2.1.x (*).
+
+PARI/GP Number Theory-oriented Computer Algebra System
+        Copyright (C) 2000 The PARI Group, Bordeaux.
 
-This is version 1.39 of PARI, (c) 1989-1993 by
-C. Batut, D. Bernardi, H. Cohen and M. Olivier.
+PARI/GP is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation. It is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY WHATSOEVER.
 
-This software is intended as a service to the scientific community,
-but the authors cannot be held responsible for any consequences,
-either direct or indirect, which the use of this package may have. 
-It can be freely copied and spread, as long as no files are modified, and
-that the whole package (source and manual), including this README file
-is included.
+Check the License for details. You should have received a copy of it, along
+with the package; see the file 'COPYING'. If not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+==========================================================================
 *****
-Original copyright is in pari-1.39.03/src/README in the distfile:
-pari-1.39.03.tar.gz
+Original copyright is in pari-2.1.1/README in the distfile:
+pari-2.1.1.tar.gz
+
 
 This distfile can be found in /cdrom/ports/distfiles or 
 ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index 5771c098f16e..43236e90fab2 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -1,33 +1,71 @@
-bin/Makefile
-bin/gp
 bin/gp-2.1
-bin/gphelp
+bin/gp
 bin/tex2mail
-include/pari/genpari.h
+bin/gphelp
+include/pari/paricfg.h
+include/pari/pariinl.h
 include/pari/pari.h
+include/pari/paritype.h
 include/pari/paricast.h
-include/pari/paricfg.h
 include/pari/paricom.h
-include/pari/paridecl.h
 include/pari/parierr.h
 include/pari/parigen.h
-include/pari/pariinl.h
-include/pari/pariport.h
 include/pari/paristio.h
 include/pari/parisys.h
-include/pari/paritype.h
+include/pari/pariport.h
+include/pari/paridecl.h
+include/pari/genpari.h
+lib/libpari.so.2.1.1
+lib/libpari.so.1
 lib/libpari.so
-lib/libpari.so.2
-lib/libpari.so.2.1.0
-@exec /bin/mkdir -p %D/lib/pari/data
-lib/pari/paricfg.tex
-lib/pari/parimacro.tex
-lib/pari/translations
-lib/pari/usersch1.tex
-lib/pari/usersch2.tex
-lib/pari/usersch3.tex
-lib/pari/usersch4.tex
-lib/pari/usersch5.tex
+share/doc/pari/AUTHORS
+share/doc/pari/Announce.2.1
+share/doc/pari/CHANGES
+share/doc/pari/COMPAT
+share/doc/pari/COPYING
+share/doc/pari/CVS.txt
+share/doc/pari/MACHINES
+share/doc/pari/NEW
+share/doc/pari/README
+share/doc/pari/TODO
+share/doc/pari/misc/README
+share/doc/pari/misc/color.dft
+share/doc/pari/misc/gpalias
+share/doc/pari/misc/gpflog
+share/doc/pari/misc/gprc.dft
+share/doc/pari/misc/new.dic
+share/doc/pari/misc/pari.xpm
+share/doc/pari/misc/xgp
+share/doc/pari/doc/Makefile
+share/doc/pari/doc/translations
+share/doc/pari/doc/appa.tex
+share/doc/pari/doc/appb.tex
+share/doc/pari/doc/appc.tex
+share/doc/pari/doc/paricfg.tex.in
+share/doc/pari/doc/parimacro.tex
+share/doc/pari/doc/pdfmacs.tex
+share/doc/pari/doc/refcard.tex
+share/doc/pari/doc/tutorial.tex
+share/doc/pari/doc/users.tex
+share/doc/pari/doc/usersch1.tex
+share/doc/pari/doc/usersch2.tex
+share/doc/pari/doc/usersch3.tex
+share/doc/pari/doc/usersch4.tex
+share/doc/pari/doc/usersch5.tex
+share/doc/pari/examples/EXPLAIN
+share/doc/pari/examples/Inputrc
+share/doc/pari/examples/Makefile
+share/doc/pari/examples/bench.gp
+share/doc/pari/examples/cl.gp
+share/doc/pari/examples/classno.gp
+share/doc/pari/examples/contfrac.gp
+share/doc/pari/examples/lucas.gp
+share/doc/pari/examples/matexp.c
+share/doc/pari/examples/rho.gp
+share/doc/pari/examples/squfof.gp
+share/doc/pari/examples/taylor.gp
 @dirrm include/pari
-@dirrm lib/pari/data
-@dirrm lib/pari
+@dirrm share/doc/pari/misc
+@dirrm share/doc/pari/doc
+@dirrm share/doc/pari/examples
+@dirrm share/doc/pari
diff --git a/math/pari/pkg-plist.emacs b/math/pari/pkg-plist.emacs
index 50063030774d..86ca7ab2b5d9 100644
--- a/math/pari/pkg-plist.emacs
+++ b/math/pari/pkg-plist.emacs
@@ -1,37 +1,76 @@
-bin/Makefile
-bin/gp
 bin/gp-2.1
-bin/gphelp
+bin/gp
 bin/tex2mail
-include/pari/genpari.h
+bin/gphelp
+include/pari/paricfg.h
+include/pari/pariinl.h
 include/pari/pari.h
+include/pari/paritype.h
 include/pari/paricast.h
-include/pari/paricfg.h
 include/pari/paricom.h
-include/pari/paridecl.h
 include/pari/parierr.h
 include/pari/parigen.h
-include/pari/pariinl.h
-include/pari/pariport.h
 include/pari/paristio.h
 include/pari/parisys.h
-include/pari/paritype.h
+include/pari/pariport.h
+include/pari/paridecl.h
+include/pari/genpari.h
+lib/libpari.so.2.1.1
+lib/libpari.so.1
 lib/libpari.so
-lib/libpari.so.2
-lib/libpari.so.2.1.0
-@exec /bin/mkdir -p %D/lib/pari/data
-lib/pari/pari-translator.el
-lib/pari/pari.el
-lib/pari/paricfg.tex
-lib/pari/pariemacs.txt
-lib/pari/parimacro.tex
-lib/pari/translations
-lib/pari/usersch1.tex
-lib/pari/usersch2.tex
-lib/pari/usersch3.tex
-lib/pari/usersch4.tex
-lib/pari/usersch5.tex
-lib/pari/with-syntax.el
+share/doc/pari/emacs/pari.el
+share/doc/pari/emacs/pariemacs.txt
+share/doc/pari/emacs/with-syntax.el
+share/doc/pari/emacs/pari-translator.el
+share/doc/pari/AUTHORS
+share/doc/pari/Announce.2.1
+share/doc/pari/CHANGES
+share/doc/pari/COMPAT
+share/doc/pari/COPYING
+share/doc/pari/CVS.txt
+share/doc/pari/MACHINES
+share/doc/pari/NEW
+share/doc/pari/README
+share/doc/pari/TODO
+share/doc/pari/misc/README
+share/doc/pari/misc/color.dft
+share/doc/pari/misc/gpalias
+share/doc/pari/misc/gpflog
+share/doc/pari/misc/gprc.dft
+share/doc/pari/misc/new.dic
+share/doc/pari/misc/pari.xpm
+share/doc/pari/misc/xgp
+share/doc/pari/doc/Makefile
+share/doc/pari/doc/translations
+share/doc/pari/doc/appa.tex
+share/doc/pari/doc/appb.tex
+share/doc/pari/doc/appc.tex
+share/doc/pari/doc/paricfg.tex.in
+share/doc/pari/doc/parimacro.tex
+share/doc/pari/doc/pdfmacs.tex
+share/doc/pari/doc/refcard.tex
+share/doc/pari/doc/tutorial.tex
+share/doc/pari/doc/users.tex
+share/doc/pari/doc/usersch1.tex
+share/doc/pari/doc/usersch2.tex
+share/doc/pari/doc/usersch3.tex
+share/doc/pari/doc/usersch4.tex
+share/doc/pari/doc/usersch5.tex
+share/doc/pari/examples/EXPLAIN
+share/doc/pari/examples/Inputrc
+share/doc/pari/examples/Makefile
+share/doc/pari/examples/bench.gp
+share/doc/pari/examples/cl.gp
+share/doc/pari/examples/classno.gp
+share/doc/pari/examples/contfrac.gp
+share/doc/pari/examples/lucas.gp
+share/doc/pari/examples/matexp.c
+share/doc/pari/examples/rho.gp
+share/doc/pari/examples/squfof.gp
+share/doc/pari/examples/taylor.gp
 @dirrm include/pari
-@dirrm lib/pari/data
-@dirrm lib/pari
+@dirrm share/doc/pari/emacs
+@dirrm share/doc/pari/misc
+@dirrm share/doc/pari/doc
+@dirrm share/doc/pari/examples
+@dirrm share/doc/pari