Allow use of pgraf. Executable script is now `rlab' instead of `rlab2'.

Changed man page to reflect this. Fixed some PLIST trouble.

11 files changed, 189 insertions, 157 deletions

diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index 2a07092f646..32b8acca132 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/31 07:30:25 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/01 04:44:49 jtb Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -7,8 +7,8 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rlab/}
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://rlab.sourceforge.net/
 
-DEPENDS+=		boehm-gc-[0-9]*:../../devel/boehm-gc
-DEPENDS+=		readline-[0-9]*:../../devel/readline
+DEPENDS+=		boehm-gc>=5.3:../../devel/boehm-gc
+DEPENDS+=		readline>=4.0:../../devel/readline
 BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 
 GNU_CONFIGURE=		YES
@@ -17,6 +17,8 @@ USE_FORTRAN=		YES
 EVAL_PREFIX+=		GC_PREFIX=boehm-gc
 CONFIGURE_ARGS+=	"--with-GC=${GC_PREFIX}"
 
+PLIST_SRC=		${PKGDIR}/PLIST
+
 .include "../../mk/bsd.prefs.mk"
 
 RLAB_PLOT_PKG?=		gnuplot
@@ -31,13 +33,26 @@ PLIST_SRC+=		${PKGDIR}/PLIST.plplot
 DEPENDS+=		plotmtv-[0-9]*:../../graphics/plotmtv
 CONFIGURE_ARGS+=	"--with-plotmtv=yes"
 PLIST_SRC+=		${PKGDIR}/PLIST.plotmtv
+.elif (${RLAB_PLOT_PKG} == "pgraf")
+DEPENDS+=		pgraf-[0-9]*:../../graphics/pgraf
+EVAL_PREFIX+=		PGRAF_PREFIX=pgraf
+CONFIGURE_ARGS+=	"--with-pgraf=yes"
+PLIST_SRC+=		${PKGDIR}/PLIST.pgraf
 .else
-DEPENDS+=		gnuplot-[0-9]*:../../graphics/gnuplot
+DEPENDS+=		gnuplot>=3.5:../../graphics/gnuplot
 CONFIGURE_ARGS+=	"--with-gnuplot=yes"
 PLIST_SRC+=		${PKGDIR}/PLIST.gnuplot
 .endif
 
 pre-configure:
-		(cd ${WRKSRC} && autoconf)
+	(cd ${WRKSRC} && autoconf)
+
+post-install:
+.if (${RLAB_PLOT_PKG} == "pgraf")
+	${INSTALL_DATA} ${PGRAF_PREFIX}/share/examples/pgraf/pgraf.r \
+	${PREFIX}/share/rlab/rlib
+	${INSTALL_DATA} ${PGRAF_PREFIX}/share/examples/pgraf/pgdemo.r \
+	${PREFIX}/share/rlab/examples
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/rlab/files/patch-sum b/math/rlab/files/patch-sum
index f0352f88722..0c0bb7183da 100644
--- a/math/rlab/files/patch-sum
+++ b/math/rlab/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.3 2001/01/31 12:42:14 jtb Exp $
+$NetBSD: patch-sum,v 1.4 2001/02/01 04:44:51 jtb Exp $
 
-MD5 (patch-aa) = f225294d6dc4497a80cc86e8bb14118a
-MD5 (patch-ab) = a3515b3294002d9c64036b99e2d84baf
+MD5 (patch-aa) = 49374d56870f3b295f38659815e849ac
+MD5 (patch-ab) = 455d8b083647b1fb3528ed3ccaffb66d
 MD5 (patch-ac) = 311a53e109284cf0878c3e1c5c356c84
 MD5 (patch-ad) = db68aaf5d236bcf94ba637a4220c93ba
 MD5 (patch-ae) = 2c8e104b50840bb85f861d1fe26f488b
@@ -10,5 +10,6 @@ MD5 (patch-ag) = 8693d533154453f51fdd84a1d413941c
 MD5 (patch-ah) = 85123f7460802e5bf85e5b0cd881bced
 MD5 (patch-ai) = c8cba113e462f245947e05c26837f87a
 MD5 (patch-aj) = 8203f0159d1d109511f7eb550b9a35aa
