7 files changed, 80 insertions, 32 deletions

diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index 99d7413d7556..b217652ec63b 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	asir
-PORTVERSION=	20040214
+PORTVERSION=	20050131
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
 		ftp://ftp.asir.org/pub/asir/src/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASIR_DOC}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${ASIR_SRC} ${ASIR_DOC}
+EXTRACT_ONLY=	${ASIR_SRC}
 
 MAINTAINER=	saito@asir.org
 COMMENT=	The system Risa/Asir is a general computer algebra system
@@ -22,8 +22,10 @@ GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	253
 USE_AUTOMAKE_VER=	15
 USE_XLIB=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari=new
-ASIR_DOC_VERSION=	20040211
+CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari
+ASIR_SRC_VERSION= 20050112
+ASIR_DOC_VERSION=	20050111
+ASIR_SRC=	asir-${ASIR_DOC_VERSION}.tar.gz
 ASIR_DOC=	asirdoc-${ASIR_DOC_VERSION}.tar.gz
 MAN1=		asir.1
 PREFIX?=	${LOCALBASE}
@@ -36,10 +38,6 @@ LIB_DATA=	alpi bfct bgk const cyclic defs.h dfff dmul dmul102 \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-BROKEN=		"Does not compile on !i386 and !amd64"
-.endif
-
 pre-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DOCSDIR}
diff --git a/math/asir2000/distinfo b/math/asir2000/distinfo
index 6b01508abcba..98e6d6e56ac9 100644
--- a/math/asir2000/distinfo
+++ b/math/asir2000/distinfo
@@ -1,4 +1,4 @@
-MD5 (asir-20040214.tar.gz) = d028676f35e9df7e0f31f64640c868f0
-SIZE (asir-20040214.tar.gz) = 2328830
-MD5 (asirdoc-20040211.tar.gz) = 0ce27f026e7235d30d5f03789f5b74cd
-SIZE (asirdoc-20040211.tar.gz) = 1405931
+MD5 (asir-20050111.tar.gz) = c6b118ae804bd4c4d2bfe6a423553756
+SIZE (asir-20050111.tar.gz) = 2360127
+MD5 (asirdoc-20050111.tar.gz) = 9b0ad90478fe1c8774f565aa67002371
+SIZE (asirdoc-20050111.tar.gz) = 1569253
diff --git a/math/asir2000/files/patch-ac b/math/asir2000/files/patch-ac
index 82a9ee3580b4..6efe83b60bc0 100644
--- a/math/asir2000/files/patch-ac
+++ b/math/asir2000/files/patch-ac
@@ -1,10 +1,10 @@
---- include/version.h.orig	Tue Jan 28 17:38:58 2003
-+++ include/version.h	Sun Mar  2 21:15:34 2003
+--- include/version.h.orig	Sun Dec 19 01:50:10 2004
++++ include/version.h	Mon Jan 31 14:14:11 2005
 @@ -47,5 +47,5 @@
   *
-  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.90 2003/01/28 08:38:58 noro Exp $ 
+  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.196 2004/12/18 16:50:10 saito Exp $ 
  */
--#define ASIR_VERSION 20031021
+-#define ASIR_VERSION 20041219
 -#define ASIR_DISTRIBUTION "Kobe"
-+#define ASIR_VERSION 20040214
++#define ASIR_VERSION 20050131
 +#define ASIR_DISTRIBUTION "Plotting Group"
diff --git a/math/asir2000/files/patch-ag b/math/asir2000/files/patch-ag
index ccbdeaf11d9f..8f838fbbed7b 100644
--- a/math/asir2000/files/patch-ag
+++ b/math/asir2000/files/patch-ag
@@ -1,5 +1,5 @@
---- parse/glob.c.orig	Wed Apr  2 18:43:33 2003
-+++ parse/glob.c	Fri May  2 15:54:46 2003
+--- parse/glob.c.orig	Wed Nov 24 15:01:04 2004
++++ parse/glob.c	Sat Dec 18 03:00:03 2004
 @@ -51,6 +51,7 @@
  #include "al.h"
  #include "parse.h"
@@ -8,17 +8,15 @@
  #if defined(PARI)
  #include "genpari.h"
  #endif
-@@ -707,11 +708,8 @@
- 	printf("Copyright 2000-2003, Risa/Asir committers, http://www.openxm.org/.\n");
- 	printf("GC 6.1(alpha5) copyright 2001, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n");
+@@ -791,10 +792,7 @@
+ char *get_pariversion() 
+ {
  #if PARI
 -#if 0
--	printf("PARI 2.2.4, copyright (C) 2002 The PARI Group.\n");
+-	return "PARI 2.2.4, copyright (C) 2002 The PARI Group.\nPARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
 -#endif
--	printf("PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n");
--	printf("   H. Cohen and M. Olivier.\n");
-+	printf("%s.\n",PARIVERSION);
-+	printf("copyright (C) 2002 The PARI Group.\n");
+-	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
++	return "PARI 2.2.9 (alpha), copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
  #endif
+ 	return "";
  }
