6 files changed, 56 insertions, 173 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 1a38548233dd..3b19d5ffaad0 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	pari
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}
-PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
 DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}
@@ -15,9 +14,6 @@ DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mathematics library and advanced calculator package
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
-
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 
 MAKE_JOBS_UNSAFE=	yes
@@ -25,38 +21,26 @@ MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=	--prefix=${PREFIX} --share-prefix=${PREFIX}/share --with-gmp=${LOCALBASE}
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--share-prefix=${PREFIX}/share \
+		--with-gmp=${LOCALBASE}
 
 MAKE_ARGS=	gp
-PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} REV_VERSION=${REV_VERSION}
+
+PORTDOCS=	*
+PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} \
+		REV_VERSION=${REV_VERSION}
 
 MAJOR_VERSION=	2
-MINOR_VERSION=	3
-REV_VERSION=	5
+MINOR_VERSION=	5
+REV_VERSION=	0
 
 MAN1=		gp.1 gphelp.1 gp-${MAJOR_VERSION}.${MINOR_VERSION}.1 tex2mail.1
 MLINKS=		gp.1 pari.1
 
-.include <bsd.port.pre.mk>
-
-HAVE_EMACS!=	${WHICH} emacs || ${ECHO} nope
-HAVE_PERL!=	${WHICH} perl || ${ECHO} nope
-
-.if ${HAVE_EMACS} != "nope"
-PLIST_SUB+=	EMACS=""
-.else
-PLIST_SUB+=	EMACS="@comment "
-.endif
-
-.if ${HAVE_PERL} != "nope"
-PLIST_SUB+=	PERL=""
-.else
-PLIST_SUB+=	PERL="@comment "
-.endif
-
 post-install:
-	@if [ -L ${PREFIX}/man/man1/pari.1 ]; then \
-		${RM} -f ${PREFIX}/man/man1/pari.1 ;\
+	@if [ -L ${MAN1PREFIX}/man/man1/pari.1 ]; then \
+		${RM} -f ${MAN1PREFIX}/man/man1/pari.1 ;\
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 365f515057fe..c13f3515bfe9 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pari-2.3.5.tar.gz) = 47ddae1af73b4476660d2a89338483949067a97ffb8758c82e8189dfa4c89d88
-SIZE (pari-2.3.5.tar.gz) = 2018097
+SHA256 (pari-2.5.0.tar.gz) = 5dc923b001ca0f8664facfafcd91946be63faf8f0e1df4b11bfac80f89ec37a2
+SIZE (pari-2.5.0.tar.gz) = 2714449
diff --git a/math/pari/files/patch-af b/math/pari/files/patch-af
index d38cb95063bf..eac455aac58a 100644
--- a/math/pari/files/patch-af
+++ b/math/pari/files/patch-af
@@ -1,67 +1,48 @@
---- config/Makefile.SH.orig	Tue Jan 17 00:52:21 2006
-+++ config/Makefile.SH	Tue Feb 28 18:09:23 2006
-@@ -162,7 +162,7 @@
- CC_FLAVOR  =
- CC         = $CC \$(CC_FLAVOR)
- CPPFLAGS   = $CPPFLAGS
--CFLAGS     = $CFLAGS
-+CFLAGS     = $CFLAGS -fPIC
- DLCFLAGS   = $DLCFLAGS
- LD_FLAVOR  = \$(CC_FLAVOR)
- LD         = $LD \$(LD_FLAVOR)
-@@ -221,13 +221,15 @@
- 
- # Change these installation directories to suit your needs.
- # DESTDIR is used to install to a false hierachy (to build a Debian package)
--INCLUDEDIR= "\$(DESTDIR)$includedir"
--LIBDIR    = "\$(DESTDIR)$libdir"
--BINDIR    = "\$(DESTDIR)$bindir"
+$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 @@
+ INCLUDEDIR= "\$(DESTDIR)$includedir"
+ LIBDIR    = "\$(DESTDIR)$libdir"
+ BINDIR    = "\$(DESTDIR)$bindir"
 -MANDIR    = "\$(DESTDIR)$mandir"
