6 files changed, 30 insertions, 109 deletions

diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile
index e58bf8e696f2..a1bffbe0d93a 100644
--- a/math/asir2000/Makefile
+++ b/math/asir2000/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asir
-PORTVERSION=	20070718
+PORTVERSION=	20070806
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
 		ftp://ftp.asir.org/pub/asir/src/ \
@@ -23,12 +23,12 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:15 autoconf:253
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari
-ASIR_SRC_VERSION=	20070718
+ASIR_SRC_VERSION=	${PORTVERSION}
 ASIR_DOC_VERSION=	20070718
 GC_VERSION=	6.8
-ASIR_SRC=	asir-${ASIR_SRC_VERSION}.tar.gz
-ASIR_DOC=	asirdoc-${ASIR_DOC_VERSION}.tar.gz
-GC_SRC=		gc${GC_VERSION}.tar.gz
+ASIR_SRC=	asir-${ASIR_SRC_VERSION}${EXTRACT_SUFX}
+ASIR_DOC=	asirdoc-${ASIR_DOC_VERSION}${EXTRACT_SUFX}
+GC_SRC=		gc${GC_VERSION}${EXTRACT_SUFX}
 MAN1=		asir.1
 WRKSRC=		${WRKDIR}/asir2000
 
diff --git a/math/asir2000/distinfo b/math/asir2000/distinfo
index 7e99afd8fa31..8150a302d6f1 100644
--- a/math/asir2000/distinfo
+++ b/math/asir2000/distinfo
@@ -1,6 +1,6 @@
-MD5 (asir-20070718.tar.gz) = fcfb1ddf031cf94168314a7ad49216d0
-SHA256 (asir-20070718.tar.gz) = 2d330876ffc7a7a5190c77296c58c331c31bd413dfd0e13088d1b221720e0cf6
-SIZE (asir-20070718.tar.gz) = 2485364
+MD5 (asir-20070806.tar.gz) = 6d560d0aaa0da33de6dfa71dc340c499
+SHA256 (asir-20070806.tar.gz) = 3eabdc3ec46b43a32112ebfc7a3b8aedb57add718caddf60bb4d8eca54c2af60
+SIZE (asir-20070806.tar.gz) = 2488044
 MD5 (asirdoc-20070718.tar.gz) = 24a1099257c5b29b35fe4047a8fa7e68
 SHA256 (asirdoc-20070718.tar.gz) = 0c8e2714129bb6c0eb9170822b688d2d93f7f9ce67683813ee473ff3b3779fbb
 SIZE (asirdoc-20070718.tar.gz) = 1396218
diff --git a/math/asir2000/files/patch-ac b/math/asir2000/files/patch-ac
index 1c94a7154c7a..dc4fa46df8c4 100644
--- a/math/asir2000/files/patch-ac
+++ b/math/asir2000/files/patch-ac
@@ -1,8 +1,8 @@
---- include/version.h.org	Thu Apr 20 13:24:03 2006
-+++ include/version.h	Thu Apr 20 13:24:55 2006
+--- include/version.h.orig	Mon Aug  6 17:15:26 2007
++++ include/version.h	Tue Aug 14 02:56:32 2007
 @@ -48,4 +48,4 @@
-  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.251 2006/04/17 04:35:20 noro Exp $ 
+  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.282 2007/08/06 08:15:26 saito Exp $ 
  */
- #define ASIR_VERSION 20060417
+ #define ASIR_VERSION 20070806
 -#define ASIR_DISTRIBUTION "Kobe"
 +#define ASIR_DISTRIBUTION "Plotting Group"
diff --git a/math/asir2000/files/patch-ba b/math/asir2000/files/patch-ba
index 6c67b971a379..6568deefa7dc 100644
--- a/math/asir2000/files/patch-ba
+++ b/math/asir2000/files/patch-ba
@@ -1,5 +1,5 @@
---- Makefile.am.orig	Tue Jul 12 23:47:13 2005
-+++ Makefile.am	Thu Aug 11 10:39:00 2005
+--- Makefile.am.orig	Mon Aug  6 16:59:49 2007
++++ Makefile.am	Mon Aug  6 17:07:45 2007
 @@ -9,7 +9,8 @@
  
  SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
@@ -10,7 +10,16 @@
  asir_PROGRAMS = asir
  asir_SOURCES  = parse/main.c
  asir_LDADD    = libasir.a libasir-gc.a
