Removed some cruft. Use `plplot_linkage` to find the location of

plplot/tcl/tk/x11. New variables RLAB_USE_SUPERLU, RLAB_PAGER.

8 files changed, 36 insertions, 88 deletions

diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index f8a2b5da0c6..03c7eeada91 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/05 09:01:00 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/11 23:06:02 jtb Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -9,7 +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+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
 GNU_CONFIGURE=		YES
@@ -17,7 +17,6 @@ USE_FORTRAN=		YES
 
 EVAL_PREFIX+=		GC_PREFIX=boehm-gc
 CONFIGURE_ARGS+=	"--with-GC=${GC_PREFIX}"
-CONFIGURE_ARGS+=	"--enable-SUPERLU"
 
 PLIST_SRC=		${PKGDIR}/PLIST
 
@@ -26,10 +25,8 @@ PLIST_SRC=		${PKGDIR}/PLIST
 RLAB_PLOT_PKG?=		gnuplot
 .if (${RLAB_PLOT_PKG} == "plplot")
 DEPENDS+=		plplot>=5.0.1:../../graphics/plplot
-EVAL_PREFIX+=		PLPLOT_PREFIX=plplot TCL_PREFIX=tcl TK_PREFIX=tk
-CONFIGURE_ARGS+=	"--with-tk=${TK_PREFIX}"
+EVAL_PREFIX+=		PLPLOT_PREFIX=plplot
 CONFIGURE_ARGS+=	"--with-plplot=${PLPLOT_PREFIX}"
-CONFIGURE_ARGS+=	"--with-tcl=${TCL_PREFIX}"
 PLIST_SRC+=		${PKGDIR}/PLIST.plplot
 .elif (${RLAB_PLOT_PKG} == "plotmtv")
 DEPENDS+=		plotmtv-[0-9]*:../../graphics/plotmtv
@@ -46,6 +43,16 @@ CONFIGURE_ARGS+=	"--with-gnuplot=yes"
 PLIST_SRC+=		${PKGDIR}/PLIST.gnuplot
 .endif
 
+RLAB_USE_SUPERLU?=	YES
+.if (${RLAB_USE_SUPERLU} == YES)
+DEPENDS+=		superlu-[0-9]*:../../math/superlu
+CONFIGURE_ARGS+=	"--enable-SUPERLU"
+.endif
+
+.if defined(RLAB_PAGER)
+CONFIGURE_ENV+=		"PAGER=${RLAB_PAGER}"
+.endif
+
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
 
diff --git a/math/rlab/files/patch-sum b/math/rlab/files/patch-sum
index 3bda96380a8..31d8c564de3 100644
--- a/math/rlab/files/patch-sum
+++ b/math/rlab/files/patch-sum
@@ -1,10 +1,7 @@
-$NetBSD: patch-sum,v 1.6 2001/02/05 21:38:13 jtb Exp $
+$NetBSD: patch-sum,v 1.7 2001/02/11 23:06:03 jtb Exp $
 
-MD5 (patch-aa) = 49374d56870f3b295f38659815e849ac
-MD5 (patch-ab) = ed7772d323440889b7595c555e88c070
-MD5 (patch-ac) = 311a53e109284cf0878c3e1c5c356c84
-MD5 (patch-ad) = db68aaf5d236bcf94ba637a4220c93ba
-MD5 (patch-ae) = 2c8e104b50840bb85f861d1fe26f488b
+MD5 (patch-aa) = 3b12822d8e1babc6a13be9d37df02da9
+MD5 (patch-ab) = 70a60120feb2bf198591efc38546c016
 MD5 (patch-af) = f727aaa2fbae646de1818ff0c78b376a
 MD5 (patch-ag) = 8693d533154453f51fdd84a1d413941c
 MD5 (patch-ah) = 159d9fef76ec8182164dcb7a0fc2d101
diff --git a/math/rlab/patches/patch-aa b/math/rlab/patches/patch-aa
index 128989f4e04..8076aee4de5 100644
--- a/math/rlab/patches/patch-aa
+++ b/math/rlab/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2001/02/11 23:06:03 jtb Exp $
 
 --- configure.in.orig	Fri Dec 17 16:01:06 1999
 +++ configure.in
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
  fi
  
  X11LIB="$xlibdir -lX11"
