Update to version 1.5.12.

Changes:

* The directory structure and configuration scripts have completely changed

* RGB colors supported for color= keyword, pli, plf, plfp
   see help,color or help,pli for more information

* lsdir, mkdir, rmdir functions added so yorick can read and
   manipulate directories by itself

* i86_primitives and other modern binary formats added
   see help,createb and help,__i86 for more information

* cheby.i, convol.i, dawson.i, kepler.i added to interpreted
   library

* added "hex" 3D transport solver (similar to drat 2D solver)

* improved the emacs/yorick.el package again, mostly by removing
   unwanted "improvements" to emacs; see emacs/README

7 files changed, 211 insertions, 208 deletions

diff --git a/math/yorick/DESCR b/math/yorick/DESCR
index 4d71a51d1ed..a29bb95c92e 100644
--- a/math/yorick/DESCR
+++ b/math/yorick/DESCR
@@ -12,5 +12,3 @@ A library of functions written in the Yorick language, including
 Bessel, gamma, and related functions, multiple key sorting, spline,
 rational function, and least squares fitting, and routines to read and
 write netCDF files. 
-
-NetBSD port by John P. Refling <refling@comet.lbl.gov>
diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 87b5234cf91..59b341b4e9d 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,20 +1,36 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:22:50 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2003/04/29 22:41:44 jtb Exp $
 
-DISTNAME=	yorick-1.4
+DISTNAME=	yorick-1.5.12
 CATEGORIES=	math
 MASTER_SITES=   ftp://ftp-icf.llnl.gov/pub/Yorick/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	refling@comet.lbl.gov
-HOMEPAGE=	ftp://ftp-icf.llnl.gov/pub/Yorick/yorick-ad.html
+HOMEPAGE=	ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html
 COMMENT=	Numerical algebra system (similar to Matlab)
 
-GNU_CONFIGURE=  YES
-USE_X11=        YES
+WRKSRC=		${WRKDIR}/yorick-1.5
+
+USE_X11=        yes
+
+INFO_FILES=	yorick.info
+
+post-patch:
+	for f in ${WRKSRC}/ysite.sh; do				\
+	${SED} -e 's:@PREFIX@:${PREFIX}:g' $$f > $$f.tmp	\
+	&& ${MV} $$f.tmp $$f;					\
+	done
 
 post-install:
-	cd ${WRKSRC} && ${INSTALL_MAN} yorick.1 ${PREFIX}/man/man1
-	cd ${WRKSRC} && ${INSTALL_MAN} gist.1 ${PREFIX}/man/man1
-	cd ${WRKSRC}/Yorick && ${PREFIX}/bin/yorick -batch check.i
+	for f in yorick gist; do \
+	cd ${PREFIX}/bin && ${LN} -sf ../lib/yorick/1.5/bin/$$f $$f; \
+	done
+	cd ${WRKSRC}/doc && ${MAKE} all
+	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/info
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
+	cd ${PREFIX}/share/doc && ${LN} -sf ../yorick/1.5/doc yorick
+	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
+	${INSTALL_DATA} ${WRKSRC}/emacs/*.el ${PREFIX}/share/emacs/site-lisp
 
+.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yorick/PLIST b/math/yorick/PLIST
index 43df42f8e4e..f958d176c89 100644
--- a/math/yorick/PLIST
+++ b/math/yorick/PLIST
@@ -1,148 +1,177 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:34:34 zuntum Exp $
-share/yorick/1.4/startup/graph.i
-share/yorick/1.4/startup/stdx.i
-share/yorick/1.4/startup/std.i
-share/yorick/1.4/startup/paths.i
-share/yorick/1.4/startup/matrix.i
-share/yorick/1.4/startup/fft.i
-share/yorick/1.4/startup/drat.i
-share/yorick/1.4/include/basfix.i
-share/yorick/1.4/include/txpath.i
-share/yorick/1.4/include/testp.i
-share/yorick/1.4/include/testm.i
-share/yorick/1.4/include/testlp.i
-share/yorick/1.4/include/testg.i
-share/yorick/1.4/include/testfull.i
-share/yorick/1.4/include/testb.i
-share/yorick/1.4/include/test3.i
-share/yorick/1.4/include/test2.i
-share/yorick/1.4/include/test1.i
-share/yorick/1.4/include/sysafe.i
-share/yorick/1.4/include/style.i
-share/yorick/1.4/include/string.i
-share/yorick/1.4/include/spline.i
-share/yorick/1.4/include/slice3.i
-share/yorick/1.4/include/show.i
-share/yorick/1.4/include/series.i
-share/yorick/1.4/include/roots.i
-share/yorick/1.4/include/romberg.i
-share/yorick/1.4/include/rkutta.i
-share/yorick/1.4/include/rezone.i
-share/yorick/1.4/include/readn.i
-share/yorick/1.4/include/rays.i
-share/yorick/1.4/include/random.i
-share/yorick/1.4/include/prmtyp.i
-share/yorick/1.4/include/pnm.i
-share/yorick/1.4/include/prefix.i
-share/yorick/1.4/include/plwf.i
-share/yorick/1.4/include/plclab.i
-share/yorick/1.4/include/pl3d.i
-share/yorick/1.4/include/pixels.i
-share/yorick/1.4/include/netcdf.i
-share/yorick/1.4/include/multi.i
-share/yorick/1.4/include/msort.i
-share/yorick/1.4/include/movie.i
-share/yorick/1.4/include/mkdoc.i
-share/yorick/1.4/include/make.i
-share/yorick/1.4/include/legndr.i
-share/yorick/1.4/include/legal.i
-share/yorick/1.4/include/gcd.i
-share/yorick/1.4/include/gamma.i
-share/yorick/1.4/include/fits.i
-share/yorick/1.4/include/fitrat.i
-share/yorick/1.4/include/fitlsq.i
-share/yorick/1.4/include/ellipse.i
-share/yorick/1.4/include/digit2.i
-share/yorick/1.4/include/demo5.i
-share/yorick/1.4/include/demo4.i
-share/yorick/1.4/include/demo3.i
-share/yorick/1.4/include/demo2.i
-share/yorick/1.4/include/demo1.i
-share/yorick/1.4/include/custom.i
-share/yorick/1.4/include/copyb.i
-share/yorick/1.4/include/color.i
-share/yorick/1.4/include/collec.i
-share/yorick/1.4/include/button.i
-share/yorick/1.4/include/bowtie.i
-share/yorick/1.4/include/bessel.i
-share/yorick/1.4/include/zroots.i
-share/yorick/1.4/include/README
-share/yorick/1.4/gist/axes.gs
-share/yorick/1.4/gist/yarg.gp
-share/yorick/1.4/gist/stern.gp
-share/yorick/1.4/gist/rainbow.gp
-share/yorick/1.4/gist/ncar.gp
-share/yorick/1.4/gist/heat.gp
-share/yorick/1.4/gist/gray.gp
-share/yorick/1.4/gist/earth.gp
-share/yorick/1.4/gist/work2.gs
-share/yorick/1.4/gist/work.gs
-share/yorick/1.4/gist/vgbox.gs
-share/yorick/1.4/gist/vg.gs
-share/yorick/1.4/gist/nobox.gs
-share/yorick/1.4/gist/l_nobox.gs
-share/yorick/1.4/gist/boxed2.gs
-share/yorick/1.4/gist/boxed.gs
-share/yorick/1.4/gist/ps.ps
-share/yorick/1.4/doc/FILE_FORMATS
-share/yorick/1.4/doc/yorick.ps
-share/yorick/1.4/doc/texinfo.tex
-share/yorick/1.4/doc/std.doc
-share/yorick/1.4/doc/refs.tex
-share/yorick/1.4/doc/refs.ps
-share/yorick/1.4/doc/math.doc
-share/yorick/1.4/doc/library.doc
-share/yorick/1.4/doc/graph.doc
-share/yorick/1.4/doc/drat.doc
-share/yorick/1.4/doc/README
-share/yorick/1.4/doc/yorick.tex
 bin/gist
 bin/yorick
-lib/yorick/1.4/lib/libgist.a
-lib/yorick/1.4/lib/main.o
-lib/yorick/1.4/lib/codger
-lib/yorick/1.4/lib/libyor.a
-lib/yorick/1.4/lib/libyorm.a
-lib/yorick/1.4/lib/libdrat.a
-lib/yorick/1.4/h/cgm.h
-lib/yorick/1.4/h/xfont.h
-lib/yorick/1.4/h/xfancy.h
-lib/yorick/1.4/h/xbasic.h
-lib/yorick/1.4/h/ps.h
-lib/yorick/1.4/h/osys.h
-lib/yorick/1.4/h/hlevel.h
-lib/yorick/1.4/h/gtext.h
-lib/yorick/1.4/h/gist.h
-lib/yorick/1.4/h/engine.h
-lib/yorick/1.4/h/draw.h
-lib/yorick/1.4/h/dispax.h
-lib/yorick/1.4/h/dispat.h
-lib/yorick/1.4/h/dispas.h
-lib/yorick/1.4/h/clip.h
-lib/yorick/1.4/h/xicky.h
-lib/yorick/1.4/h/bcast.h
-lib/yorick/1.4/h/yio.h
-lib/yorick/1.4/h/ydata.h
-lib/yorick/1.4/h/yasync.h
-lib/yorick/1.4/h/sysdep.h
-lib/yorick/1.4/h/prmtyp.h
-lib/yorick/1.4/h/parse.h
-lib/yorick/1.4/h/hash.h
-lib/yorick/1.4/h/defstr.h
-lib/yorick/1.4/h/defmem.h
-lib/yorick/1.4/h/binio.h
-lib/yorick/1.4/h/main.c
-lib/yorick/1.4/Maketmpl
-lib/yorick/1.4/Make-cxx
-man/man1/yorick.1
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/yorick.info
+info/yorick.info
+info/yorick.info-1
+info/yorick.info-2
+info/yorick.info-3
+info/yorick.info-4
+info/yorick.info-5
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/yorick.info
 man/man1/gist.1
-@dirrm share/yorick/1.4/startup
-@dirrm share/yorick/1.4/include
-@dirrm share/yorick/1.4/gist
-@dirrm share/yorick/1.4/doc
-@dirrm share/yorick/1.4
+man/man1/yorick.1
+lib/yorick/1.5/Make.cfg
+lib/yorick/1.5/Maketmpl
+lib/yorick/1.5/bin/gist
+lib/yorick/1.5/bin/yorick
+lib/yorick/1.5/include/bcast.h
+lib/yorick/1.5/include/binio.h
+lib/yorick/1.5/include/cgm.h
+lib/yorick/1.5/include/cgmin.h
+lib/yorick/1.5/include/clip.h
+lib/yorick/1.5/include/config.h
+lib/yorick/1.5/include/defmem.h
+lib/yorick/1.5/include/draw.h
+lib/yorick/1.5/include/engine.h
+lib/yorick/1.5/include/eps.h
+lib/yorick/1.5/include/extern_c.h
+lib/yorick/1.5/include/gist.h
+lib/yorick/1.5/include/gtext.h
+lib/yorick/1.5/include/hash.h
+lib/yorick/1.5/include/hlevel.h
+lib/yorick/1.5/include/parse.h
+lib/yorick/1.5/include/phash.h
+lib/yorick/1.5/include/play.h
+lib/yorick/1.5/include/prmtyp.h
+lib/yorick/1.5/include/ps.h
+lib/yorick/1.5/include/pstdio.h
+lib/yorick/1.5/include/pstdlib.h
+lib/yorick/1.5/include/xbasic.h
+lib/yorick/1.5/include/xfancy.h
+lib/yorick/1.5/include/yasync.h
+lib/yorick/1.5/include/ydata.h
+lib/yorick/1.5/include/yio.h
+lib/yorick/1.5/include/yversion.h
+lib/yorick/1.5/lib/codger
+lib/yorick/1.5/lib/libdrat.a
+lib/yorick/1.5/lib/libhex.a
+lib/yorick/1.5/lib/libyor.a
+lib/yorick/1.5/lib/main.o
+share/doc/yorick
+share/emacs/site-lisp/yorick-auto.el
+share/emacs/site-lisp/yorick.el
+share/yorick/1.5/doc/FILE_FORMATS
+share/yorick/1.5/doc/README
+share/yorick/1.5/doc/doc
+share/yorick/1.5/doc/drat.doc
+share/yorick/1.5/doc/drat.tex
+share/yorick/1.5/doc/graph.doc
+share/yorick/1.5/doc/hex.doc
+share/yorick/1.5/doc/library.doc
+share/yorick/1.5/doc/math.doc
+share/yorick/1.5/doc/refs.pdf
+share/yorick/1.5/doc/refs.ps
+share/yorick/1.5/doc/refs.tex
+share/yorick/1.5/doc/std.doc
+share/yorick/1.5/doc/yorick.pdf
+share/yorick/1.5/doc/yorick.ps
+share/yorick/1.5/doc/yorick.tex
+share/yorick/1.5/g/README
+share/yorick/1.5/g/axes.gs
+share/yorick/1.5/g/boxed.gs
+share/yorick/1.5/g/boxed2.gs
+share/yorick/1.5/g/earth.gp
+share/yorick/1.5/g/gray.gp
+share/yorick/1.5/g/heat.gp
+share/yorick/1.5/g/l_nobox.gs
+share/yorick/1.5/g/ncar.gp
+share/yorick/1.5/g/nobox.gs
+share/yorick/1.5/g/ps.ps
+share/yorick/1.5/g/rainbow.gp
+share/yorick/1.5/g/stern.gp
+share/yorick/1.5/g/vg.gs
+share/yorick/1.5/g/vgbox.gs
+share/yorick/1.5/g/work.gs
+share/yorick/1.5/g/work2.gs
+share/yorick/1.5/g/yarg.gp
+share/yorick/1.5/i/README
+share/yorick/1.5/i/basfix.i
+share/yorick/1.5/i/bessel.i
+share/yorick/1.5/i/bowtie.i
+share/yorick/1.5/i/button.i
+share/yorick/1.5/i/cheby.i
+share/yorick/1.5/i/collec.i
+share/yorick/1.5/i/color.i
+share/yorick/1.5/i/convol.i
+share/yorick/1.5/i/copyb.i
+share/yorick/1.5/i/custom.i
+share/yorick/1.5/i/dawson.i
+share/yorick/1.5/i/demo1.i
+share/yorick/1.5/i/demo2.i
+share/yorick/1.5/i/demo3.i
+share/yorick/1.5/i/demo4.i
+share/yorick/1.5/i/demo5.i
+share/yorick/1.5/i/digit2.i
+share/yorick/1.5/i/ellipse.i
+share/yorick/1.5/i/elliptic.i
+share/yorick/1.5/i/filter.i
+share/yorick/1.5/i/fitlsq.i
+share/yorick/1.5/i/fitrat.i
+share/yorick/1.5/i/fits.i
+share/yorick/1.5/i/gamma.i
+share/yorick/1.5/i/gcd.i
+share/yorick/1.5/i/hydra.i
+share/yorick/1.5/i/kepler.i
+share/yorick/1.5/i/legal.i
+share/yorick/1.5/i/legndr.i
+share/yorick/1.5/i/make.i
+share/yorick/1.5/i/mkdoc.i
+share/yorick/1.5/i/movie.i
+share/yorick/1.5/i/msort.i
+share/yorick/1.5/i/multi.i
+share/yorick/1.5/i/netcdf.i
+share/yorick/1.5/i/pixels.i
+share/yorick/1.5/i/pl3d.i
+share/yorick/1.5/i/plato.i
+share/yorick/1.5/i/plclab.i
+share/yorick/1.5/i/plwf.i
+share/yorick/1.5/i/pnm.i
+share/yorick/1.5/i/prefix.i
+share/yorick/1.5/i/prmtyp.i
+share/yorick/1.5/i/random.i
+share/yorick/1.5/i/rays.i
+share/yorick/1.5/i/readn.i
+share/yorick/1.5/i/rezone.i
+share/yorick/1.5/i/rkutta.i
+share/yorick/1.5/i/romberg.i
+share/yorick/1.5/i/roots.i
+share/yorick/1.5/i/series.i
+share/yorick/1.5/i/show.i
+share/yorick/1.5/i/silo.i
+share/yorick/1.5/i/slice3.i
+share/yorick/1.5/i/spline.i
+share/yorick/1.5/i/string.i
+share/yorick/1.5/i/style.i
+share/yorick/1.5/i/sysafe.i
+share/yorick/1.5/i/test1.i
+share/yorick/1.5/i/test2.i
+share/yorick/1.5/i/test3.i
+share/yorick/1.5/i/testb.i
+share/yorick/1.5/i/testfull.i
+share/yorick/1.5/i/testg.i
+share/yorick/1.5/i/testlp.i
+share/yorick/1.5/i/testm.i
+share/yorick/1.5/i/testp.i
+share/yorick/1.5/i/txpath.i
+share/yorick/1.5/i/ylmdec.i
+share/yorick/1.5/i/zroots.i
+share/yorick/1.5/i0/README
+share/yorick/1.5/i0/drat.i
+share/yorick/1.5/i0/fft.i
+share/yorick/1.5/i0/graph.i
+share/yorick/1.5/i0/hex.i
+share/yorick/1.5/i0/matrix.i
+share/yorick/1.5/i0/paths.i
+share/yorick/1.5/i0/std.i
+share/yorick/1.5/i0/stdx.i
+@dirrm share/yorick/1.5/i0
+@dirrm share/yorick/1.5/i
+@dirrm share/yorick/1.5/g
+@dirrm share/yorick/1.5/doc
+@dirrm share/yorick/1.5
 @dirrm share/yorick
-@dirrm lib/yorick/1.4/lib
-@dirrm lib/yorick/1.4/h
-@dirrm lib/yorick/1.4
+@dirrm lib/yorick/1.5/lib
+@dirrm lib/yorick/1.5/include
+@dirrm lib/yorick/1.5/bin
+@dirrm lib/yorick/1.5
 @dirrm lib/yorick
diff --git a/math/yorick/distinfo b/math/yorick/distinfo
index aeebf9730a9..725f532449b 100644
--- a/math/yorick/distinfo
+++ b/math/yorick/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/01/18 17:32:22 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/04/29 22:41:44 jtb Exp $
 
-SHA1 (yorick-1.4.tar.gz) = 11e2ea5f0b5ac6b08251e4a3f9bb13f2dec22f1d
-Size (yorick-1.4.tar.gz) = 1429179 bytes
-SHA1 (patch-aa) = 0032e1e564603c97779f47be1fae44e64561860d
-SHA1 (patch-ab) = e5563c99ad577973517ab5d2a9b72728280792de
-SHA1 (patch-ac) = 054fe84cf1c00e09c89fc7318353b84ff41bbd21
+SHA1 (yorick-1.5.12.tgz) = bdc39b62c24f729ed06762b37a0ccac855ea5d8d
+Size (yorick-1.5.12.tgz) = 2095550 bytes
+SHA1 (patch-aa) = 45501359af6fc3ea72a5e71ca1085a02e199603b
diff --git a/math/yorick/patches/patch-aa b/math/yorick/patches/patch-aa
index 4e6332b14c2..f28b6df0faa 100644
--- a/math/yorick/patches/patch-aa
+++ b/math/yorick/patches/patch-aa
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/03 17:49:25 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/04/29 22:41:44 jtb Exp $
 
---- Browser/Makefile.in.orig	Fri Jan  3 19:24:16 1997
-+++ Browser/Makefile.in	Thu Aug  3 19:34:42 2000
-@@ -67,7 +67,7 @@
- DESTDIR =
- 
- install: all installdirs
--	$(CP) gist $(DESTDIR)$(Y_BINDIR)
-+	${BSD_INSTALL_PROGRAM} gist $(DESTDIR)$(Y_BINDIR)
- 
- uninstall:
- 	$(RM) -r $(DESTDIR)$(Y_BINDIR)/gist
+--- ysite.sh.orig
++++ ysite.sh
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+-prefix=.
++prefix=@PREFIX@
+ Y_PLATFORM=.
+ Y_SITE=.
+ Y_HOME=.
diff --git a/math/yorick/patches/patch-ab b/math/yorick/patches/patch-ab
deleted file mode 100644
index c01385a6d52..00000000000
--- a/math/yorick/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/18 17:32:23 drochner Exp $
-
---- Yorick/sysdep.c.orig	Wed Dec 18 18:28:30 1996
-+++ Yorick/sysdep.c	Fri Jan 18 18:26:28 2002
-@@ -127,7 +127,7 @@
-   fp_trap(FP_TRAP_FASTMODE);
-   fp_enable(TRP_INVALID | TRP_DIV_BY_ZERO | TRP_OVERFLOW);
- #endif
--#ifdef __alpha
-+#if defined(__alpha) && !defined(__NetBSD__)
-   /* References:   exception_intro, ieee man pages */
- #include <machine/fpu.h>
-   ieee_set_fp_control(IEEE_TRAP_ENABLE_INV | IEEE_TRAP_ENABLE_DZE |
-@@ -176,8 +176,10 @@
-    definition had second parameter of type int; size_t (long) as here
-    makes more sense and has apparently superceded the original.
-    On machines with sizeof(int)<sizeof(long) this could be serious... */
-+#if 0
- extern char *getcwd(char *, unsigned long);
- extern int chdir(const char *);
-+#endif
- #ifndef HAS_GETCWD
- /* if neither getcwd nor getwd is present, we're out of luck */
- extern char *getwd(char *);
diff --git a/math/yorick/patches/patch-ac b/math/yorick/patches/patch-ac
deleted file mode 100644
index 752349b8e07..00000000000
--- a/math/yorick/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/01/18 17:32:23 drochner Exp $
-
---- Yorick/yio.h.orig	Thu Dec  5 01:49:39 1996
-+++ Yorick/yio.h	Fri Jan 18 18:25:01 2002
-@@ -18,6 +18,7 @@
- #ifndef NO_STDIO_H
- #include <stdio.h>
- #endif
-+#include <unistd.h>
- 
- /* Here are the ANSI standard prototypes for all of the stdio.h functions
-    used by Yorick.  The defintion of FILE is, of course, bogus,