-MD5 (patch-ak) = bbcd9bfa4f209c64eb81d87850d2972f
+MD5 (patch-ak) = 07da61dfedbd4a55f8f26687e2fb3312
 MD5 (patch-al) = 899cd22615301759babfcca922c86159
+MD5 (patch-am) = c6090cacd80c2ce76d0513fe93c342c9
diff --git a/math/rlab/patches/patch-aa b/math/rlab/patches/patch-aa
index 004e0432059..128989f4e04 100644
--- a/math/rlab/patches/patch-aa
+++ b/math/rlab/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2001/01/31 12:42:14 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/01 04:44:51 jtb Exp $
 
 --- configure.in.orig	Fri Dec 17 16:01:06 1999
 +++ configure.in
@@ -47,7 +47,17 @@ $NetBSD: patch-aa,v 1.2 2001/01/31 12:42:14 jtb Exp $
  fi
  
  X11LIB="$xlibdir -lX11"
-@@ -561,6 +561,16 @@
+@@ -551,16 +551,20 @@
+   PLOT_PROG="gnuplot"
+ ])
+ 
+-[
+-if test -n "$PLOT_PROG" ; then
+-  ] AC_CHECK_PROG(PLOT_PROG, gnuplot, gnuplot, nothing) [
+-fi
+-]
+-
+ dnl ------------------------------------------------------------------
  dnl Check for specification of Plplot directory root
  dnl
  
@@ -64,7 +74,7 @@ $NetBSD: patch-aa,v 1.2 2001/01/31 12:42:14 jtb Exp $
  AC_ARG_WITH(plplot, [   --with-plplot           use Plplot],
  [
    if test -n "$PLOT_PROG" ; then
-@@ -572,11 +582,12 @@
+@@ -572,11 +576,12 @@
      exit 1;
    fi
  
@@ -80,7 +90,33 @@ $NetBSD: patch-aa,v 1.2 2001/01/31 12:42:14 jtb Exp $
  ])
  
  dnl ------------------------------------------------------------------
-@@ -648,14 +659,13 @@
+@@ -593,12 +598,6 @@
+   PLOT_PROG="plotmtv"
+ ])
+ 
+-[
+-if test "$PLOT_PROG" = "plotmtv" ; then
+-  ] AC_CHECK_PROG(PLOT_PROG, plotmtv, plotmtv, nothing) [
+-fi
+-]
+-
+ dnl ------------------------------------------------------------------
+ dnl Use the Pgraf interface.
+ dnl
+@@ -613,12 +612,6 @@
+   PLOT_PROG="pgraf"
+ ])
+ 
+-[
+-if test "$PLOT_PROG" = "pgraf" ; then
+-  ] AC_CHECK_PROG(PLOT_PROG, pgraf, pgraf, nothing) [
+-fi
+-]
+-
+ dnl ------------------------------------------------------------------
+ dnl Check for specification of PGplot directory root
+ dnl
+@@ -648,14 +641,13 @@
  dnl then setup for GC. The default action (nothing is specified) is to
  dnl configure for GC.
  