-@@ -551,16 +551,20 @@
+@@ -551,12 +551,6 @@
    PLOT_PROG="gnuplot"
  ])
  
@@ -60,21 +60,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
  dnl ------------------------------------------------------------------
  dnl Check for specification of Plplot directory root
  dnl
- 
-+AC_ARG_WITH(tcl, [   --with-tcl           location of Tcl],
-+[
-+  TCLLIB="-Wl,-R$withval/lib -L$withval/lib -ltcl83"
-+])
-+
-+AC_ARG_WITH(tk, [   --with-tk           location of Tk],
-+[
-+  TKLIB="-Wl,-R$withval/lib -L$withval/lib -ltk83"
-+])
-+
- AC_ARG_WITH(plplot, [   --with-plplot           use Plplot],
- [
-   if test -n "$PLOT_PROG" ; then
-@@ -572,11 +576,12 @@
+@@ -572,11 +566,12 @@
      exit 1;
    fi
  
@@ -86,11 +72,11 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
 -  PLIB_INC_DIR="-I$withval"
 -  PLIBS="-L$withval -lplplotdX $X11LIB"
 +  PLIB_INC_DIR=-I$withval/include
-+  PLIBS="-L$withval/lib/plplot -lplplotd -lplmatrix $TKLIB $TCLLIB $X11LIB"
++  PLIBS=`plplot_linkage`
  ])
  
  dnl ------------------------------------------------------------------
-@@ -593,12 +598,6 @@
+@@ -593,12 +588,6 @@
    PLOT_PROG="plotmtv"
  ])
  
@@ -103,7 +89,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
  dnl ------------------------------------------------------------------
  dnl Use the Pgraf interface.
  dnl
-@@ -613,12 +612,6 @@
+@@ -613,12 +602,6 @@
    PLOT_PROG="pgraf"
  ])
  
@@ -116,7 +102,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
  dnl ------------------------------------------------------------------
  dnl Check for specification of PGplot directory root
  dnl
-@@ -648,14 +641,13 @@
+@@ -648,14 +631,13 @@
  dnl then setup for GC. The default action (nothing is specified) is to
  dnl configure for GC.
  
