diff options
| -rw-r--r-- | math/asir2000/Makefile | 40 | ||||
| -rw-r--r-- | math/asir2000/distinfo | 4 | ||||
| -rw-r--r-- | math/asir2000/files/patch-aa | 6 | ||||
| -rw-r--r-- | math/asir2000/files/patch-ac | 15 | ||||
| -rw-r--r-- | math/asir2000/files/patch-ad | 15 | ||||
| -rw-r--r-- | math/asir2000/files/patch-ae | 3 | ||||
| -rw-r--r-- | math/asir2000/files/patch-af | 25 | ||||
| -rw-r--r-- | math/asir2000/pkg-plist | 6 |
8 files changed, 69 insertions, 45 deletions
diff --git a/math/asir2000/Makefile b/math/asir2000/Makefile index 06f616db2d1b..b199971d9e97 100644 --- a/math/asir2000/Makefile +++ b/math/asir2000/Makefile @@ -6,7 +6,7 @@ # PORTNAME= asir -PORTVERSION= 20010830 +PORTVERSION= 20020108 CATEGORIES= math MASTER_SITES= ftp://ftp.asir.org/pub/asir/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ASIR_DOC} @@ -14,20 +14,50 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= saito@asir.org -LIB_DEPENDS= pari.1:${PORTSDIR}/math/pari \ - lapack.3:${PORTSDIR}/math/lapack +.if defined(USE_LAPACK) +LIB_DEPENDS= lapack.3:${PORTSDIR}/math/lapack +.endif +.if defined(USE_OLDPARI) +LIB_DEPENDS+= pari.1:${PORTSDIR}/math/pari +.else +LIB_DEPENDS+= pari-2.2.0:${PORTSDIR}/math/pari-devel +.endif +.if defined(USE_LAPACK) +LAPACK= -lapack +.else +LAPACK= +.endif +.if defined(USE_OLDPARI) +PARI= -oldpari +.else +PARI= -pari +.endif WRKSRC= ${WRKDIR}/asir2000 PREFIX?= ${LOCALBASE} USE_IMAKE= YES HAS_CONFIGURE= YES -CONFIGURE_ARGS= -oxhome ${PREFIX} -plot -pari -fep -interval -lapack - +CONFIGURE_ARGS= -oxhome ${PREFIX} -plot ${PARI} -fep -interval ${LAPACK} ASIR_DOC= asirdoc-${PORTVERSION}.tar.gz + LIB_DATA= alpi bfct bgk const cyclic defs.h dfff dmul fctrdata fctrtest \ fff gr ifplot katsura launch mat nf num primdec \ ratint robot solve sp sturm xm +pre-everything:: + @${ECHO_MSG} "" +.if !defined(USE_OLDPARI) + @${ECHO_MSG} "If you build with the older pari 2.1.1 library," + @${ECHO_MSG} " make USE_OLDPARI=yes" + @${ECHO_MSG} "otherwise it will link the newer pari 2.2.0 library." +.endif + @${ECHO_MSG} "" +.if !defined(USE_LAPACK) + @${ECHO_MSG} "To build with the \"LAPACK\" library," + @${ECHO_MSG} " make USE_LAPACK=yes" +.endif + @${ECHO_MSG} "" + pre-install: @${MKDIR} ${DATADIR} @${MKDIR} ${DOCSDIR} diff --git a/math/asir2000/distinfo b/math/asir2000/distinfo index e446a047b01d..a292d1ddd3e2 100644 --- a/math/asir2000/distinfo +++ b/math/asir2000/distinfo @@ -1,2 +1,2 @@ -MD5 (asir-20010830.tar.gz) = fdb5dd953120294d3f65ad23b1519c19 -MD5 (asirdoc-20010830.tar.gz) = 5987e90fdea3214aa4d238d8d0c8db4a +MD5 (asir-20020108.tar.gz) = 4515dce7fbbb53ab117b6a153345479b +MD5 (asirdoc-20020108.tar.gz) = cec5c44e1b9ca83a34d49e10210d14cd diff --git a/math/asir2000/files/patch-aa b/math/asir2000/files/patch-aa index 25813f0b8970..982bf286213a 100644 --- a/math/asir2000/files/patch-aa +++ b/math/asir2000/files/patch-aa @@ -1,5 +1,5 @@ ---- include/Risa.tmpl.orig Wed Aug 29 11:35:21 2001 -+++ include/Risa.tmpl Wed Aug 29 12:09:55 2001 +--- include/Risa.tmpl.orig Sat Oct 6 01:24:22 2001 ++++ include/Risa.tmpl Tue Oct 23 02:44:17 2001 @@ -11,7 +11,7 @@ /* #define USE_FFT_FLOAT */ /* #define USE_LAPACK */ @@ -34,7 +34,7 @@ +#if defined(OpenXM_HOME) LAPACKLIB = -llapack -lblas -lI77 -lF77 +#else -+#if defined(FreeBSDArchitecture) && OSMajorVersion >= 4 ++#ifdef FreeBSDArchitecture && OSMajorVersion >= 4 +LAPACKLIB = -L/usr/local/lib -lg2c -llapack -lblas +#else +LAPACKLIB = -L/usr/local/lib -lf2c -llapack -lblas diff --git a/math/asir2000/files/patch-ac b/math/asir2000/files/patch-ac index 4f1fec7152fe..42db624cd86b 100644 --- a/math/asir2000/files/patch-ac +++ b/math/asir2000/files/patch-ac @@ -1,12 +1,13 @@ ---- include/version.h.orig Thu Aug 9 10:20:46 2001 -+++ include/version.h Thu Aug 16 19:00:40 2001 -@@ -47,5 +47,7 @@ +--- include/version.h.orig Thu Oct 4 02:04:12 2001 ++++ include/version.h Tue Oct 23 02:26:45 2001 +@@ -47,5 +47,8 @@ * - * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.45 2001/07/03 01:41:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/version.h,v 1.51 2001/10/01 02:00:28 noro Exp $ */ --#define ASIR_VERSION 20010703 +-#define ASIR_VERSION 20011001 -#define ASIR_DISTRIBUTION "Kobe" -+#define ASIR_VERSION 20010809 ++#define ASIR_VERSION 20011005 +#define ASIR_DISTRIBUTION "Plotting Group" -+#define PARI_VERSION "PARI CALCULATOR Version 2.1.1 (released) Copyright (C) 2000 The PARI Group" ++#define PARI2_VERSION "PARI CALCULATOR Version 2.2.0 (alpha) Copyright (C) 2000 The PARI Group" ++#define PARI1_VERSION "PARI CALCULATOR Version 2.1.1 (released) Copyright (C) 2000 The PARI Group" +#define LAPACK_VERSION "LAPACK Project Version 3.0" diff --git a/math/asir2000/files/patch-ad b/math/asir2000/files/patch-ad index 39fb80e2ba00..a47f5c9d0826 100644 --- a/math/asir2000/files/patch-ad +++ b/math/asir2000/files/patch-ad @@ -1,5 +1,5 @@ ---- configure.org Thu Aug 16 18:36:16 2001 -+++ configure Thu Aug 16 18:38:59 2001 +--- configure.orig Sat Oct 6 01:24:21 2001 ++++ configure Tue Oct 23 02:16:02 2001 @@ -4,6 +4,7 @@ use_plot=0 use_pari=0 @@ -8,8 +8,8 @@ use_fep=0 oxhome=/usr/local -@@ -22,6 +23,8 @@ - use_pari=1 ;; +@@ -24,6 +25,8 @@ + use_pari=2 ;; -interval) use_interval=1 ;; + -lapack) @@ -17,16 +17,13 @@ -fep) use_fep=1 ;; esac -@@ -48,8 +51,12 @@ - fi - +@@ -59,6 +62,10 @@ if [ $use_interval != 0 ]; then --libname=$libname"_itv" + libname=$libname"_itv" echo "#define USE_INTERVAL" >> include/config.h +fi + +if [ $use_lapack != 0 ]; then -+libname=$libname"_itv" +echo "#define USE_LAPACK" >> include/config.h fi diff --git a/math/asir2000/files/patch-ae b/math/asir2000/files/patch-ae index 20592b6057cf..3c4e7f5a1b2d 100644 --- a/math/asir2000/files/patch-ae +++ b/math/asir2000/files/patch-ae @@ -10,5 +10,4 @@ #include <f2c.h> +#endif - void Pflinsolve(); - + void Pflinsolve(); diff --git a/math/asir2000/files/patch-af b/math/asir2000/files/patch-af index d5549e5c019b..1d4f13b3eef6 100644 --- a/math/asir2000/files/patch-af +++ b/math/asir2000/files/patch-af @@ -1,30 +1,25 @@ ---- parse/glob.c.orig Thu Aug 9 10:20:46 2001 -+++ parse/glob.c Thu Aug 16 19:04:59 2001 -@@ -50,6 +50,7 @@ - #include "ca.h" +--- parse/glob.c.orig Sat Nov 3 18:28:57 2001 ++++ parse/glob.c Wed Nov 14 17:20:47 2001 +@@ -51,6 +51,7 @@ #include "al.h" #include "parse.h" + #include "ox.h" +#include "version.h" #if PARI #include "genpari.h" #endif -@@ -688,11 +689,15 @@ - printf("This is Risa/Asir, Version %d (%s Distribution).\n", - get_asir_version(), get_asir_distribution()); - #endif -+ +@@ -669,8 +670,12 @@ printf("Copyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\n"); printf("Copyright 2000,2001, Risa/Asir committers, http://www.openxm.org/.\n"); printf("GC 5.3, copyright 1999, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n"); -- printf("PARI 2.0.17(beta), copyright (C) 1989-1999,\n"); +- printf("PARI 2.2.1(alpha), copyright (C) 2000,\n"); - printf(" C. Batut, K. Belabas, D. Bernardi, H. Cohen and M. Olivier.\n"); --} -- +#if defined(PARI) -+ printf("%s.\n",PARI_VERSION); ++ printf("%s.\n",PARI2_VERSION); +#endif - +#if defined(LAPACK) + printf("%s.\n",LAPACK_VERSION); +#endif -+} + } + + diff --git a/math/asir2000/pkg-plist b/math/asir2000/pkg-plist index 461a4fcfff43..c8361a8f9ee6 100644 --- a/math/asir2000/pkg-plist +++ b/math/asir2000/pkg-plist @@ -577,9 +577,7 @@ share/asir/help-jp/version share/asir/help-jp/vtol share/asir/help-jp/vtype share/asir/help-jp/which -share/doc/asir/man-eg.pdf share/doc/asir/man-eg.ps -share/doc/asir/man-jp.pdf share/doc/asir/man-jp.ps share/doc/asir/html-eg/man_1.html share/doc/asir/html-eg/man_10.html @@ -1109,11 +1107,15 @@ share/doc/asir/html-jp/man_97.html share/doc/asir/html-jp/man_98.html 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/internal.ps @dirrm share/asir/help-jp @dirrm share/asir/help-eg @dirrm share/asir @dirrm share/doc/asir/html-eg @dirrm share/doc/asir/html-jp +@dirrm share/doc/asir/html-internal-ja @dirrm share/doc/asir @unexec rm -rf /usr/local/share/asir/ox_asir @unexec rm -rf /usr/local/share/asir/ox_plot |