6 files changed, 95 insertions, 44 deletions

diff --git a/math/pari-devel/Makefile b/math/pari-devel/Makefile
index 9a6ec370425f..a7ec7cd06d6f 100644
--- a/math/pari-devel/Makefile
+++ b/math/pari-devel/Makefile
@@ -8,15 +8,12 @@
 PORTNAME=	pari
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.a
 CATEGORIES=	math
-MASTER_SITES=	ftp://www.gn-50uma.de/gn/gn-50uma.de/pari-2.2/ \
-		http://www.gn-50uma.de/ftp/pari-2.2/
+MASTER_SITES=	http://pari.math.u-bordeaux.fr/download/
 DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.alpha
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 COMMENT=	Mathmatics library and advanced calculator package
 
-ONLY_FOR_ARCHS=	i386
-
 NO_LATEST_LINK=	yes
 INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
@@ -29,7 +26,7 @@ PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} REV_VER
 
 MAJOR_VERSION=	2
 MINOR_VERSION=	2
-REV_VERSION=	4
+REV_VERSION=	7
 
 MAN1=		gp.1 gphelp.1 tex2mail.1
 MLINKS=		gp.1 pari.1
diff --git a/math/pari-devel/distinfo b/math/pari-devel/distinfo
index f2d715d9a70d..8cee34d008b2 100644
--- a/math/pari-devel/distinfo
+++ b/math/pari-devel/distinfo
@@ -1 +1 @@
-MD5 (pari-2.2.4.alpha.tar.gz) = da104962785bf06956a83eee6074f5d0
+MD5 (pari-2.2.7.alpha.tar.gz) = 2c86b8389b7af784e903112048d8d2a3
diff --git a/math/pari-devel/files/patch-af b/math/pari-devel/files/patch-af
index 71d57bbf7f03..7478e91a4b63 100644
--- a/math/pari-devel/files/patch-af
+++ b/math/pari-devel/files/patch-af
@@ -1,15 +1,50 @@
---- config/Makefile.SH.orig	Tue Jun 11 02:48:05 2002
-+++ config/Makefile.SH	Mon Jul 29 11:31:28 2002
-@@ -242,7 +242,7 @@
- LIBDIR = \$(DESTDIR)$libdir
- BINDIR = \$(DESTDIR)$bindir
- DATADIR= \$(DESTDIR)$datadir
--MANDIR = \$(DESTDIR)$mandir
-+MANDIR = \$(DESTDIR)\${PREFIX}/man/man1
- ALLDIR = \$(DESTDIR)$miscdir
- READMEDIR = \$(ALLDIR)
- DOCDIR  = \$(ALLDIR)/doc
-@@ -430,7 +430,7 @@
+--- config/Makefile.SH.orig	Wed Dec 17 07:44:36 2003
++++ config/Makefile.SH	Sun Jan 11 01:52:40 2004
+@@ -255,9 +255,12 @@
+ INCLUDEDIR= \$(DESTDIR)$includedir
+ LIBDIR    = \$(DESTDIR)$libdir
+ BINDIR    = \$(DESTDIR)$bindir
+-MANDIR    = \$(DESTDIR)$mandir
++MANDIR    = \$(DESTDIR)\${PREFIX}/man/man1
+ EMACSDIR  = \$(DESTDIR)$emacsdir
+-DATADIR   = \$(DESTDIR)$datadir
++#DATADIR   = \$(DESTDIR)$datadir
++ALLDIR    =\${PREFIX}/share/doc/pari
++READMEDIR = \$(ALLDIR)
++DATADIR   = \$(ALLDIR)
+ SYSDATADIR= \$(DESTDIR)$sysdatadir
+ 
+ EXDIR     = \$(DATADIR)/examples
+@@ -403,7 +406,7 @@
+ 	-\$(RM) \$(MANDIR)/pari.1
+ 	-\$(LN) gp.1 \$(MANDIR)/pari.1
+ 
+-install-misc: $install_emacs_files
++install-misc: $install_emacs_files install-top
+ 	-mkdir -p \$(MISCDIR) \$(BINDIR)
+ 	\$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
+ 	\$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
+@@ -416,6 +419,19 @@
+ 	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
+ 	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
+ 
++install-top::
++	-mkdir -p \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/AUTHORS      \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/Announce.2.1 \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/CHANGES      \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/COMPAT       \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/COPYING      \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/CVS.txt      \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/MACHINES     \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/NEW          \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/README       \$(READMEDIR)
++	\$(INSTALL_DATA) $TOP/TODO         \$(READMEDIR)
++
+ install-cfg::
+ 	-mkdir -p \$(SYSDATADIR) \$(DATADIR)/PARI
+ 	\$(INSTALL_DATA) $desc/pari.desc   \$(DATADIR)
+@@ -424,7 +440,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -18,7 +53,7 @@
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -448,10 +448,10 @@
+@@ -442,10 +458,10 @@
  	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
@@ -33,33 +68,26 @@
  
  install-examples:
  	-mkdir -p \$(EXDIR)