@@ -138,7 +124,7 @@ $NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
  dnl ------------------------------------------------------------------
  
  AC_TRY_LINK([#include <stdio.h>],
-@@ -738,6 +730,7 @@
+@@ -738,6 +720,7 @@
  AC_SUBST(PAGER)
  AC_SUBST(CFLAGS)
  AC_SUBST(FFLAGS)
diff --git a/math/rlab/patches/patch-ab b/math/rlab/patches/patch-ab
index 240d789ad53..3354180a648 100644
--- a/math/rlab/patches/patch-ab
+++ b/math/rlab/patches/patch-ab
@@ -1,28 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2001/02/02 02:06:44 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2001/02/11 23:06:03 jtb Exp $
 
 --- Makefile.in.orig	Fri Apr 30 14:32:04 1999
 +++ Makefile.in
-@@ -99,14 +99,14 @@
- # -lfftpack	FFTPACK library (double precision version)
- # -lranlib	RANLIB (random number generation)
- #
--LAPACK = ./flibs/lapack/liblapack.a
--LAPACK_LIB  = -L./flibs/lapack -llapack
-+LAPACK = ./flibs/lapack/liblapackrlab.a
-+LAPACK_LIB  = -L./flibs/lapack -llapackrlab
+@@ -114,7 +114,7 @@
+ Minpack = ./flibs/minpack/libminpack.a
+ MINPACK_LIB = -L./flibs/minpack -lminpack
  
--BLAS = ./flibs/blas/libblas.a
--BLAS_LIB    = -L./flibs/blas -lblas
-+BLAS = ./flibs/blas/libblasrlab.a
-+BLAS_LIB    = -L./flibs/blas -lblasrlab
+-REQ_LIBS = $(LAPACK_LIB) $(BLAS_LIB) $(FFTPACK_LIB) $(RANLIB_LIB) $(MINPACK_LIB)
++REQ_LIBS = $(LAPACK) $(BLAS) $(FFTPACK) $(Ranlib) $(Minpack)
  
--FFTPACK = ./flibs/fftpack/libfftpack.a
--FFTPACK_LIB = -L./flibs/fftpack -lfftpack
-+FFTPACK = ./flibs/fftpack/libfftpackrlab.a
-+FFTPACK_LIB = -L./flibs/fftpack -lfftpackrlab
+ NALIBS = $(GRAPH_LIB) $(SPARSE_LIB) $(REQ_LIBS)
  
- Ranlib = ./flibs/ranlib/src/libranlib.a
- RANLIB_LIB  = -L./flibs/ranlib/src -lranlib
 @@ -157,7 +157,7 @@
  prefix =        @prefix@
  exec_prefix =   @exec_prefix@
@@ -102,7 +90,7 @@ $NetBSD: patch-ab,v 1.3 2001/02/02 02:06:44 jtb Exp $
 +			echo $$i; $$i; \
 +		done
 +		$(BSD_INSTALL_DATA_DIR) $(TOPDIR)/examples
-+		@for f in $(buildir)/examples/* $(buildir)/test.*; do \
++		@for f in $(buildir)/examples/* $(buildir)/test*; do \
 +			i="$(BSD_INSTALL_DATA) $$f $(TOPDIR)/examples/"; \
 +			echo $$i; $$i; \
 +		done
diff --git a/math/rlab/patches/patch-ac b/math/rlab/patches/patch-ac
deleted file mode 100644
index c1a0e8478e7..00000000000
--- a/math/rlab/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/01/31 07:30:32 jtb Exp $
-
-Kludge to prevent RlaB linking with an incompatible LAPACK (eg. version 3.0).
-RlaB needs LAPACK 2.0.
-
---- flibs/lapack/Makefile.in.orig	Tue Dec 29 05:33:28 1998
-+++ flibs/lapack/Makefile.in
-@@ -1,4 +1,4 @@
--LIBRARY = liblapack.a
-+LIBRARY = liblapackrlab.a
- 
- SHELL = 	@MSHELL@
- F77 =		@F77@
diff --git a/math/rlab/patches/patch-ad b/math/rlab/patches/patch-ad
deleted file mode 100644
index 4fd0df60f4b..00000000000
--- a/math/rlab/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/01/31 07:30:38 jtb Exp $
-
---- flibs/fftpack/Makefile.in.orig	Sat Jan 20 04:40:22 2001
-+++ flibs/fftpack/Makefile.in
-@@ -1,4 +1,4 @@
--LIBRARY = libfftpack.a
-+LIBRARY = libfftpackrlab.a
- 
- SHELL = 	@MSHELL@
- F77 =		@F77@
diff --git a/math/rlab/patches/patch-ae b/math/rlab/patches/patch-ae
deleted file mode 100644
index 6796ca10d58..00000000000
--- a/math/rlab/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/01/31 07:30:38 jtb Exp $
-
---- flibs/blas/Makefile.in.orig	Tue Jan 30 02:25:50 2001
-+++ flibs/blas/Makefile.in
-@@ -1,4 +1,4 @@
--LIBRARY = libblas.a
-+LIBRARY = libblasrlab.a
- 
- SHELL = 	@MSHELL@
- F77 =		@F77@
diff --git a/math/rlab/pkg/PLIST b/math/rlab/pkg/PLIST
index a650cd1f033..c519b5effdb 100644
--- a/math/rlab/pkg/PLIST
+++ b/math/rlab/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/02/02 02:06:44 jtb Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/11 23:06:04 jtb Exp $
 bin/${PKGNAME}
 bin/rlab
 man/man1/rlab.1
@@ -252,6 +252,9 @@ share/rlab/examples/plimag_demo.r
 share/rlab/examples/plot_test.r
 share/rlab/examples/plot_test_pgplot.r
 share/rlab/examples/primes.r
+share/rlab/examples/test-complex.r
+share/rlab/examples/test-list.r
+share/rlab/examples/test-superlu.r
 share/rlab/examples/test.ascii
 share/rlab/examples/test.b
 share/rlab/examples/test.getline