-@@ -102,33 +103,33 @@
+@@ -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 @@
  	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
  
  install-openxm: asir${EXEEXT} install-libasir install-libasir-gc
diff --git a/math/asir2000/files/patch-da b/math/asir2000/files/patch-da
index c8cef6038b6f..3dbd9ddb867b 100644
--- a/math/asir2000/files/patch-da
+++ b/math/asir2000/files/patch-da
@@ -1,9 +1,9 @@
---- include/ca.h.org	Sun Apr 16 09:51:14 2006
-+++ include/ca.h	Thu Apr 20 15:45:58 2006
-@@ -2640,3 +2640,6 @@
- void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp);
- void pwrnbp(VL vl,NBP p1,Q n, NBP *rp);
- int compnbp(VL vl,NBP p1,NBP p2);
+--- 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
diff --git a/math/asir2000/files/patch-include-private-gcconfig.h b/math/asir2000/files/patch-include-private-gcconfig.h
deleted file mode 100644
index f38c961c46ed..000000000000
--- a/math/asir2000/files/patch-include-private-gcconfig.h
+++ /dev/null
@@ -1,88 +0,0 @@
---- gc6.8/include/private/gcconfig.h.rorig	Sat Oct 15 16:40:25 2005
-+++ gc6.8/include/private/gcconfig.h	Sat Oct 15 16:42:43 2005
-@@ -62,7 +62,7 @@
- /* Determine the machine type: */
- # if defined(__arm__) || defined(__thumb__)
- #    define ARM32
--#    if !defined(LINUX) && !defined(NETBSD)
-+#    if !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD)
- #      define NOSYS
- #      define mach_type_known
- #    endif
-@@ -334,10 +334,22 @@
- #    define X86_64
- #    define mach_type_known
- # endif
-+# if defined(__FreeBSD__) && defined(__amd64__)
-+#    define X86_64
-+#    define mach_type_known
-+# endif
- # if defined(FREEBSD) && defined(__sparc__)
- #    define SPARC
- #    define mach_type_known
--#endif
-+# endif
-+# if defined(FREEBSD) && defined(__powerpc__)
-+#    define POWERPC
-+#    define mach_type_known
-+# endif
-+# if defined(FREEBSD) && defined(__arm__)
-+#    define ARM32
-+#    define mach_type_known
-+# endif
- # if defined(bsdi) && (defined(i386) || defined(__i386__))
- #    define I386
- #    define BSDI
-@@ -845,6 +857,16 @@
- #     define DATASTART GC_data_start
- #     define DYNAMIC_LOADING
- #   endif
-+#   ifdef FREEBSD
-+#   define ALIGNMENT 4
-+#       define OS_TYPE "FREEBSD"
-+#       ifdef __ELF__
-+#           define DYNAMIC_LOADING
-+#       endif
-+#	define HEURISTIC2
-+	extern char etext[];
-+#	define SEARCH_FOR_DATA_START
-+#   endif
- #   ifdef NOSYS
- #     define ALIGNMENT 4
- #     define OS_TYPE "NOSYS"
-@@ -1807,6 +1829,17 @@
- #	endif
- #       define USE_GENERIC_PUSH_REGS
- #   endif
-+#   ifdef FREEBSD
-+#   define ALIGNMENT 4
-+#       define OS_TYPE "FREEBSD"
-+#       ifdef __ELF__
-+#           define DYNAMIC_LOADING
-+#       endif
-+#       define HEURISTIC2
-+	extern char etext[];
-+#       define SEARCH_FOR_DATA_START
-+#   endif
-+		   
- #   ifdef LINUX
- #       define OS_TYPE "LINUX"
- #       define LINUX_STACKBOTTOM
-@@ -1957,6 +1990,17 @@
- #	ifdef __ELF__
- #	    define DYNAMIC_LOADING
- #	endif
-+#	define HEURISTIC2
-+	extern char etext[];
-+#	define SEARCH_FOR_DATA_START
-+#   endif
-+#   ifdef FREEBSD
-+#       define OS_TYPE "FREEBSD"
-+#       define SIG_SUSPEND SIGUSR1
-+#       define SIG_THR_RESTART SIGUSR2
-+#       ifdef __ELF__
-+#           define DYNAMIC_LOADING
-+#       endif
- #	define HEURISTIC2
- 	extern char etext[];
- #	define SEARCH_FOR_DATA_START