7 files changed, 34 insertions, 41 deletions

diff --git a/math/pari-devel/Makefile b/math/pari-devel/Makefile
index 9820917b4b96..54139a969b48 100644
--- a/math/pari-devel/Makefile
+++ b/math/pari-devel/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	pari
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.a
 PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	http://pari.math.u-bordeaux.fr/download/
+MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unstable/
 DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.alpha
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
@@ -27,17 +27,13 @@ PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} REV_VER
 
 MAJOR_VERSION=	2
 MINOR_VERSION=	2
-REV_VERSION=	7
+REV_VERSION=	9
 
 MAN1=		gp.1 gphelp.1 tex2mail.1
 MLINKS=		gp.1 pari.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-USE_GCC=	3.3
-.endif
-
 HAVE_EMACS!=	${WHICH} emacs || ${ECHO} nope
 .if ${HAVE_EMACS} != "nope"
 PLIST=		${PKGDIR}/pkg-plist.emacs
diff --git a/math/pari-devel/distinfo b/math/pari-devel/distinfo
index 337a1d80e323..2b63d1ae1e31 100644
--- a/math/pari-devel/distinfo
+++ b/math/pari-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (pari-2.2.7.alpha.tar.gz) = 2c86b8389b7af784e903112048d8d2a3
-SIZE (pari-2.2.7.alpha.tar.gz) = 1960856
+MD5 (pari-2.2.9.alpha.tar.gz) = 3c1e34ee8c48f01b8cac3fb79eff22c3
+SIZE (pari-2.2.9.alpha.tar.gz) = 2039740
diff --git a/math/pari-devel/files/patch-af b/math/pari-devel/files/patch-af
index 31813f3f632d..c4334430177f 100644
--- a/math/pari-devel/files/patch-af
+++ b/math/pari-devel/files/patch-af
@@ -1,6 +1,6 @@
---- config/Makefile.SH.orig	Wed Dec 17 07:44:36 2003
-+++ config/Makefile.SH	Wed Jan 28 23:21:55 2004
-@@ -255,9 +255,12 @@
+--- config/Makefile.SH.orig	Mon Dec 20 00:47:02 2004
++++ config/Makefile.SH	Sun Jan  9 18:26:30 2005
+@@ -238,9 +238,12 @@
  INCLUDEDIR= \$(DESTDIR)$includedir
  LIBDIR    = \$(DESTDIR)$libdir
  BINDIR    = \$(DESTDIR)$bindir
@@ -15,7 +15,7 @@
  SYSDATADIR= \$(DESTDIR)$sysdatadir
  
  EXDIR     = \$(DATADIR)/examples
-@@ -403,7 +406,7 @@
+@@ -392,7 +395,7 @@
  	-\$(RM) \$(MANDIR)/pari.1
  	-\$(LN) gp.1 \$(MANDIR)/pari.1
  
@@ -24,7 +24,7 @@
  	-mkdir -p \$(MISCDIR) \$(BINDIR)
  	\$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
  	\$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
-@@ -416,6 +419,19 @@
+@@ -405,6 +408,19 @@
  	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
  	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
  
@@ -44,7 +44,7 @@
  install-cfg::
  	-mkdir -p \$(SYSDATADIR) \$(DATADIR)/PARI
  	\$(INSTALL_DATA) $desc/pari.desc   \$(DATADIR)
-@@ -424,7 +440,7 @@
+@@ -413,7 +429,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -53,14 +53,16 @@
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -442,10 +458,10 @@
+@@ -431,11 +447,11 @@
  	-\$(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.dvi    \$(DOCDIR)
 +#	-\$(INSTALL_DATA) $doc/users.dvi    \$(DOCDIR)
 +#	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
 +#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
@@ -68,7 +70,7 @@
  
  install-examples:
  	-mkdir -p \$(EXDIR)
-@@ -540,15 +556,16 @@
+@@ -532,15 +548,16 @@
  
  if test -n "$emacs"; then
    cat >> $file << EOT
diff --git a/math/pari-devel/files/patch-ag b/math/pari-devel/files/patch-ag
index d0fc2b22b2d6..1c33689bfc43 100644
--- a/math/pari-devel/files/patch-ag
+++ b/math/pari-devel/files/patch-ag
@@ -1,9 +1,11 @@
---- doc/appb.tex.orig	Mon Jan 10 02:59:06 2000
-+++ doc/appb.tex	Mon Jan 10 02:59:23 2000
-@@ -29,5 +29,5 @@
- seen in detail in \secref{se:prog}, with the slight modifications explained
- at the end of that section.
+--- doc/appb.tex.orig	Mon Dec 13 12:29:22 2004
++++ doc/appb.tex	Sun Jan  9 18:34:08 2005
+@@ -30,7 +30,7 @@
+       $(CC) $(CFLAGS) -o extgcd extgcd.c -lpari -lm
+ @eprog
  
--\bprogfile{../examples/matexp.c}
+-\noindent We then give the listing of the program \kbd{examples/extgcd.c}
 +\bprogfile{./matexp.c}
- \vfill\eject
+ seen in detail in \secref{se:prog}.
+ 
+ \bprogfile{../examples/extgcd.c}
diff --git a/math/pari-devel/files/patch-ai b/math/pari-devel/files/patch-ai
deleted file mode 100644
index 4ba9f537c105..000000000000
--- a/math/pari-devel/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 0b47ef82f399..716beb1e12d5 100644
--- a/math/pari-devel/files/patch-aj
+++ b/math/pari-devel/files/patch-aj
@@ -1,10 +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"
+--- config/TOP_Make.SH.orig	Thu Jan 15 04:33:33 2004
++++ config/TOP_Make.SH	Sun Jan  9 18:38:25 2005
+@@ -38,7 +38,6 @@
+ 	@echo "Available extra tests: test-all $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::
+ 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::
diff --git a/math/pari-devel/pkg-plist b/math/pari-devel/pkg-plist
index d4074daaa8d1..e05a37a40b93 100644
--- a/math/pari-devel/pkg-plist
+++ b/math/pari-devel/pkg-plist
@@ -5,6 +5,10 @@ bin/gphelp
 include/pari/paricfg.h
 include/pari/pariinl.h
 include/pari/pari.h
+include/pari/parinf.h
+include/pari/pariold.h
+include/pari/paripriv.h
+include/pari/paritune.h
 include/pari/paritype.h
 include/pari/paricast.h
 include/pari/paricom.h
@@ -17,7 +21,7 @@ include/pari/paridecl.h
 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/libpari.so
 lib/pari/pari.cfg
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/Announce.2.1
@@ -62,8 +66,8 @@ lib/pari/pari.cfg
 %%DOCSDIR%%/examples/cl.gp
 %%DOCSDIR%%/examples/classno.gp
 %%DOCSDIR%%/examples/contfrac.gp
+%%DOCSDIR%%/examples/extgcd.c
 %%DOCSDIR%%/examples/lucas.gp
-%%DOCSDIR%%/examples/matexp.c
 %%DOCSDIR%%/examples/rho.gp
 %%DOCSDIR%%/examples/squfof.gp
 %%DOCSDIR%%/examples/taylor.gp