Enable the use of the SuperLU library for RlaB.

6 files changed, 66 insertions, 50 deletions

diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index 32b8acca132..d8311f2c353 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/01 04:44:49 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/02 02:06:43 jtb Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -9,6 +9,7 @@ HOMEPAGE=		http://rlab.sourceforge.net/
 
 DEPENDS+=		boehm-gc>=5.3:../../devel/boehm-gc
 DEPENDS+=		readline>=4.0:../../devel/readline
+DEPENDS+=		superlu-[0-9]*:../../math/superlu
 BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 
 GNU_CONFIGURE=		YES
@@ -16,6 +17,7 @@ USE_FORTRAN=		YES
 
 EVAL_PREFIX+=		GC_PREFIX=boehm-gc
 CONFIGURE_ARGS+=	"--with-GC=${GC_PREFIX}"
+CONFIGURE_ARGS+=	"--enable-SUPERLU"
 
 PLIST_SRC=		${PKGDIR}/PLIST
 
diff --git a/math/rlab/files/patch-sum b/math/rlab/files/patch-sum
index 0c0bb7183da..6421c7fe268 100644
--- a/math/rlab/files/patch-sum
+++ b/math/rlab/files/patch-sum
@@ -1,15 +1,15 @@
-$NetBSD: patch-sum,v 1.4 2001/02/01 04:44:51 jtb Exp $
+$NetBSD: patch-sum,v 1.5 2001/02/02 02:06:44 jtb Exp $
 
 MD5 (patch-aa) = 49374d56870f3b295f38659815e849ac
-MD5 (patch-ab) = 455d8b083647b1fb3528ed3ccaffb66d
+MD5 (patch-ab) = ed7772d323440889b7595c555e88c070
 MD5 (patch-ac) = 311a53e109284cf0878c3e1c5c356c84
 MD5 (patch-ad) = db68aaf5d236bcf94ba637a4220c93ba
 MD5 (patch-ae) = 2c8e104b50840bb85f861d1fe26f488b
 MD5 (patch-af) = f727aaa2fbae646de1818ff0c78b376a
 MD5 (patch-ag) = 8693d533154453f51fdd84a1d413941c
-MD5 (patch-ah) = 85123f7460802e5bf85e5b0cd881bced
+MD5 (patch-ah) = eef24e58245faf6d9b5f3ff25def0aa4
 MD5 (patch-ai) = c8cba113e462f245947e05c26837f87a
 MD5 (patch-aj) = 8203f0159d1d109511f7eb550b9a35aa
-MD5 (patch-ak) = 07da61dfedbd4a55f8f26687e2fb3312
+MD5 (patch-ak) = 0fa142b20f464c278980adb421309b95
 MD5 (patch-al) = 899cd22615301759babfcca922c86159
 MD5 (patch-am) = c6090cacd80c2ce76d0513fe93c342c9
diff --git a/math/rlab/patches/patch-ab b/math/rlab/patches/patch-ab
index 0fb394bb7ad..240d789ad53 100644
--- a/math/rlab/patches/patch-ab
+++ b/math/rlab/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2001/02/02 02:06:44 jtb Exp $
 
 --- Makefile.in.orig	Fri Apr 30 14:32:04 1999
 +++ Makefile.in
@@ -32,6 +32,19 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
  mand =		$(exec_prefix)/man
  mandir = 	$(exec_prefix)/man/man1
  buildir =       @BUILD_DIR@
+@@ -166,9 +166,9 @@
+ # Don't change these without modifying the install actions
+ #
+ 
+-TOPDIR = 	$(libdir)/rlab-$(VER)
+-DOCDIR = 	$(TOPDIR)/doc
+-RHELPDIR =	$(TOPDIR)/doc/help
++TOPDIR = 	$(libdir)/rlab
++DOCDIR = 	$(prefix)/share/doc/rlab
++RHELPDIR =	$(TOPDIR)/help
+ RLIBDIR =	$(TOPDIR)/rlib
+ DEFAULT_RC0 =	$(TOPDIR)/.rlab
+ TOOLBOX =	$(TOPDIR)/toolbox
 @@ -236,7 +236,7 @@
  SRC = 		$(R_SRC) $(F_SRC) $(EXTRA_SRC) $(GNU_SRC) $(CMD_SRC)
  OBJ = 		$(R_OBJ) $(F_OBJ) $(EXTRA_OBJ) $(GNU_OBJ) $(CMD_OBJ)
@@ -50,7 +63,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
  
  #
  # Ignore these unless you know what CodeTEST Native for Solaris is.