--EMACSDIR  = "\$(DESTDIR)$emacsdir"
 -DATADIR   = "\$(DESTDIR)$datadir"
--SYSDATADIR= "\$(DESTDIR)$sysdatadir"
-+INCLUDEDIR= "\$(DESTDIR)$includedir"
-+LIBDIR    = "\$(DESTDIR)$libdir"
-+BINDIR    = "\$(DESTDIR)$bindir"
 +MANDIR    = "\$(DESTDIR)\${PREFIX}/man/man1"
-+EMACSDIR  = "\$(DESTDIR)$emacsdir"
-+ALLDIR    = "\${PREFIX}/share/doc/pari"
++ALLDIR    = \${PREFIX}/share/doc/pari
 +READMEDIR = "\$(ALLDIR)"
-+DATADIR   = "\$(ALLDIR)" 
-+SYSDATADIR= "\$(DESTDIR)$sysdatadir"
++DATADIR   = "\$(ALLDIR)"
+ SYSDATADIR= "\$(DESTDIR)$sysdatadir"
  
  EXDIR     = \$(DATADIR)/examples
- MISCDIR   = \$(DATADIR)/misc
-@@ -385,7 +387,7 @@
- 	-\$(LN) gp.1 \$(MANDIR)/pari.1
- 	-\$(LN) gp-$version.1 \$(MANDIR)/gp.1
+@@ -344,7 +346,7 @@
+ .headers: $HEADERS
+ 	@sleep 3; 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-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)
-@@ -398,6 +400,19 @@
+ install-include:
+ 	-mkdir -p \$(INCLUDEDIR)/pari
+@@ -394,6 +396,17 @@
  	\$(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/CHANGES-2.2  \$(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)
  	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
-@@ -408,7 +423,7 @@
+@@ -404,7 +417,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -70,7 +51,7 @@
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -426,11 +441,11 @@
+@@ -422,11 +435,11 @@
  	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
@@ -85,17 +66,5 @@
 +#	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
 +#	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
  
- install-examples:
- 	-mkdir -p \$(EXDIR)
-@@ -524,9 +539,9 @@
- 	   --eval '(setq load-path (append (list ".") load-path))' \
- 	   -f batch-byte-compile *.el
- 
--$install_emacs_files: elc
-+$install_emacs_files: #elc
- 	-mkdir -p \$(EMACSDIR)
--	-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
+ install-docpdf::
+ 	-mkdir -p \$(BINDIR) \$(DOCDIR)
diff --git a/math/pari/files/patch-ag b/math/pari/files/patch-ag
deleted file mode 100644
index 1c33689bfc43..000000000000
--- a/math/pari/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
--\noindent We then give the listing of the program \kbd{examples/extgcd.c}
-+\bprogfile{./matexp.c}
- seen in detail in \secref{se:prog}.
- 
- \bprogfile{../examples/extgcd.c}
diff --git a/math/pari/files/patch-config-TOP_Make.SH b/math/pari/files/patch-config-TOP_Make.SH
index 716beb1e12d5..4cc315be421d 100644
--- a/math/pari/files/patch-config-TOP_Make.SH
+++ b/math/pari/files/patch-config-TOP_Make.SH
@@ -1,10 +1,12 @@
---- 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"
+$FreeBSD$
+
+--- config/TOP_Make.SH.orig	2011-07-12 17:57:15.000000000 +0900
++++ config/TOP_Make.SH	2011-07-12 17:57:33.000000000 +0900
+@@ -42,7 +42,6 @@
  
  all::
--	@-cd doc && \$(MAKE) doc
  	@\$(MAKE) gp
+-	@-cd doc && \$(MAKE) doc
  
- 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::
+ gp bench test-kernel test-all $top_test_extra $top_dotest_extra install cleanall cleanobj cleantest install-bin install-doc install-docpdf install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
diff --git a/math/pari/pkg-plist b/math/pari/pkg-plist
index e242dd862a98..1fabb427f61c 100644
--- a/math/pari/pkg-plist
+++ b/math/pari/pkg-plist
@@ -1,87 +1,26 @@
 bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
 bin/gp
-bin/tex2mail
 bin/gphelp
+bin/tex2mail
 include/pari/paricfg.h
-include/pari/pariinl.h
-include/pari/pari.h
-include/pari/parinf.h
-include/pari/pariold.h
+include/pari/paridecl.h
 include/pari/paripriv.h
-include/pari/paritune.h
-include/pari/paritype.h
+include/pari/pari.h
 include/pari/paricast.h
 include/pari/paricom.h
 include/pari/parierr.h
 include/pari/parigen.h
+include/pari/pariinl.h
+include/pari/parinf.h
+include/pari/pariold.h
 include/pari/paristio.h
 include/pari/parisys.h
-include/pari/pariport.h
-include/pari/paridecl.h
+include/pari/paritune.h
 include/pari/genpari.h
+include/pari/mpinl.h
 lib/libpari-gmp.so.%%MAJOR_VERSION%%.%%MINOR_VERSION%%.%%REV_VERSION%%
-lib/libpari-gmp.so.%%MAJOR_VERSION%%
+lib/libpari-gmp.so.3
 lib/libpari.so
 lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%PERL%%%%DOCSDIR%%/PARI/822.pm
-%%PERL%%%%DOCSDIR%%/pari.desc
-%%DOCSDIR%%/misc/README
-%%DOCSDIR%%/misc/color.dft
-%%DOCSDIR%%/misc/gpalias
-%%DOCSDIR%%/misc/gpflog
-%%DOCSDIR%%/misc/gprc.dft
-%%DOCSDIR%%/misc/new.dic
-%%DOCSDIR%%/misc/pari.xpm
-%%DOCSDIR%%/misc/xgp
-%%DOCSDIR%%/doc/Makefile
-%%DOCSDIR%%/doc/translations
-%%DOCSDIR%%/doc/appa.tex
-%%DOCSDIR%%/doc/appb.tex
-%%DOCSDIR%%/doc/appc.tex
-%%DOCSDIR%%/doc/paricfg.tex
-%%DOCSDIR%%/doc/parimacro.tex
-%%DOCSDIR%%/doc/pdfmacs.tex
-%%DOCSDIR%%/doc/refcard.tex
-%%DOCSDIR%%/doc/tutorial.tex
-%%DOCSDIR%%/doc/users.tex
-%%DOCSDIR%%/doc/usersch1.tex
-%%DOCSDIR%%/doc/usersch2.tex
-%%DOCSDIR%%/doc/usersch3.tex
-%%DOCSDIR%%/doc/usersch4.tex
-%%DOCSDIR%%/doc/usersch5.tex
-%%DOCSDIR%%/examples/EXPLAIN
-%%DOCSDIR%%/examples/Inputrc
-%%DOCSDIR%%/examples/Makefile
-%%DOCSDIR%%/examples/bench.gp
-%%DOCSDIR%%/examples/cl.gp
-%%DOCSDIR%%/examples/classno.gp
-%%DOCSDIR%%/examples/contfrac.gp
-%%DOCSDIR%%/examples/extgcd.c
-%%DOCSDIR%%/examples/lucas.gp
-%%DOCSDIR%%/examples/rho.gp
-%%DOCSDIR%%/examples/squfof.gp
-%%DOCSDIR%%/examples/taylor.gp
-%%EMACS%%share/emacs/site-lisp/pari/pari-conf.el
-%%EMACS%%share/emacs/site-lisp/pari/pari-completion.el
-%%EMACS%%share/emacs/site-lisp/pari/pari-fontification.el
-%%EMACS%%share/emacs/site-lisp/pari/pari-help.el
-%%EMACS%%share/emacs/site-lisp/pari/pari-messages.el
-%%EMACS%%share/emacs/site-lisp/pari/pari.el
-%%EMACS%%share/emacs/site-lisp/pari/pariemacs.txt
-%%EMACS%%share/emacs/site-lisp/pari/sli-tools.el
 @dirrm include/pari
 @dirrm lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-%%PERL%%@dirrm %%DOCSDIR%%/PARI
-@dirrm %%DOCSDIR%%
-%%EMACS%%@dirrm share/emacs/site-lisp/pari