12 files changed, 3 insertions, 379 deletions

diff --git a/MOVED b/MOVED
index 87d6ab41f177..5531b9b81156 100644
--- a/MOVED
+++ b/MOVED
@@ -2368,3 +2368,4 @@ net/gnomemeeting||2006-06-05|Has expired: Superseeded by net/ekiga
 news/knzb||2006-06-05|Has expired: This seems to be abandonware. Try news/klibido
 x11/linux-gnomelibs||2006-06-05|Has expired: This is a very outdated version of GNOME and it is not used by any port.
 x11-fonts/linux-urw-fonts||2006-06-05|Has expired: "The linuxolator uses the fonts from the X-server or font-server, so there is no need to install fonts into LINUXBASE"
+math/pari-devel|math/pari|2006-06-05|Merged into stable port
diff --git a/math/Makefile b/math/Makefile
index 7b1ecb8c84dc..b977eba497c6 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -238,7 +238,6 @@
     SUBDIR += p5-Statistics-Lite
     SUBDIR += p5-Statistics-OLS
     SUBDIR += pari
-    SUBDIR += pari-devel
     SUBDIR += parmetis
     SUBDIR += pear-Structures_Graph
     SUBDIR += pecl-big_int
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 6d6884cf76bf..5bdf3d52f8ab 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	asir
 PORTVERSION=	20060417
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
 		ftp://ftp.asir.org/pub/asir/src/ \
@@ -17,7 +18,7 @@ EXTRACT_ONLY=	${ASIR_SRC}
 MAINTAINER=	saito@asir.org
 COMMENT=	The system Risa/Asir is a general computer algebra system
 
-LIB_DEPENDS=	pari-2.2:${PORTSDIR}/math/pari-devel
+LIB_DEPENDS=	pari.2:${PORTSDIR}/math/pari
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:15 autoconf:253
diff --git a/math/pari-devel/Makefile b/math/pari-devel/Makefile
deleted file mode 100644
index c9e0b2c09d93..000000000000
--- a/math/pari-devel/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	PARI-DEVEL
-# Date created:		15 January 2001
-# Whom:	Yoshiaki UCHIKAWA <yoshiaki@kt.rim.or.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	pari
-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}.beta
-
-MAINTAINER=	yoshiaki@kt.rim.or.jp
-COMMENT=	Mathmatics library and advanced calculator package
-
-BROKEN=		Incorrect pkg-plist
-
-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
-
-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=	12
-
-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>
-
-HAVE_EMACS!=	${WHICH} emacs || ${ECHO} nope
-.if ${HAVE_EMACS} != "nope"
-PLIST=		${PKGDIR}/pkg-plist.emacs
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/math/pari-devel/distinfo b/math/pari-devel/distinfo
deleted file mode 100644
index 89e86d4d65a5..000000000000
--- a/math/pari-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index d38cb95063bf..000000000000
--- a/math/pari-devel/files/patch-af
+++ /dev/null
@@ -1,101 +0,0 @@
---- 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"
--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
- 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)
-@@ -398,6 +400,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)
- 	-\$(INSTALL_DATA) pari.cfg \$(SYSDATADIR)
-@@ -408,7 +423,7 @@
- 
- install-doc::
- 	-mkdir -p \$(BINDIR) \$(DOCDIR)
--	-cd $doc; \$(MAKE) all
-+#	-cd $doc; \$(MAKE) all
- 	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
- 	-\$(INSTALL_DATA) $doc/Makefile     \$(DOCDIR)
- 	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
-@@ -426,11 +441,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)
-+#	-\$(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
diff --git a/math/pari-devel/files/patch-ag b/math/pari-devel/files/patch-ag
deleted file mode 100644
index 1c33689bfc43..000000000000
--- a/math/pari-devel/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-devel/files/patch-aj b/math/pari-devel/files/patch-aj
deleted file mode 100644
index 716beb1e12d5..000000000000
--- a/math/pari-devel/files/patch-aj
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 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-descr b/math/pari-devel/pkg-descr
deleted file mode 100644
index 42424f3450ed..000000000000
--- a/math/pari-devel/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-The PARI system is a package which is capable of doing formal computations on
-recursive types at high speed.
-
-It is possible to use PARI in two different ways:
-
-1) as a library, which can be called from any upper-level language
-application (for instance written in C, C++, Pascal or Fortran);
-
-2) as a sophisticated programmable calculator, named GP, which contains 
-most of the standard control instructions of a standard language
-like C.
-
-This is the alpha quality version that development is in the way.
-Algorithm, improvement of implementation are done.
-Because improvement of performance was big, ports was made as -devel in
-particular.
diff --git a/math/pari-devel/pkg-message b/math/pari-devel/pkg-message
deleted file mode 100644
index ad56da4b7e4f..000000000000
--- a/math/pari-devel/pkg-message
+++ /dev/null
@@ -1,23 +0,0 @@
-This is PARI/GP, version 2.1.x (*).
-
-PARI/GP Number Theory-oriented Computer Algebra System
-        Copyright (C) 2000 The PARI Group, Bordeaux.
-
-PARI/GP is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation. It is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY WHATSOEVER.
-
-Check the License for details. You should have received a copy of it, along
-with the package; see the file 'COPYING'. If not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-==========================================================================
-*****
-Original copyright is in pari-2.1.1/README in the distfile:
-pari-2.1.1.tar.gz
-
-
-This distfile can be found in /cdrom/ports/distfiles or 
-ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
-*************************************************************************
diff --git a/math/pari-devel/pkg-plist b/math/pari-devel/pkg-plist
deleted file mode 100644
index e05a37a40b93..000000000000
--- a/math/pari-devel/pkg-plist
+++ /dev/null
@@ -1,80 +0,0 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
-bin/gp
-bin/tex2mail
-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
-include/pari/parierr.h
-include/pari/parigen.h
-include/pari/paristio.h
-include/pari/parisys.h
-include/pari/pariport.h
-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.so
-lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/PARI/822.pm
-%%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
-@dirrm include/pari
-@dirrm lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/PARI
-@dirrm %%DOCSDIR%%
diff --git a/math/pari-devel/pkg-plist.emacs b/math/pari-devel/pkg-plist.emacs
deleted file mode 100644
index d21921075a9e..000000000000
--- a/math/pari-devel/pkg-plist.emacs
+++ /dev/null
@@ -1,89 +0,0 @@
-bin/gp-%%MAJOR_VERSION%%.%%MINOR_VERSION%%
-bin/gp
-bin/tex2mail
-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
-include/pari/parierr.h
-include/pari/parigen.h
-include/pari/paristio.h
-include/pari/parisys.h
-include/pari/pariport.h
-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.so
-lib/pari/pari.cfg
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/Announce.2.1
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COMPAT
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/CVS.txt
-%%DOCSDIR%%/MACHINES
-%%DOCSDIR%%/NEW
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/PARI/822.pm
-%%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
-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 lib/pari
-@dirrm %%DOCSDIR%%/misc
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/PARI
-@dirrm %%DOCSDIR%%
-@dirrm share/emacs/site-lisp/pari