diff options
| -rw-r--r-- | math/rlab/Makefile | 4 | ||||
| -rw-r--r-- | math/rlab/distinfo | 6 | ||||
| -rw-r--r-- | math/rlab/patches/patch-ab | 13 | ||||
| -rw-r--r-- | math/rlab/patches/patch-aq | 52 | ||||
| -rw-r--r-- | math/rlab/patches/patch-ar | 52 |
5 files changed, 121 insertions, 6 deletions
diff --git a/math/rlab/Makefile b/math/rlab/Makefile index c2348d5526e..74ec1a62f4b 100644 --- a/math/rlab/Makefile +++ b/math/rlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/10/02 20:56:34 dillo Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/28 01:18:20 uebayasi Exp $ DISTNAME= rlab-2.1.05 CATEGORIES= math @@ -49,6 +49,8 @@ RLAB_USE_SUPERLU?= YES .if (${RLAB_USE_SUPERLU} == YES) DEPENDS+= superlu-[0-9]*:../../math/superlu CONFIGURE_ARGS+= --enable-SUPERLU +CPPFLAGS+= ${BUILDLINK_CPPFLAGS.superlu} +.include "../../math/superlu/buildlink2.mk" .endif .if defined(RLAB_PAGER) diff --git a/math/rlab/distinfo b/math/rlab/distinfo index 1c6f1610841..c7a57c65f02 100644 --- a/math/rlab/distinfo +++ b/math/rlab/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2002/10/02 20:56:34 dillo Exp $ +$NetBSD: distinfo,v 1.4 2003/01/28 01:18:21 uebayasi Exp $ SHA1 (rlab-2.1.05.tar.gz) = 5b465b45ac1225c89f8375fc0945c485c0b1fa4b Size (rlab-2.1.05.tar.gz) = 2767728 bytes SHA1 (patch-aa) = 6b177a66de9262c4f6fcd6fcd48bc897f3a7bbe2 -SHA1 (patch-ab) = e1270ade1b430b67f8264eba76ef9bd220db7d9f +SHA1 (patch-ab) = d678a740394c6c929f3ced9fdad7dcf7b9a0a091 SHA1 (patch-ac) = 44004dd04c217494dc556fe678c087b4a5a15cc2 SHA1 (patch-ad) = 595ef1b4f1ebc21fbdf6b3fec61a9380f61936ca SHA1 (patch-ae) = 3f16b832cc4ec6f82cb42bab0362e1d7fc941148 @@ -18,3 +18,5 @@ SHA1 (patch-am) = efa48be1acecfee52d091d01eb68b07c72a8d0e2 SHA1 (patch-an) = b489b9b02bd1a717f1312e88c827dbdbbca5b487 SHA1 (patch-ao) = 203a9ba6e25a7e7d7e2aff60979f66e619c2160c SHA1 (patch-ap) = a96d358d5f44f92ea718abfadc74b88d9f0ae93e +SHA1 (patch-aq) = 5dbb4b12bc2eb675b7e598b9806276d63695a4ee +SHA1 (patch-ar) = bdb63186d7034e6d300e63a7cf94ac0d9b743ba8 diff --git a/math/rlab/patches/patch-ab b/math/rlab/patches/patch-ab index c4a4f514fc0..e89d896fe39 100644 --- a/math/rlab/patches/patch-ab +++ b/math/rlab/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2001/02/21 20:31:59 jtb Exp $ +$NetBSD: patch-ab,v 1.6 2003/01/28 01:18:21 uebayasi Exp $ ---- Makefile.in.orig Fri Apr 30 14:32:04 1999 +--- Makefile.in.orig Fri Apr 30 23:32:04 1999 +++ Makefile.in @@ -99,20 +99,20 @@ # -lfftpack FFTPACK library (double precision version) @@ -33,7 +33,14 @@ $NetBSD: patch-ab,v 1.5 2001/02/21 20:31:59 jtb Exp $ REQ_LIBS = $(LAPACK_LIB) $(BLAS_LIB) $(FFTPACK_LIB) $(RANLIB_LIB) $(MINPACK_LIB) -@@ -157,7 +157,7 @@ +@@ -151,13 +151,13 @@ + # Silicon Graphics machines need this for popen() + # SPECIAL_FLAGS = -ansiposix + +-SPECIAL_FLAGS = -DASSERT_OFF $(IGC) ++SPECIAL_FLAGS = $(CPPFLAGS) -DASSERT_OFF $(IGC) + + # prefix: The parent directory for the installation prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = $(exec_prefix)/bin diff --git a/math/rlab/patches/patch-aq b/math/rlab/patches/patch-aq new file mode 100644 index 00000000000..7e8a27c6050 --- /dev/null +++ b/math/rlab/patches/patch-aq @@ -0,0 +1,52 @@ +$NetBSD: patch-aq,v 1.1 2003/01/28 01:18:22 uebayasi Exp $ + +--- mscf2.c.orig Sun Apr 25 22:48:13 1999 ++++ mscf2.c +@@ -292,7 +292,7 @@ + #undef _C + #undef _Z + +-#include "supermatrix.h" ++#include <superlu/zsp_defs.h> + + #define Matrix SuperMatrix + +@@ -488,9 +488,9 @@ + * Setup the SuperLU [A] from [a]. + */ + +- A.Stype = NC; +- A.Dtype = _Z; +- A.Mtype = GE; ++ A.Stype = SLU_NC; ++ A.Dtype = SLU_Z; ++ A.Mtype = SLU_GE; + A.nrow = n; + A.ncol = n; + A.Store = GC_MALLOC(sizeof(NCformat)); +@@ -504,9 +504,9 @@ + * Setup the SuperLU RHS from [x] (a copy of [b]). + */ + +- B.Stype = DN; +- B.Dtype = _Z; +- B.Mtype = GE; ++ B.Stype = SLU_DN; ++ B.Dtype = SLU_Z; ++ B.Mtype = SLU_GE; + B.nrow = n; + B.ncol = MNC (b); + B.Store = (DNformat *) GC_MALLOC (sizeof(DNformat)); +@@ -646,9 +646,9 @@ + perm_ctmp = (int *) GC_MAIOP(n*sizeof(int)); + perm_r = (int *) GC_MAIOP(n*sizeof(int)); + +- A.Stype = NC; +- A.Dtype = _Z; +- A.Mtype = GE; ++ A.Stype = SLU_NC; ++ A.Dtype = SLU_Z; ++ A.Mtype = SLU_GE; + A.nrow = n; + A.ncol = n; + A.Store = GC_MALLOC(sizeof(NCformat)); diff --git a/math/rlab/patches/patch-ar b/math/rlab/patches/patch-ar new file mode 100644 index 00000000000..ee5809d376d --- /dev/null +++ b/math/rlab/patches/patch-ar @@ -0,0 +1,52 @@ +$NetBSD: patch-ar,v 1.1 2003/01/28 01:18:22 uebayasi Exp $ + +--- msrf2.c.orig Sun Apr 25 22:48:13 1999 ++++ msrf2.c +@@ -694,7 +694,7 @@ + #undef _C + #undef _Z + +-#include "supermatrix.h" ++#include <superlu/dsp_defs.h> + + #define Matrix SuperMatrix + +@@ -886,9 +886,9 @@ + * Setup the SuperLU [A] from [a] + */ + +- A.Stype = NC; +- A.Dtype = _D; +- A.Mtype = GE; ++ A.Stype = SLU_NC; ++ A.Dtype = SLU_D; ++ A.Mtype = SLU_GE; + A.nrow = n; + A.ncol = n; + A.Store = GC_MALLOC(sizeof(NCformat)); +@@ -902,9 +902,9 @@ + * Setup the SuperLU RHS from [x] (a copy of [b]). + */ + +- B.Stype = DN; +- B.Dtype = _D; +- B.Mtype = GE; ++ B.Stype = SLU_DN; ++ B.Dtype = SLU_D; ++ B.Mtype = SLU_GE; + B.nrow = n; + B.ncol = MNC (b); + B.Store = (DNformat *) GC_MALLOC (sizeof(DNformat)); +@@ -1162,9 +1162,9 @@ + + perm_r = (int *) GC_MAIOP(n*sizeof(int)); + +- A.Stype = NC; +- A.Dtype = _D; +- A.Mtype = GE; ++ A.Stype = SLU_NC; ++ A.Dtype = SLU_D; ++ A.Mtype = SLU_GE; + A.nrow = n; + A.ncol = n; + A.Store = GC_MALLOC(sizeof(NCformat)); |