- Update to 20110810

- Use PORTDATA

PR:		ports/159644
Submitted by:	Tomokatsu SAITO <saito@asir.org> (maintainer)

14 files changed, 30 insertions, 131 deletions

diff --git a/math/asir2000/files/patch-ac b/math/asir2000/files/patch-ac
index dc4fa46df8c4..846397d4e7f8 100644
--- a/math/asir2000/files/patch-ac
+++ b/math/asir2000/files/patch-ac
@@ -1,8 +1,8 @@
---- include/version.h.orig	Mon Aug  6 17:15:26 2007
-+++ include/version.h	Tue Aug 14 02:56:32 2007
+--- include/version.h.orig	2011-08-08 14:41:05.000000000 +0900
++++ include/version.h	2011-08-08 14:41:28.000000000 +0900
 @@ -48,4 +48,4 @@
-  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.282 2007/08/06 08:15:26 saito Exp $ 
+  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.331 2011/07/21 04:43:26 noro Exp $ 
  */
- #define ASIR_VERSION 20070806
+ #define ASIR_VERSION 20110721
 -#define ASIR_DISTRIBUTION "Kobe"
 +#define ASIR_DISTRIBUTION "Plotting Group"
diff --git a/math/asir2000/files/patch-ag b/math/asir2000/files/patch-ag
deleted file mode 100644
index 32dbafe4d817..000000000000
--- a/math/asir2000/files/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
---- parse/glob.c.orig	Thu Jan  4 00:48:08 2007
-+++ parse/glob.c	Wed Jul 18 12:25:46 2007
-@@ -51,10 +51,11 @@
- #include "al.h"
- #include "parse.h"
- #include "ox.h"
-+#include "version.h"
- #if defined(PARI)
- #include "genpari.h"
- #endif
--#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX)
-+#if !defined(VISUAL) && !defined(_PA_RISC1_1) && !defined(linux) && !defined(SYSV) && !defined(__CYGWIN__) && !defined(__INTERIX) && !defined(__FreeBSD__)
- #include <sgtty.h>
- #endif
- 
-@@ -765,7 +766,7 @@
- char *get_pariversion() 
- {
- #if PARI
--#if 0
-+#if 1
- 	return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n";
- #else
- 	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
-@@ -785,7 +786,7 @@
- 
- void copyright()
- {
--	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
-+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.8 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
- 	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
- }
- 
-@@ -794,7 +795,7 @@
- 	static char *notice;
- 	char *s1, *s2, *s3;
- 	int d, len;
--	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
-+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2007, Risa/Asir committers, http://www.openxm.org/.\nGC 6.8 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
- 	if (!notice) {
- 		s1 = get_intervalversion();
- 		s2 = get_asir_distribution();
diff --git a/math/asir2000/files/patch-ba b/math/asir2000/files/patch-ba
index 6568deefa7dc..f2d0c3835126 100644
--- a/math/asir2000/files/patch-ba
+++ b/math/asir2000/files/patch-ba
@@ -1,5 +1,5 @@
---- Makefile.am.orig	Mon Aug  6 16:59:49 2007
-+++ Makefile.am	Mon Aug  6 17:07:45 2007
+--- Makefile.am.orig	2009-03-04 18:15:36.000000000 +0900
++++ Makefile.am	2011-08-08 15:35:03.000000000 +0900
 @@ -9,7 +9,8 @@
  
  SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
@@ -9,17 +9,8 @@
 +asirdir       = ${bindir}
  asir_PROGRAMS = asir
  asir_SOURCES  = parse/main.c
- asir_LDADD    = libasir.a libasir-gc.a
-@@ -17,7 +18,7 @@
- 
- GC            = gc6.8
- GC_TAR_GZ     = ${GC}.tar.gz
--GC_PATCH      = gc6.5-risa.diff
-+GC_PATCH      = gc6.8-risa.diff
- GC_DISTDIR    = @GC_DISTDIR@
- GC_MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
- OX_FETCH      = ${bindir}/oxfetch.sh
-@@ -104,33 +105,33 @@
+ asir_LDADD    = libasir.a @ASIR_GCLIB@
+@@ -90,33 +91,34 @@
  	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
  
  install-openxm: asir${EXEEXT} install-libasir install-libasir-gc
@@ -38,6 +29,7 @@
 -	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
 -	(cd ${top_srcdir}/include; ${MAKE} install)
 -	(cd ${top_srcdir}/parse; ${MAKE} install)
++	${INSTALL_PROGRAM} ${asir_PROGRAMS} /usr/local/bin
 +#	-mkdir -p ${DESTDIR}${bindir}
 +#	${INSTALL_PROGRAM} asir /usr/local/bin
 +#	-mkdir -p ${DESTDIR}${asirdir}
diff --git a/math/asir2000/files/patch-bb b/math/asir2000/files/patch-bb
index 30e8d758d0fb..0d9799642177 100644
--- a/math/asir2000/files/patch-bb
+++ b/math/asir2000/files/patch-bb
@@ -1,7 +1,7 @@
---- asm/Makefile.am.orig	Fri May  2 02:18:28 2003
-+++ asm/Makefile.am	Fri May  2 02:18:50 2003
+--- asm/Makefile.am.orig	2009-02-13 22:21:19.000000000 +0900
++++ asm/Makefile.am	2011-08-08 14:23:31.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/asm/Makefile.am,v 1.3 2003/03/20 07:34:08 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/asm/Makefile.am,v 1.4 2009/02/13 13:21:19 ohara Exp $
  
 -asirdir    = ${prefix}/lib/asir
 +asirdir    = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-bc b/math/asir2000/files/patch-bc
index ac0aabe44183..5fa557d69f33 100644
--- a/math/asir2000/files/patch-bc
+++ b/math/asir2000/files/patch-bc
@@ -1,7 +1,7 @@
---- builtin/Makefile.am.orig	Mon Dec 20 16:12:28 2004
-+++ builtin/Makefile.am	Mon Dec 20 16:12:46 2004
+--- builtin/Makefile.am.orig	2011-08-08 14:24:27.000000000 +0900
++++ builtin/Makefile.am	2011-08-08 14:24:41.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/builtin/Makefile.am,v 1.8 2004/12/19 17:06:23 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/builtin/Makefile.am,v 1.9 2009/02/13 13:21:19 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-bd b/math/asir2000/files/patch-bd
index eb5e1e913731..87da9a56fcb6 100644
--- a/math/asir2000/files/patch-bd
+++ b/math/asir2000/files/patch-bd
@@ -1,7 +1,7 @@
---- engine/Makefile.am.orig	Fri May  2 02:20:57 2003
-+++ engine/Makefile.am	Fri May  2 02:21:10 2003
+--- engine/Makefile.am.orig	2011-08-08 14:25:27.000000000 +0900
++++ engine/Makefile.am	2011-08-08 14:25:38.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/engine/Makefile.am,v 1.3 2003/03/20 07:34:09 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/engine/Makefile.am,v 1.9 2009/02/13 13:21:19 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-be b/math/asir2000/files/patch-be
index 6de80a67cba1..3713156e3edc 100644
--- a/math/asir2000/files/patch-be
+++ b/math/asir2000/files/patch-be
@@ -1,7 +1,7 @@
---- fft/Makefile.am.orig	Fri May  2 02:22:14 2003
-+++ fft/Makefile.am	Fri May  2 02:22:25 2003
+--- fft/Makefile.am.orig	2011-08-08 14:26:18.000000000 +0900
++++ fft/Makefile.am	2011-08-08 14:26:27.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/fft/Makefile.am,v 1.3 2003/03/20 07:34:10 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/fft/Makefile.am,v 1.4 2009/02/13 13:21:19 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-bf b/math/asir2000/files/patch-bf
index 7e88ba6e3be2..c37369227ab7 100644
--- a/math/asir2000/files/patch-bf
+++ b/math/asir2000/files/patch-bf
@@ -1,7 +1,7 @@
---- io/Makefile.am.orig	Fri May  2 02:23:04 2003
-+++ io/Makefile.am	Fri May  2 02:23:28 2003
+--- io/Makefile.am.orig	2011-08-08 14:26:59.000000000 +0900
++++ io/Makefile.am	2011-08-08 14:27:11.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/io/Makefile.am,v 1.3 2003/03/20 07:34:11 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/io/Makefile.am,v 1.4 2009/02/13 13:21:20 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-bg b/math/asir2000/files/patch-bg
deleted file mode 100644
index 5c63716224b0..000000000000
--- a/math/asir2000/files/patch-bg
+++ /dev/null
@@ -1,11 +0,0 @@
---- parse/Makefile.am.orig	Sun Feb 18 17:46:47 2007
-+++ parse/Makefile.am	Wed Jul 18 11:39:43 2007
-@@ -4,7 +4,7 @@
- inc_HEADERS = comp.h cpp.h parse.h w_stdio.h
- 
- GC       = gc6.8
--asirdir  = ${prefix}/lib/asir
-+asirdir  = ${prefix}/share/asir
- DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
- INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-            -I${top_srcdir}/${GC}/include \
diff --git a/math/asir2000/files/patch-bh b/math/asir2000/files/patch-bh
index fa47c6eb35d3..ececb50d8fc6 100644
--- a/math/asir2000/files/patch-bh
+++ b/math/asir2000/files/patch-bh
@@ -1,7 +1,7 @@
---- plot/Makefile.am.orig	Fri May  2 02:24:53 2003
-+++ plot/Makefile.am	Fri May  2 02:25:03 2003
+--- plot/Makefile.am.orig	2009-02-13 22:21:20.000000000 +0900
++++ plot/Makefile.am	2011-08-08 14:21:28.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/plot/Makefile.am,v 1.3 2003/03/20 07:34:13 ohara Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/plot/Makefile.am,v 1.4 2009/02/13 13:21:20 ohara Exp $
  
 -asirdir  = ${prefix}/lib/asir
 +asirdir  = ${prefix}/share/asir
diff --git a/math/asir2000/files/patch-bi b/math/asir2000/files/patch-bi
deleted file mode 100644
index 45e230027dee..000000000000
--- a/math/asir2000/files/patch-bi
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Fri May  2 02:12:44 2003
-+++ configure.in	Fri May  2 02:15:11 2003
-@@ -2,7 +2,7 @@
- 
- AC_INIT([LICENSE])
- AC_PREREQ(2.53)
--AM_INIT_AUTOMAKE(asir, 20030307)
-+AM_INIT_AUTOMAKE(asir, 20030825)
- AM_MAINTAINER_MODE
- 
- AC_CANONICAL_SYSTEM
diff --git a/math/asir2000/files/patch-bk b/math/asir2000/files/patch-bk
index 428aaebcc550..a60dc4752a8f 100644
--- a/math/asir2000/files/patch-bk
+++ b/math/asir2000/files/patch-bk
@@ -1,7 +1,7 @@
---- lib/Makefile.am.orig	Fri May  2 02:30:42 2003
-+++ lib/Makefile.am	Tue Jan 27 14:57:47 2004
+--- lib/Makefile.am.orig	2011-08-08 14:38:10.000000000 +0900
++++ lib/Makefile.am	2011-08-08 14:38:35.000000000 +0900
 @@ -1,6 +1,6 @@
- ## $OpenXM: OpenXM_contrib2/asir2000/lib/Makefile.am,v 1.10 2003/12/12 08:03:12 noro Exp $
+ ## $OpenXM: OpenXM_contrib2/asir2000/lib/Makefile.am,v 1.12 2009/02/22 16:51:36 ohara Exp $
  
 -asirdir = ${libdir}/asir
 +asirdir = ${datadir}/asir
diff --git a/math/asir2000/files/patch-ca b/math/asir2000/files/patch-ca
deleted file mode 100644
index 37add6e025cf..000000000000
--- a/math/asir2000/files/patch-ca
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/patch-da b/math/asir2000/files/patch-da
deleted file mode 100644
index 3dbd9ddb867b..000000000000
--- a/math/asir2000/files/patch-da
+++ /dev/null
@@ -1,9 +0,0 @@
---- include/ca.h.orig	Tue Aug  2 16:16:42 2005
-+++ include/ca.h	Fri Nov 10 01:35:17 2006
-@@ -2607,3 +2607,6 @@
- void bcopy(const void *,void *,int);
- char *index(char *,int);
- #endif
-+
-+/* pari-2.2.16-beta change rename 'prec' -> 'precreal' [ from paripriv.h ] */
-+#define prec precreal