-@@ -301,51 +301,72 @@
+@@ -301,51 +301,67 @@
  COPYDIR =	rlib toolbox controls-toolbox doc examples .rlab config.h test.r \
  		test.getline test.input Makefile
  
@@ -66,49 +79,44 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
 -		  cp misc/pgplot.r ${TOPDIR}/rlib/plot.r;\
 -		  cd misc/pghelp; tar cf - . | (cd ${RHELPDIR}; umask 022; tar xf - ) ;\
 +install:	rlab
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab
-+		$(BSD_INSTALL_DATA) $(buildir)/.rlab $(libdir)/rlab
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/rlib
++		$(BSD_INSTALL_DATA_DIR) $(TOPDIR)
++		$(BSD_INSTALL_DATA) $(buildir)/.rlab $(TOPDIR)
++		$(BSD_INSTALL_DATA_DIR) $(RLIBDIR)
 +		@for f in $(buildir)/rlib/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/rlib/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(RLIBDIR)"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/toolbox
++		$(BSD_INSTALL_DATA_DIR) $(TOOLBOX)
 +		@for f in $(buildir)/toolbox/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/toolbox/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(TOOLBOX)"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/controls-toolbox
++		$(BSD_INSTALL_DATA_DIR) $(CTOOLBOX)
 +		@for f in $(buildir)/controls-toolbox/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/controls-toolbox/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(CTOOLBOX)"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/help
++		$(BSD_INSTALL_DATA_DIR) $(RHELPDIR)
 +		@for f in $(buildir)/doc/help/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/examples
++		$(BSD_INSTALL_DATA_DIR) $(TOPDIR)/examples
 +		@for f in $(buildir)/examples/* $(buildir)/test.*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/examples/"; \
-+			echo $$i; $$i; \
-+		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/doc/rlab
-+		$(BSD_INSTALL_DATA) $(buildir)/doc/rlab-ref.ps $(libdir)/doc/rlab
-+		@for f in BUGS PROBLEMS README.Metis README.PGRAF \
-+		README.PLPLOT README.SPARSE TODO WHATS.NEW; do \
-+			i="$(BSD_INSTALL_DATA) $(buildir)/$$f $(libdir)/doc/rlab/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(TOPDIR)/examples/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(libdir)/doc/html/rlab
++		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/rlab
++		$(BSD_INSTALL_DATA) $(buildir)/doc/rlab-ref.ps $(DOCDIR)
++		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/html/rlab
 +		@for f in $(buildir)/doc/html/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/doc/html/rlab/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/doc/html/rlab/"; \
 +			echo $$i; $$i; \
 +		done
 +		if test "$(PLOT_PROG)" = "plplot" ; then \
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(libdir)/rlab/rlib/plot.r;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(RLIBDIR)/plot.r;\
 +		  for f in $(buildir)/misc/plhelp/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \
 +			echo $$i; $$i; \
 +		  done \
  		fi
@@ -116,10 +124,10 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
 -		  cp misc/gnuplot.r ${TOPDIR}/rlib/plot.r;\
 -		  cp misc/gp-compat.r ${TOPDIR}/rlib/gp-compat.r;\
 -		  cd misc/gnuplothelp; tar cf - . | (cd ${RHELPDIR}; umask 022; tar xf - ) ;\
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/gnuplot.r $(libdir)/rlab/rlib/plot.r;\
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/gp-compat.r $(libdir)/rlab/rlib/gp-compat.r;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/gnuplot.r $(RLIBDIR)/plot.r;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/gp-compat.r $(RLIBDIR)/gp-compat.r;\
 +		  for f in $(buildir)/misc/gnuplothelp/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(RHELPDIR)"; \
 +			echo $$i; $$i; \
 +		  done \
  		fi
@@ -129,7 +137,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
 -		$(INSTALL_PROGRAM) rlab $(bindir)/rlab-$(VER)
 -		if test -x "$(bindir)/rlab2" ; then\
 -		  rm -f $(bindir)/rlab2;\
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/plotmtv.r $(libdir)/rlab/rlib/;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/plotmtv.r $(RLIBDIR);\
  		fi
 +		$(BSD_INSTALL_PROGRAM) $(buildir)/rlab $(bindir)/rlab-$(VER)
  		sed 's@rlab_exec_prefix@$(exec_prefix)@' ./misc/rlab > ./misc/rlab.tmp.0
@@ -159,7 +167,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
  
  FRC:		
  
-@@ -526,22 +547,23 @@
+@@ -526,22 +542,23 @@
  #
  
  main.o: main.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h \
@@ -191,7 +199,7 @@ $NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
  op.o: op.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h code.h \
   list.h symbol.h class.h util.h
  opapp.o: opapp.c rlab.h config.h ent.h mds.h mdr.h btree.h listnode.h \
-@@ -551,118 +573,124 @@
+@@ -551,118 +568,124 @@
  complex.o: complex.c complex.h rlab.h config.h ent.h mds.h mdr.h \
   btree.h listnode.h util.h list.h mathl.h
  function.o: function.c rlab.h config.h ent.h mds.h mdr.h btree.h \
diff --git a/math/rlab/patches/patch-ah b/math/rlab/patches/patch-ah
index bc19de7cd85..6ef207c5c84 100644
--- a/math/rlab/patches/patch-ah
+++ b/math/rlab/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/01/31 07:30:52 jtb Exp $
+$NetBSD: patch-ah,v 1.2 2001/02/02 02:06:44 jtb Exp $
 
---- gc/gcconfig.h.orig	Sun May  9 13:16:49 1999
-+++ gc/gcconfig.h
+--- ../gc/gcconfig.h	Sun May  9 13:16:49 1999
++++ gcconfig.h
 @@ -13,9 +13,9 @@
   * modified is included with the above copyright notice.
   */