- 
diff --git a/math/asir2000/files/patch-bc b/math/asir2000/files/patch-bc
index d6e79cf2d353..ac0aabe44183 100644
--- a/math/asir2000/files/patch-bc
+++ b/math/asir2000/files/patch-bc
@@ -1,7 +1,7 @@
---- builtin/Makefile.am.orig	Fri May  2 02:19:51 2003
-+++ builtin/Makefile.am	Fri May  2 02:20:08 2003
+--- builtin/Makefile.am.orig	Mon Dec 20 16:12:28 2004
++++ builtin/Makefile.am	Mon Dec 20 16:12:46 2004
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/builtin/Makefile.am,v 1.4 2003/03/20 07:34:09 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/builtin/Makefile.am,v 1.8 2004/12/19 17:06:23 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-ca b/math/asir2000/files/patch-ca
new file mode 100644
index 000000000000..37add6e025cf
--- /dev/null
+++ b/math/asir2000/files/patch-ca
@@ -0,0 +1,20 @@
+--- builtin/parif.c.orig	Sat Feb 15 07:29:07 2003
++++ builtin/parif.c	Fri Jan  7 01:38:45 2005
+@@ -95,7 +95,7 @@
+ { GEN _pt1_,_pt2_,_pt3_; CALLPARI2(pf,ARG0(ar),ARG1(ar),MKPREC(ar,3,ARG2(ar)),rp); }
+ 
+ #if defined(INTERVAL)
+-#define	PREC_CONV	pariK1
++#define	PREC_CONV	(0.103810253/(BYTES_IN_LONG/4))  /* log(10)/(SL*log(2)) */
+ #else
+ #if defined(LONG_IS_32BIT)
+ #define PREC_CONV		0.103810253
+@@ -243,7 +243,7 @@
+ 	GEN p1,p2,p3;
+ 
+ 	ritopa_i(a,1,&p1); ritopa_i(b,1,&p2);
+-	p3 = mppgcd(p1,p2);
++	p3 = gcdii(p1,p2);
+ 	patori_i(p3,r); asir_cgiv(p3); asir_cgiv(p2); asir_cgiv(p1);
+ }
+ 
diff --git a/math/asir2000/pkg-plist b/math/asir2000/pkg-plist
index 0ffb6ba0431e..5d2568174039 100644
--- a/math/asir2000/pkg-plist
+++ b/math/asir2000/pkg-plist
@@ -849,6 +849,8 @@ share/doc/asir/html-eg/man_284.html
 share/doc/asir/html-eg/man_285.html
 share/doc/asir/html-eg/man_286.html
 share/doc/asir/html-eg/man_287.html
+share/doc/asir/html-eg/man_288.html
+share/doc/asir/html-eg/man_289.html
 share/doc/asir/html-eg/man_28.html
 share/doc/asir/html-eg/man_29.html
 share/doc/asir/html-eg/man_3.html
@@ -1137,6 +1139,8 @@ share/doc/asir/html-jp/man_284.html
 share/doc/asir/html-jp/man_285.html
 share/doc/asir/html-jp/man_286.html
 share/doc/asir/html-jp/man_287.html
+share/doc/asir/html-jp/man_288.html
+share/doc/asir/html-jp/man_289.html
 share/doc/asir/html-jp/man_28.html
 share/doc/asir/html-jp/man_29.html
 share/doc/asir/html-jp/man_3.html
@@ -1219,13 +1223,41 @@ share/doc/asir/html-jp/man_99.html
 share/doc/asir/html-jp/man_toc.html
 share/doc/asir/html-internal-ja/internal.html
 share/doc/asir/html-internal-ja/internal_toc.html
+share/doc/asir/html-exp-ja/exp-ja.texi
+share/doc/asir/html-exp-ja/exp-ja_1.html
+share/doc/asir/html-exp-ja/exp-ja_2.html
+share/doc/asir/html-exp-ja/exp-ja_3.html
+share/doc/asir/html-exp-ja/exp-ja_4.html
+share/doc/asir/html-exp-ja/exp-ja_5.html
+share/doc/asir/html-exp-ja/exp-ja_6.html
+share/doc/asir/html-exp-ja/exp-ja_7.html
+share/doc/asir/html-exp-ja/exp-ja_8.html
+share/doc/asir/html-exp-ja/exp-ja_9.html
+share/doc/asir/html-exp-ja/exp-ja_10.html
+share/doc/asir/html-exp-ja/exp-ja_11.html
+share/doc/asir/html-exp-ja/exp-ja_12.html
+share/doc/asir/html-exp-ja/exp-ja_13.html
+share/doc/asir/html-exp-ja/exp-ja_14.html
+share/doc/asir/html-exp-ja/exp-ja_15.html
+share/doc/asir/html-exp-ja/exp-ja_16.html
+share/doc/asir/html-exp-ja/exp-ja_17.html
+share/doc/asir/html-exp-ja/exp-ja_18.html
+share/doc/asir/html-exp-ja/exp-ja_19.html
+share/doc/asir/html-exp-ja/exp-ja_20.html
+share/doc/asir/html-exp-ja/exp-ja_21.html
+share/doc/asir/html-exp-ja/exp-ja_22.html
+share/doc/asir/html-exp-ja/exp-ja_23.html
+share/doc/asir/html-exp-ja/exp-ja_24.html
+share/doc/asir/html-exp-ja/exp-ja_toc.html
 share/doc/asir/internal-jp.pdf
+share/doc/asir/exp-ja.pdf
 share/doc/asir/asir.1
 @dirrm include/asir
 @dirrm share/asir/help-jp
 @dirrm share/asir/help-eg
 @dirrm share/asir
 @dirrm share/doc/asir/html-eg
+@dirrm share/doc/asir/html-exp-ja
 @dirrm share/doc/asir/html-jp
 @dirrm share/doc/asir/html-internal-ja
 @dirrm share/doc/asir