-@@ -469,8 +469,8 @@
- 	-\$(INSTALL_DATA) $ex/taylor.gp   \$(EXDIR)
- 
- install-data:
--	-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)
-@@ -538,13 +538,13 @@
+@@ -540,15 +556,16 @@
  
  if test -n "$emacs"; then
    cat >> $file << EOT
--$pari_elc: $emx/pari.el
--	@echo "Byte-Compiling pari.el..."
--	-cd $emx; $emacs -batch -l compile
-+#$pari_elc: $emx/pari.el
-+#	@echo "Byte-Compiling pari.el..."
-+#	-cd $emx; $emacs -batch -l compile
+-elc:
+-	@echo "Byte-Compiling elisp files..."
+-	-cd $emx; $emacs -batch \
+-	   --eval '(setq load-path (append (list ".") load-path))' \
+-	   -f batch-byte-compile *.el
++#elc:
++#	@echo "Byte-Compiling elisp files..."
++#	-cd $emx; $emacs -batch \
++#	   --eval '(setq load-path (append (list ".") load-path))' \
++#	   -f batch-byte-compile *.el
  
--$install_emacs_files: $pari_elc
-+$install_emacs_files: # $pari_elc
+ $install_emacs_files: 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)
+-	-cd $emx; for f in *.elc *.el pariemacs.txt; do \
++#	-cd $emx; for f in *.elc *.el pariemacs.txt; do \
++	-cd $emx; for f in *.el pariemacs.txt; do \
+ 	  \$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
+ 	done
+ EOT
diff --git a/math/pari-devel/files/patch-ai b/math/pari-devel/files/patch-ai
new file mode 100644
index 000000000000..4ba9f537c105
--- /dev/null
+++ b/math/pari-devel/files/patch-ai
@@ -0,0 +1,11 @@
+--- config/get_cc.orig	Thu Jan  8 01:20:56 2004
++++ config/get_cc	Thu Jan  8 01:21:30 2004
+@@ -119,7 +119,7 @@
+   DBGFLAGS=${DBGFLAGS:-"-g $warn"}
+   # Some architectures need -fPIC for building dynamic lib
+   case "$osname-$arch" in
+-    hpux-*|*-ia64) DLCFLAGS=-fPIC ;;
++    hpux-*|*-ia64|*-amd64) DLCFLAGS=-fPIC ;;
+     darwin-*) DLCFLAGS=-fno-common;;
+   esac
+   # Specific optimisations for some architectures
diff --git a/math/pari-devel/files/patch-aj b/math/pari-devel/files/patch-aj
new file mode 100644
index 000000000000..0b47ef82f399
--- /dev/null
+++ b/math/pari-devel/files/patch-aj
@@ -0,0 +1,10 @@
+--- config/TOP_Make.SH.orig	Thu Jan  8 01:42:56 2004
++++ config/TOP_Make.SH	Thu Jan  8 01:43:11 2004
+@@ -37,7 +37,6 @@
+ 	@echo "Available extra tests: $top_test_extra"
+ 
+ all::
+-	@-cd doc && \$(MAKE) doc
+ 	@\$(MAKE) gp
+ 
+ gp bench test-kernel $top_test_extra $top_dotest_extra install cleanobj cleantest install-bin install-doc install-data install-lib-sta install-bin-sta dobench tune::
diff --git a/math/pari-devel/pkg-plist b/math/pari-devel/pkg-plist
index a89fdb980441..e11cb0061e31 100644
--- a/math/pari-devel/pkg-plist
+++ b/math/pari-devel/pkg-plist
@@ -18,6 +18,7 @@ include/pari/genpari.h
 lib/libpari-%%MAJOR_VERSION%%.%%MINOR_VERSION%%.so.%%REV_VERSION%%.0.0
 lib/libpari-%%MAJOR_VERSION%%.%%MINOR_VERSION%%.so.%%REV_VERSION%%
 lib/libpari-%%MAJOR_VERSION%%.%%MINOR_VERSION%%.so
+lib/pari/pari.cfg
 share/doc/pari/AUTHORS
 share/doc/pari/Announce.2.1
 share/doc/pari/CHANGES
@@ -28,6 +29,8 @@ share/doc/pari/MACHINES
 share/doc/pari/NEW
 share/doc/pari/README
 share/doc/pari/TODO
+share/doc/pari/PARI/822.pm
+share/doc/pari/pari.desc
 share/doc/pari/misc/README
 share/doc/pari/misc/color.dft
 share/doc/pari/misc/gpalias
@@ -65,7 +68,9 @@ share/doc/pari/examples/rho.gp
 share/doc/pari/examples/squfof.gp
 share/doc/pari/examples/taylor.gp
 @dirrm include/pari
+@dirrm lib/pari
 @dirrm share/doc/pari/misc
 @dirrm share/doc/pari/doc
 @dirrm share/doc/pari/examples
+@dirrm share/doc/pari/PARI
 @dirrm share/doc/pari