@@ -494,7 +494,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2001/01/31 07:30:52 jtb Exp $
      extern int __data_start;
  #   define DATASTART ((ptr_t)(&__data_start))
  #   if 0
-@@ -877,18 +1046,39 @@
+@@ -877,22 +1046,43 @@
  	/* this.)							*/
  #       define STACKBOTTOM ((ptr_t) 0x7b033000)  /* from /etc/conf/h/param.h */
  #   else
@@ -536,6 +536,11 @@ $NetBSD: patch-ah,v 1.1.1.1 2001/01/31 07:30:52 jtb Exp $
  #   ifdef OSF1
  #	define OS_TYPE "OSF1"
  #   	define DATASTART ((ptr_t) 0x140000000)
+-	extern _end;
++	extern int _end;
+ #   	define DATAEND ((ptr_t) &_end)
+ #   	define HEURISTIC2
+ 	/* Normally HEURISTIC2 is too conervative, since		*/
 @@ -909,9 +1099,9 @@
  #       define CPP_WORDSZ 64
  #       define STACKBOTTOM ((ptr_t) 0x120000000)
diff --git a/math/rlab/patches/patch-ak b/math/rlab/patches/patch-ak
index 708398cd9b4..8f5fbd400fd 100644
--- a/math/rlab/patches/patch-ak
+++ b/math/rlab/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2001/02/01 04:44:51 jtb Exp $
+$NetBSD: patch-ak,v 1.3 2001/02/02 02:06:44 jtb Exp $
 
 --- misc/rlab.orig	Wed Apr 21 14:02:13 1999
 +++ misc/rlab
@@ -11,3 +11,12 @@ $NetBSD: patch-ak,v 1.2 2001/02/01 04:44:51 jtb Exp $
  RLABEXE="$RROOT/bin/rlab-$RLAB_VER"    # The rlab executable.
  
  #
+@@ -50,7 +50,7 @@
+ # The RLaB2 help directory
+ #
+ 
+-RLAB2_HELP_DIR="$RD/doc/help"
++RLAB2_HELP_DIR="$RD/help"
+ 
+ #
+ # The pager to use.
diff --git a/math/rlab/pkg/PLIST b/math/rlab/pkg/PLIST
index a1de9ed86b7..a650cd1f033 100644
--- a/math/rlab/pkg/PLIST
+++ b/math/rlab/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/02/01 04:44:51 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/02 02:06:44 jtb Exp $
 bin/${PKGNAME}
 bin/rlab
 man/man1/rlab.1
@@ -13,14 +13,6 @@ share/doc/html/rlab/rlab-ref-7.html
 share/doc/html/rlab/rlab-ref-8.html
 share/doc/html/rlab/rlab-ref-9.html
 share/doc/html/rlab/rlab-ref.html
-share/doc/rlab/BUGS
-share/doc/rlab/PROBLEMS
-share/doc/rlab/README.Metis
-share/doc/rlab/README.PGRAF
-share/doc/rlab/README.PLPLOT
-share/doc/rlab/README.SPARSE
-share/doc/rlab/TODO
-share/doc/rlab/WHATS.NEW
 share/doc/rlab/rlab-ref.ps
 share/rlab/.rlab
 share/rlab/controls-toolbox/Test_new.r