- Revert this back to 2.3.5 since: of the only 2 in tree consumers, one is

  broken for other reasons (math/asir2000) and the other
  (math/p5-Math-Pari) doesn't work with 2.5 yet. This fixes
  math/p5-Math-Pari and things that depend on it.

4 files changed, 20 insertions, 19 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index e1551a42bad5..6bfe101f6b0f 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	pari
-PORTVERSION=	2.5.0
+PORTVERSION=	2.3.5
+PORTEPOCH=	1
 CATEGORIES=	math
-MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
+MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/OLD/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mathematics library and advanced calculator package
diff --git a/math/pari/distinfo b/math/pari/distinfo
index c13f3515bfe9..365f515057fe 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pari-2.5.0.tar.gz) = 5dc923b001ca0f8664facfafcd91946be63faf8f0e1df4b11bfac80f89ec37a2
-SIZE (pari-2.5.0.tar.gz) = 2714449
+SHA256 (pari-2.3.5.tar.gz) = 47ddae1af73b4476660d2a89338483949067a97ffb8758c82e8189dfa4c89d88
+SIZE (pari-2.3.5.tar.gz) = 2018097
diff --git a/math/pari/files/patch-af b/math/pari/files/patch-af
index eac455aac58a..0fbd681788fe 100644
--- a/math/pari/files/patch-af
+++ b/math/pari/files/patch-af
@@ -1,30 +1,29 @@
-$FreeBSD$
-
---- config/Makefile.SH.orig	2011-05-30 18:28:34.000000000 +0900
-+++ config/Makefile.SH	2011-08-11 07:57:51.000000000 +0900
-@@ -235,8 +235,10 @@
+--- config/Makefile.SH.orig	2010-01-09 17:59:48.000000000 +0000
++++ config/Makefile.SH	2011-09-21 17:55:47.000000000 +0000
+@@ -216,9 +216,11 @@
  INCLUDEDIR= "\$(DESTDIR)$includedir"
  LIBDIR    = "\$(DESTDIR)$libdir"
  BINDIR    = "\$(DESTDIR)$bindir"
 -MANDIR    = "\$(DESTDIR)$mandir"
--DATADIR   = "\$(DESTDIR)$datadir"
 +MANDIR    = "\$(DESTDIR)\${PREFIX}/man/man1"
+ EMACSDIR  = "\$(DESTDIR)$emacsdir"
+-DATADIR   = "\$(DESTDIR)$datadir"
 +ALLDIR    = \${PREFIX}/share/doc/pari
 +READMEDIR = "\$(ALLDIR)"
 +DATADIR   = "\$(ALLDIR)"
  SYSDATADIR= "\$(DESTDIR)$sysdatadir"
  
  EXDIR     = \$(DATADIR)/examples
-@@ -344,7 +346,7 @@
+@@ -316,7 +318,7 @@
  .headers: $HEADERS
- 	@sleep 3; touch \$@
+ 	@touch \$@
  
 -install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data
 +install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data install-top
  
  install-include:
  	-mkdir -p \$(INCLUDEDIR)/pari
-@@ -394,6 +396,17 @@
+@@ -367,6 +369,17 @@
  	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
  	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
  
@@ -42,7 +41,7 @@ $FreeBSD$
  install-cfg::
  	-mkdir -p \$(SYSDATADIR)
  	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
-@@ -404,7 +417,7 @@
+@@ -377,7 +390,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -51,7 +50,7 @@ $FreeBSD$
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -422,11 +435,11 @@
+@@ -395,11 +408,11 @@
  	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
@@ -66,5 +65,5 @@ $FreeBSD$
 +#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
 +#	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
  
- install-docpdf::
- 	-mkdir -p \$(BINDIR) \$(DOCDIR)
+ install-examples:
+ 	-mkdir -p \$(EXDIR)
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index 7bf91947d890..c315980d2b98 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -3,7 +3,6 @@ bin/gp-%%GP_VERSION%%
 bin/gphelp
 bin/tex2mail
 include/pari/genpari.h
-include/pari/mpinl.h
 include/pari/pari.h
 include/pari/paricast.h
 include/pari/paricfg.h
@@ -18,8 +17,10 @@ include/pari/paripriv.h
 include/pari/paristio.h
 include/pari/parisys.h
 include/pari/paritune.h
+include/pari/pariport.h
+include/pari/paritype.h
 lib/libpari-gmp.so.%%PORTVERSION%%
-lib/libpari-gmp.so.3
+lib/libpari-gmp.so.2
 lib/libpari.so
 lib/pari/pari.cfg
 @dirrm lib/pari