- Update to 20051010

PR:		ports/87217
Submitted by:	maintainer

math/asir2000/Makefile

@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	asir
-PORTVERSION=	20050603
+PORTVERSION=	20051010
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.jssac.org/pub/distfiles/asir/ \
-		ftp://ftp.asir.org/pub/asir/src/
-DISTFILES=	${ASIR_SRC} ${ASIR_DOC}
+		ftp://ftp.asir.org/pub/asir/src/ \
+		http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
+DISTFILES=	${ASIR_SRC} ${ASIR_DOC} ${GC_SRC}
 EXTRACT_ONLY=	${ASIR_SRC}
 
 MAINTAINER=	saito@asir.org
@@ -23,15 +24,17 @@ USE_AUTOCONF_VER=	253
 USE_AUTOMAKE_VER=	15
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-plot --enable-fep --enable-interval --with-pari
-ASIR_SRC_VERSION= 20050603
-ASIR_DOC_VERSION=	20050603
-ASIR_SRC=	asir-${ASIR_DOC_VERSION}.tar.gz
-ASIR_DOC=	asirdoc-${ASIR_DOC_VERSION}.tar.gz
-MAN1=		asir.1
-PREFIX?=	${LOCALBASE}
-WRKSRC=		${WRKDIR}/asir2000
+ASIR_SRC_VERSION= 20051010
+ASIR_DOC_VERSION= 20051009
+GC_VERSION= 6.5
+ASIR_SRC= asir-${ASIR_SRC_VERSION}.tar.gz
+ASIR_DOC= asirdoc-${ASIR_DOC_VERSION}.tar.gz
+GC_SRC=   gc${GC_VERSION}.tar.gz
+MAN1=     asir.1
+PREFIX?=  ${LOCALBASE}
+WRKSRC=   ${WRKDIR}/asir2000
 
-LIB_DATA=	alpi bfct bgk const cyclic defs.h dfff dmul dmul102 \
+LIB_DATA= alpi bfct bgk const cyclic defs.h dfff dmul dmul102 \
 	fctrdata fctrtest fff glib gr ifplot katsura launch mat nf \
 	num primdec primdec_lex primdec_mod ratint robot solve sp \
 	sturm sym weight xm
@@ -42,6 +45,8 @@ LIB_DATA=	alpi bfct bgk const cyclic defs.h dfff dmul dmul102 \
 BROKEN=		"Does not compile on sparc64 or ia64"
 .endif
 
+post-extract:
+	@( cd ${WRKSRC};${TAR} xfz ${DISTDIR}/${GC_SRC} )
 pre-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DOCSDIR}

math/asir2000/distinfo

@@ -1,4 +1,6 @@
-MD5 (asir-20050603.tar.gz) = 0ac9b56dd2fbb95be98ca776d0806434
-SIZE (asir-20050603.tar.gz) = 2368279
-MD5 (asirdoc-20050603.tar.gz) = 4ef0155807ebdae3df234f26b0e4eeb1
-SIZE (asirdoc-20050603.tar.gz) = 1339927
+MD5 (asir-20051010.tar.gz) = b86dc3c3f360dc1687fbd5cbf7ea4f04
+SIZE (asir-20051010.tar.gz) = 2389616
+MD5 (asirdoc-20051009.tar.gz) = 7eaefa48139c49c7f9d92502a06c7b8f
+SIZE (asirdoc-20051009.tar.gz) = 1365038
+MD5 (gc6.5.tar.gz) = 00bf95cdcbedfa7321d14e0133b31cdb
+SIZE (gc6.5.tar.gz) = 752464

math/asir2000/files/patch-ac

@@ -1,10 +1,8 @@
---- 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.196 2004/12/18 16:50:10 saito Exp $ 
+--- include/version.h.orig      Sun Oct  9 13:46:54 2005
++++ include/version.h   Mon Oct 10 01:22:03 2005
+@@ -48,4 +48,4 @@
+  * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.215 2005/10/09 04:46:54 noro Exp $ 
  */
--#define ASIR_VERSION 20041219
+ #define ASIR_VERSION 20051009
 -#define ASIR_DISTRIBUTION "Kobe"
-+#define ASIR_VERSION 20050131
 +#define ASIR_DISTRIBUTION "Plotting Group"

math/asir2000/files/patch-ag

@@ -1,5 +1,5 @@
---- parse/glob.c.orig	Wed Nov 24 15:01:04 2004
-+++ parse/glob.c	Sat Dec 18 03:00:03 2004
+--- parse/glob.c.orig	Tue Oct 11 00:16:38 2005
++++ parse/glob.c	Tue Oct 11 00:24:51 2005
 @@ -51,6 +51,7 @@
  #include "al.h"
  #include "parse.h"
@@ -8,15 +8,12 @@
  #if defined(PARI)
  #include "genpari.h"
  #endif
-@@ -791,10 +792,7 @@
+@@ -767,7 +768,7 @@
  char *get_pariversion() 
  {
  #if PARI
 -#if 0
--	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
--	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 "";
- }
++#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";

math/asir2000/files/patch-ba

@@ -1,24 +1,16 @@
---- Makefile.am.orig	Mon Mar 24 20:30:38 2003
-+++ Makefile.am	Fri May  2 15:33:10 2003
-@@ -9,13 +9,15 @@
+--- Makefile.am.orig	Tue Jul 12 23:47:13 2005
++++ Makefile.am	Thu Aug 11 10:39:00 2005
+@@ -9,7 +9,8 @@
  
  SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
  
 -asirdir       = ${libdir}/asir
 +bindir        = ${prefix}/bin
-+asirlibdir    = ${datadir}/asir
 +asirdir       = ${bindir}
  asir_PROGRAMS = asir
  asir_SOURCES  = parse/main.c
  asir_LDADD    = libasir.a libasir-gc.a
- CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
- 
--DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
-+DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirlibdir}\"
- INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-            -I${top_srcdir}/gc/include \
-            @PARIINC@ @MPIINC@ @X_CFLAGS@
-@@ -76,33 +78,33 @@
+@@ -102,33 +103,33 @@
  	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
  
  install-openxm: asir${EXEEXT} install-libasir install-libasir-gc