@@ -102,7 +138,7 @@ $NetBSD: patch-aa,v 1.2 2001/01/31 12:42:14 jtb Exp $
  dnl ------------------------------------------------------------------
  
  AC_TRY_LINK([#include <stdio.h>],
-@@ -738,6 +748,7 @@
+@@ -738,6 +730,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 0faafa28ff4..0fb394bb7ad 100644
--- a/math/rlab/patches/patch-ab
+++ b/math/rlab/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/02/01 04:44:51 jtb Exp $
 
 --- Makefile.in.orig	Fri Apr 30 14:32:04 1999
 +++ Makefile.in
@@ -23,6 +23,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 jtb Exp $
  
  Ranlib = ./flibs/ranlib/src/libranlib.a
  RANLIB_LIB  = -L./flibs/ranlib/src -lranlib
+@@ -157,7 +157,7 @@
+ prefix =        @prefix@
+ exec_prefix =   @exec_prefix@
+ bindir = 	$(exec_prefix)/bin
+-libdir =        $(exec_prefix)/lib
++libdir =        $(exec_prefix)/share
+ mand =		$(exec_prefix)/man
+ mandir = 	$(exec_prefix)/man/man1
+ buildir =       @BUILD_DIR@
 @@ -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)
@@ -57,49 +66,49 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 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) $(prefix)/share/rlab
-+		$(BSD_INSTALL_DATA) $(buildir)/.rlab $(prefix)/share/rlab
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/rlab/rlib
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab
++		$(BSD_INSTALL_DATA) $(buildir)/.rlab $(libdir)/rlab
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/rlib
 +		@for f in $(buildir)/rlib/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/rlib/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/rlib/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/rlab/toolbox
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/toolbox
 +		@for f in $(buildir)/toolbox/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/toolbox/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/toolbox/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/rlab/controls-toolbox
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/controls-toolbox
 +		@for f in $(buildir)/controls-toolbox/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/controls-toolbox/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/controls-toolbox/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/rlab/help
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/help
 +		@for f in $(buildir)/doc/help/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/rlab/examples
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/rlab/examples
 +		@for f in $(buildir)/examples/* $(buildir)/test.*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/examples/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/examples/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/rlab
-+		$(BSD_INSTALL_DATA) $(buildir)/doc/rlab-ref.ps $(prefix)/share/doc/rlab
++		$(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 $(prefix)/share/doc/rlab/"; \
++			i="$(BSD_INSTALL_DATA) $(buildir)/$$f $(libdir)/doc/rlab/"; \
 +			echo $$i; $$i; \
 +		done
-+		$(BSD_INSTALL_DATA_DIR) $(prefix)/share/doc/html/rlab
++		$(BSD_INSTALL_DATA_DIR) $(libdir)/doc/html/rlab
 +		@for f in $(buildir)/doc/html/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/doc/html/rlab/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/doc/html/rlab/"; \
 +			echo $$i; $$i; \
 +		done
 +		if test "$(PLOT_PROG)" = "plplot" ; then \
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(prefix)/share/rlab/rlib/plot.r;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/plplot.r $(libdir)/rlab/rlib/plot.r;\
 +		  for f in $(buildir)/misc/plhelp/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
 +			echo $$i; $$i; \
 +		  done \
  		fi
@@ -107,10 +116,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 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 $(prefix)/share/rlab/rlib/plot.r;\
-+		  $(BSD_INSTALL_DATA) $(buildir)/misc/gp-compat.r $(prefix)/share/rlab/rlib/gp-compat.r;\
++		  $(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;\
 +		  for f in $(buildir)/misc/gnuplothelp/*; do \
-+			i="$(BSD_INSTALL_DATA) $$f $(prefix)/share/rlab/help/"; \
++			i="$(BSD_INSTALL_DATA) $$f $(libdir)/rlab/help/"; \
 +			echo $$i; $$i; \
 +		  done \
  		fi
@@ -120,13 +129,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 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 $(prefix)/share/rlab/rlib/;\
++		  $(BSD_INSTALL_DATA) $(buildir)/misc/plotmtv.r $(libdir)/rlab/rlib/;\
  		fi
 +		$(BSD_INSTALL_PROGRAM) $(buildir)/rlab $(bindir)/rlab-$(VER)
  		sed 's@rlab_exec_prefix@$(exec_prefix)@' ./misc/rlab > ./misc/rlab.tmp.0
  		sed 's@rlab_ver_string@$(VER)@' ./misc/rlab.tmp.0 > ./misc/rlab.tmp.1
  		sed 's@plot_dir@$(PLOT_DIR)@' ./misc/rlab.tmp.1 > ./misc/rlab.tmp.2
- 		sed 's@plot_prog@$(PLOT_PROG)@' ./misc/rlab.tmp.2 > ./misc/rlab2
+-		sed 's@plot_prog@$(PLOT_PROG)@' ./misc/rlab.tmp.2 > ./misc/rlab2
++		sed 's@plot_prog@$(PLOT_PROG)@' ./misc/rlab.tmp.2 > ./misc/rlab
  		rm -f ./misc/rlab.tmp.0 ./misc/rlab.tmp.1 ./misc/rlab.tmp.2
 -		$(INSTALL_PROGRAM) ./misc/rlab2 $(bindir)/rlab2
 -		if test "$(LN)" = "ln" ; then\
@@ -144,8 +154,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/31 07:30:37 jtb Exp $
 -		-mkdir $(exec_prefix) $(bindir) $(libdir) $(mand) \
 -			$(mandir) $(TOPDIR) $(RLIBDIR) $(DOCDIR) \
 -			$(RHELPDIR) $(TOOLBOX) $(CTOOLBOX)
-+		$(BSD_INSTALL_SCRIPT) $(buildir)/misc/rlab2 $(bindir)/rlab2
-+		$(BSD_INSTALL_MAN) $(buildir)/doc/rlab2.1 $(mandir)
++		$(BSD_INSTALL_SCRIPT) $(buildir)/misc/rlab $(bindir)
++		$(BSD_INSTALL_MAN) $(buildir)/doc/rlab2.1 $(mandir)/rlab.1
  
  FRC:		
  
diff --git a/math/rlab/patches/patch-ak b/math/rlab/patches/patch-ak
index 7c51b397673..708398cd9b4 100644
--- a/math/rlab/patches/patch-ak
+++ b/math/rlab/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/01/31 07:30:55 jtb Exp $
+$NetBSD: patch-ak,v 1.2 2001/02/01 04:44:51 jtb Exp $
 
---- misc/rlab~	Wed Apr 21 14:02:13 1999
+--- misc/rlab.orig	Wed Apr 21 14:02:13 1999
 +++ misc/rlab
 @@ -21,7 +21,7 @@
  # (unless you are sure of what you are doing).
@@ -11,12 +11,3 @@ $NetBSD: patch-ak,v 1.1.1.1 2001/01/31 07:30:55 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/patches/patch-am b/math/rlab/patches/patch-am
new file mode 100644
index 00000000000..eb50dfd3499
--- /dev/null
+++ b/math/rlab/patches/patch-am
@@ -0,0 +1,41 @@
+$NetBSD: patch-am,v 1.1 2001/02/01 04:44:51 jtb Exp $
+
+--- doc/rlab2.1.orig	Wed May 28 23:29:07 1997
++++ doc/rlab2.1
+@@ -1,22 +1,22 @@
+-.TH RLAB2 1  "16 May 1997" "Version 2.0" "USER COMMANDS"
++.TH RLAB 1  "16 May 1997" "Version 2.0" "USER COMMANDS"
+ .\" strings
+ .ds ex \fIexpr\fR
+ .SH NAME
+-rlab2 \- matrix oriented, interactive programming environment
++rlab \- matrix oriented, interactive programming environment
+ 
+ .SH SYNOPSIS
+-.B rlab2
++.B rlab
+ [\-\fBVdhlmnpqr]
+ [file(s)]
+ [\-]
+ .SH DESCRIPTION
+-.B rlab2
++.B rlab
+ is an interpreter for the RLaB Programming Language/Environment. 
+ The RLaB language is useful for matrix or array oriented numerical
+ analyses. RLaB is especially useful for prototyping and experimenting 
+ with algorithms.
+ 
+-.B rlab2
++.B rlab
+ also provides a convenient
+ interface to many of the LAPACK,
+ FFTPACK, and RANLIB subroutines. 
+@@ -66,7 +66,7 @@
+ 
+ .SH ENVIRONMENT
+ 
+-.B rlab2
++.B rlab
+ checks the values of several environment variables upon
+ startup, and uses them to overide the compiled in defaults. If a
+ particular environment variable has not been set, the default value is
diff --git a/math/rlab/pkg/PLIST b/math/rlab/pkg/PLIST
index c051056cfbe..a1de9ed86b7 100644
--- a/math/rlab/pkg/PLIST
+++ b/math/rlab/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/31 07:30:30 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/01 04:44:51 jtb Exp $
 bin/${PKGNAME}
-bin/rlab2
-man/man1/rlab2.1
+bin/rlab
+man/man1/rlab.1
 share/doc/html/rlab/ls.gif
 share/doc/html/rlab/rlab-ref-1.html
 share/doc/html/rlab/rlab-ref-2.html
@@ -275,9 +275,6 @@ share/rlab/help/any
 share/rlab/help/asin
 share/rlab/help/atan
 share/rlab/help/atan2
-share/rlab/help/autoscale
-share/rlab/help/autotics
-share/rlab/help/axis
 share/rlab/help/backsub
 share/rlab/help/balance
 share/rlab/help/ceil
@@ -287,19 +284,15 @@ share/rlab/help/clear
 share/rlab/help/close
 share/rlab/help/conditions
 share/rlab/help/conj
-share/rlab/help/cont
-share/rlab/help/copyplot
 share/rlab/help/cos
 share/rlab/help/cumprod
 share/rlab/help/cumsum
-share/rlab/help/defplotwin
 share/rlab/help/det
 share/rlab/help/diag
 share/rlab/help/diary
 share/rlab/help/dlopen
 share/rlab/help/eig
 share/rlab/help/entinfo
-share/rlab/help/epsplot
 share/rlab/help/error
 share/rlab/help/eval
 share/rlab/help/exist
@@ -319,11 +312,8 @@ share/rlab/help/full
 share/rlab/help/fwrite
 share/rlab/help/getenv
 share/rlab/help/getline
-share/rlab/help/gnuplot
-share/rlab/help/grid
 share/rlab/help/help
 share/rlab/help/hess
-share/rlab/help/hist
 share/rlab/help/ifft
 share/rlab/help/imag
 share/rlab/help/inf
@@ -331,19 +321,12 @@ share/rlab/help/int
 share/rlab/help/isinf
 share/rlab/help/isnan
 share/rlab/help/issymm
-share/rlab/help/key
-share/rlab/help/label
-share/rlab/help/latexplot
 share/rlab/help/ldexp
 share/rlab/help/length
-share/rlab/help/linenumbers
-share/rlab/help/linestyle
 share/rlab/help/load
 share/rlab/help/log
 share/rlab/help/log10
 share/rlab/help/logb
-share/rlab/help/loglog
-share/rlab/help/loglog2
 share/rlab/help/max
 share/rlab/help/maxi
 share/rlab/help/members
@@ -351,80 +334,26 @@ share/rlab/help/min
 share/rlab/help/mini
 share/rlab/help/mnorm
 share/rlab/help/mod
-share/rlab/help/multiplot
-share/rlab/help/mx2tics
-share/rlab/help/mxtics
-share/rlab/help/my2tics
-share/rlab/help/mytics
-share/rlab/help/mztics
 share/rlab/help/nan
 share/rlab/help/nlleastsq
-share/rlab/help/noautoscale
-share/rlab/help/noaxis
-share/rlab/help/nogrid
-share/rlab/help/nokey
-share/rlab/help/nolabel
-share/rlab/help/nolog
-share/rlab/help/nolog2
-share/rlab/help/nomultiplot
-share/rlab/help/nomx2tics
-share/rlab/help/nomxtics
-share/rlab/help/nomy2tics
-share/rlab/help/nomytics
-share/rlab/help/nomztics
-share/rlab/help/notime
-share/rlab/help/notitle
-share/rlab/help/nox2tics
-share/rlab/help/noxtics
-share/rlab/help/noy2tics
-share/rlab/help/noytics
-share/rlab/help/noztics
 share/rlab/help/ode
 share/rlab/help/ones
 share/rlab/help/open
-share/rlab/help/origin
-share/rlab/help/pclose
-share/rlab/help/pcloseall
-share/rlab/help/pend
-share/rlab/help/pformat
-share/rlab/help/phelp
-share/rlab/help/plot
-share/rlab/help/plot2
-share/rlab/help/pobj_list
-share/rlab/help/pointsize
 share/rlab/help/printf
-share/rlab/help/printplot
 share/rlab/help/prod
-share/rlab/help/psave
-share/rlab/help/psize
-share/rlab/help/psplot
-share/rlab/help/pssave
-share/rlab/help/pstring
 share/rlab/help/putenv
-share/rlab/help/pview
 share/rlab/help/qr
 share/rlab/help/quit
 share/rlab/help/rand
-share/rlab/help/range
-share/rlab/help/range2
 share/rlab/help/rcond
 share/rlab/help/read
 share/rlab/help/readm
 share/rlab/help/real
-share/rlab/help/replot
-share/rlab/help/replot2
 share/rlab/help/require
 share/rlab/help/reshape
 share/rlab/help/rfile
 share/rlab/help/round
 share/rlab/help/schur
-share/rlab/help/semilogx
-share/rlab/help/semilogx2
-share/rlab/help/semilogy
-share/rlab/help/semilogy2
-share/rlab/help/setterm
-share/rlab/help/showplot
-share/rlab/help/showpwin
 share/rlab/help/sign
 share/rlab/help/sin
 share/rlab/help/size
@@ -435,7 +364,6 @@ share/rlab/help/sort
 share/rlab/help/sparse
 share/rlab/help/spconvert
 share/rlab/help/spfactor
-share/rlab/help/splot
 share/rlab/help/sprintf
 share/rlab/help/spsolve
 share/rlab/help/spwrite
@@ -450,8 +378,6 @@ share/rlab/help/sylv
 share/rlab/help/system
 share/rlab/help/tan
 share/rlab/help/tic
-share/rlab/help/time
-share/rlab/help/title
 share/rlab/help/tmpnam
 share/rlab/help/toc
 share/rlab/help/type
@@ -459,22 +385,7 @@ share/rlab/help/vpnorm
 share/rlab/help/warranty
 share/rlab/help/write
 share/rlab/help/writem
-share/rlab/help/x2label
-share/rlab/help/x2range
-share/rlab/help/x2tics
-share/rlab/help/xlabel
-share/rlab/help/xrange
-share/rlab/help/xtics
-share/rlab/help/y2label
-share/rlab/help/y2range
-share/rlab/help/y2tics
-share/rlab/help/ylabel
-share/rlab/help/yrange
-share/rlab/help/ytics
 share/rlab/help/zeros
-share/rlab/help/zlabel
-share/rlab/help/zrange
-share/rlab/help/ztics
 share/rlab/rlib/clearall.r
 share/rlab/rlib/compan.r
 share/rlab/rlib/complement.r
@@ -484,7 +395,6 @@ share/rlab/rlib/disp.r
 share/rlab/rlib/dot.r
 share/rlab/rlib/eye.r
 share/rlab/rlib/fix.r
-share/rlab/rlib/gp-compat.r
 share/rlab/rlib/input.r
 share/rlab/rlib/intersection.r
 share/rlab/rlib/inv.r
@@ -497,7 +407,6 @@ share/rlab/rlib/lyap.r
 share/rlab/rlib/norm.r
 share/rlab/rlib/num2str.r
 share/rlab/rlib/pause.r
-share/rlab/rlib/plot.r
 share/rlab/rlib/poly.r
 share/rlab/rlib/rem.r
 share/rlab/rlib/save.r
@@ -580,11 +489,3 @@ share/rlab/toolbox/trapz.r
 share/rlab/toolbox/window.r
 share/rlab/toolbox/writeltx.r
 share/rlab/toolbox/zodiac.r
-@dirrm share/rlab/toolbox
-@dirrm share/rlab/rlib
-@dirrm share/rlab/help
-@dirrm share/rlab/examples
-@dirrm share/rlab/controls-toolbox
-@dirrm share/doc/html/rlab
-@dirrm share/doc/rlab
-@dirrm share/rlab
diff --git a/math/rlab/pkg/PLIST.gnuplot b/math/rlab/pkg/PLIST.gnuplot
index d69d0c8c866..d3803a930ec 100644
--- a/math/rlab/pkg/PLIST.gnuplot
+++ b/math/rlab/pkg/PLIST.gnuplot
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gnuplot,v 1.1.1.1 2001/01/31 07:30:31 jtb Exp $
+@comment $NetBSD: PLIST.gnuplot,v 1.2 2001/02/01 04:44:51 jtb Exp $
 share/rlab/help/autoscale
 share/rlab/help/autotics
 share/rlab/help/axis
@@ -89,3 +89,12 @@ share/rlab/help/zlabel
 share/rlab/help/zrange
 share/rlab/help/ztics
 share/rlab/rlib/gp-compat.r
+share/rlab/rlib/plot.r
+@dirrm share/rlab/toolbox
+@dirrm share/rlab/rlib
+@dirrm share/rlab/help
+@dirrm share/rlab/examples
+@dirrm share/rlab/controls-toolbox
+@dirrm share/doc/html/rlab
+@dirrm share/doc/rlab
+@dirrm share/rlab
diff --git a/math/rlab/pkg/PLIST.pgraf b/math/rlab/pkg/PLIST.pgraf
new file mode 100644
index 00000000000..567f8b28ced
--- /dev/null
+++ b/math/rlab/pkg/PLIST.pgraf
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.pgraf,v 1.1 2001/02/01 04:44:51 jtb Exp $
+share/rlab/rlib/pgraf.r
+share/rlab/examples/pgdemo.r
+@dirrm share/rlab/toolbox
+@dirrm share/rlab/rlib
+@dirrm share/rlab/help
+@dirrm share/rlab/examples
+@dirrm share/rlab/controls-toolbox
+@dirrm share/doc/html/rlab
+@dirrm share/doc/rlab
+@dirrm share/rlab
diff --git a/math/rlab/pkg/PLIST.plotmtv b/math/rlab/pkg/PLIST.plotmtv
index bf9e1e8ff5c..6bc8c4637b7 100644
--- a/math/rlab/pkg/PLIST.plotmtv
+++ b/math/rlab/pkg/PLIST.plotmtv
@@ -1,2 +1,10 @@
-@comment $NetBSD: PLIST.plotmtv,v 1.1.1.1 2001/01/31 07:30:31 jtb Exp $
+@comment $NetBSD: PLIST.plotmtv,v 1.2 2001/02/01 04:44:52 jtb Exp $
 share/rlab/rlib/plotmtv.r
+@dirrm share/rlab/toolbox
+@dirrm share/rlab/rlib
+@dirrm share/rlab/help
+@dirrm share/rlab/examples
+@dirrm share/rlab/controls-toolbox
+@dirrm share/doc/html/rlab
+@dirrm share/doc/rlab
+@dirrm share/rlab
diff --git a/math/rlab/pkg/PLIST.plplot b/math/rlab/pkg/PLIST.plplot
index 4dd0ebfc893..cbf2ed19138 100644
--- a/math/rlab/pkg/PLIST.plplot
+++ b/math/rlab/pkg/PLIST.plplot
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.plplot,v 1.1.1.1 2001/01/31 07:30:31 jtb Exp $
+@comment $NetBSD: PLIST.plplot,v 1.2 2001/02/01 04:44:52 jtb Exp $
 share/rlab/help/getplot
 share/rlab/help/pl3d
 share/rlab/help/plalt
@@ -45,3 +45,12 @@ share/rlab/help/subplot
 share/rlab/help/xlabel
 share/rlab/help/ylabel
 share/rlab/help/zlabel
+share/rlab/rlib/plot.r
+@dirrm share/rlab/toolbox
+@dirrm share/rlab/rlib
+@dirrm share/rlab/help
+@dirrm share/rlab/examples
+@dirrm share/rlab/controls-toolbox
+@dirrm share/doc/html/rlab
+@dirrm share/doc/rlab
+@dirrm share/rlab