4 files changed, 63 insertions, 54 deletions

diff --git a/math/pari-devel/Makefile b/math/pari-devel/Makefile
index bb4557d1c3b2..3ca35b05d7cf 100644
--- a/math/pari-devel/Makefile
+++ b/math/pari-devel/Makefile
@@ -6,30 +6,31 @@
 #
 
 PORTNAME=	pari
-PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.a
+PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.b
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unstable/
-DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.alpha
+DISTNAME=	pari-${MAJOR_VERSION}.${MINOR_VERSION}.${REV_VERSION}.beta
 
 MAINTAINER=	yoshiaki@kt.rim.or.jp
 COMMENT=	Mathmatics library and advanced calculator package
 
+CONFLICTS=	pari-2.1.*
+
 NO_LATEST_LINK=	yes
 INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	--prefix=${PREFIX} --share-prefix=${PREFIX}/share
 
-USE_GMAKE=	yes
 MAKE_ARGS=	gp
 PLIST_SUB=	MAJOR_VERSION=${MAJOR_VERSION} MINOR_VERSION=${MINOR_VERSION} REV_VERSION=${REV_VERSION}
 
 MAJOR_VERSION=	2
 MINOR_VERSION=	2
-REV_VERSION=	10
+REV_VERSION=	12
 
-MAN1=		gp.1 gphelp.1 tex2mail.1
-MLINKS=		gp.1 pari.1
+MAN1=		gp-2.2.1 gphelp.1 tex2mail.1
+MLINKS=		gp-2.2.1 gp.1 gp.1 pari.1
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/pari-devel/distinfo b/math/pari-devel/distinfo
index f8a1c4d3d1c5..89e86d4d65a5 100644
--- a/math/pari-devel/distinfo
+++ b/math/pari-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pari-2.2.10.alpha.tar.gz) = 9fff6712c9202b22aa81a572bed2cfc8
-SHA256 (pari-2.2.10.alpha.tar.gz) = 934cbda72ae172dc4c764d423e88375f3b2752ce77935e8b4550fb207e702aa9
-SIZE (pari-2.2.10.alpha.tar.gz) = 2088335
+MD5 (pari-2.2.12.beta.tar.gz) = cd03122b04e6c7d4a198a8c23fe3eaa6
+SHA256 (pari-2.2.12.beta.tar.gz) = f061478c9333dbd06c4942466f23f59cad2ef01125b7d2daa637869d8780bd09
+SIZE (pari-2.2.12.beta.tar.gz) = 2065915
diff --git a/math/pari-devel/files/patch-af b/math/pari-devel/files/patch-af
index 59e280642e6f..d38cb95063bf 100644
--- a/math/pari-devel/files/patch-af
+++ b/math/pari-devel/files/patch-af
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- config/Makefile.SH.orig
-+++ config/Makefile.SH
-@@ -176,7 +176,7 @@
+--- 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
@@ -12,31 +9,39 @@ $FreeBSD$
  DLCFLAGS   = $DLCFLAGS
  LD_FLAVOR  = \$(CC_FLAVOR)
  LD         = $LD \$(LD_FLAVOR)
-@@ -238,9 +238,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
+@@ -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"
+-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"
++READMEDIR = "\$(ALLDIR)"
++DATADIR   = "\$(ALLDIR)" 
++SYSDATADIR= "\$(DESTDIR)$sysdatadir"
  
  EXDIR     = \$(DATADIR)/examples
-@@ -392,7 +395,7 @@
- 	-\$(RM) \$(MANDIR)/pari.1
+ MISCDIR   = \$(DATADIR)/misc
+@@ -385,7 +387,7 @@
  	-\$(LN) gp.1 \$(MANDIR)/pari.1
+ 	-\$(LN) gp-$version.1 \$(MANDIR)/gp.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)
-@@ -405,6 +408,19 @@
+@@ -398,6 +400,19 @@
  	\$(INSTALL_DATA) $misc/pari.xpm  \$(MISCDIR)
  	\$(INSTALL_PROGRAM) $misc/xgp    \$(MISCDIR)
  
@@ -54,9 +59,9 @@ $FreeBSD$
 +	\$(INSTALL_DATA) $TOP/TODO         \$(READMEDIR)
 +
  install-cfg::
- 	-mkdir -p \$(SYSDATADIR) \$(DATADIR)/PARI
- 	\$(INSTALL_DATA) $desc/pari.desc   \$(DATADIR)
-@@ -413,7 +429,7 @@
+ 	-mkdir -p \$(SYSDATADIR)
+ 	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
+@@ -408,7 +423,7 @@
  
  install-doc::
  	-mkdir -p \$(BINDIR) \$(DOCDIR)
@@ -65,7 +70,7 @@ $FreeBSD$
  	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
  	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -431,11 +447,11 @@
+@@ -426,11 +441,11 @@
  	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
  	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
@@ -82,26 +87,14 @@ $FreeBSD$
  
  install-examples:
  	-mkdir -p \$(EXDIR)
-@@ -532,15 +548,16 @@
- 
- if test -n "$emacs"; then
-   cat >> $file << EOT
--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
+@@ -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 *.elc *.el pariemacs.txt; do \
 +	-cd $emx; for f in *.el pariemacs.txt; do \
  	  \$(INSTALL_DATA) \$\$f \$(EMACSDIR); \
  	done
diff --git a/math/pari-devel/pkg-plist.emacs b/math/pari-devel/pkg-plist.emacs
index 4cfc75c4aec9..d21921075a9e 100644
--- a/math/pari-devel/pkg-plist.emacs
+++ b/math/pari-devel/pkg-plist.emacs
@@ -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,8 @@ 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
 %%DOCSDIR%%/CHANGES
@@ -28,8 +33,8 @@ lib/libpari-%%MAJOR_VERSION%%.%%MINOR_VERSION%%.so
 %%DOCSDIR%%/NEW
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
-%%DOCSDIR%%/pari.desc
 %%DOCSDIR%%/PARI/822.pm
+%%DOCSDIR%%/pari.desc
 %%DOCSDIR%%/misc/README
 %%DOCSDIR%%/misc/color.dft
 %%DOCSDIR%%/misc/gpalias
@@ -61,14 +66,24 @@ lib/libpari-%%MAJOR_VERSION%%.%%MINOR_VERSION%%.so
 %%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
+share/emacs/site-lisp/pari/pari-conf.el
+share/emacs/site-lisp/pari/pari-completion.el
+share/emacs/site-lisp/pari/pari-fontification.el
+share/emacs/site-lisp/pari/pari-help.el
+share/emacs/site-lisp/pari/pari-messages.el
+share/emacs/site-lisp/pari/pari.el
+share/emacs/site-lisp/pari/pariemacs.txt
+share/emacs/site-lisp/pari/sli-tools.el
 @dirrm include/pari
-@dirrm %%DOCSDIR%%/PARI
+@dirrm lib/pari
 @dirrm %%DOCSDIR%%/misc
 @dirrm %%DOCSDIR%%/doc
 @dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%/PARI
 @dirrm %%DOCSDIR%%
+@dirrm share/emacs/site-lisp/pari