From 2d567461e96afe15e4a007685d3ed559c15aa161 Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Wed, 22 Oct 2008 00:51:01 +0000
Subject: [PATCH] Update to yorick-2.1; from Daniel Dickman

---
 math/yorick/Makefile  | 27 +++++++++++++++++----------
 math/yorick/distinfo  | 10 +++++-----
 math/yorick/pkg/DESCR | 21 +++++++++------------
 math/yorick/pkg/PLIST | 35 ++++++++++++++++++++++++++---------
 4 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/math/yorick/Makefile b/math/yorick/Makefile
index 83c035d6c72..fcf35378084 100644
--- a/math/yorick/Makefile
+++ b/math/yorick/Makefile
@@ -1,24 +1,27 @@
-# $OpenBSD: Makefile,v 1.16 2007/09/15 18:44:37 steven Exp $
+# $OpenBSD: Makefile,v 1.17 2008/10/22 00:51:01 pvalchev Exp $
 
 COMMENT=	interpreted language for scientific computing
 
-VERSION=	1.5
-DISTNAME=	yorick-${VERSION}.08
-PKGNAME=	${DISTNAME}p1
-CATEGORIES=	math devel
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/
-EXTRACT_SUFX=	.tgz
+VERSION=	2.1
+DISTNAME=	yorick-${VERSION}.05
+PKGNAME=	${DISTNAME}
 
-HOMEPAGE=	ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html
+CATEGORIES=	math devel
+
+HOMEPAGE=	http://yorick.sourceforge.net/
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=yorick/}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
 
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 c m
 
+WANTLIB=	X11 c m
 USE_X11=	Yes
 
 Y_SITE=		${PREFIX}/share/yorick
@@ -32,6 +35,9 @@ REGRESS_IS_INTERACTIVE=	Yes
 SETENV=env
 REGRESS_TARGET=		check
 
+post-extract:
+	@find ${WRKDIST} -type d -name CVS -exec rm -rf {} \; 2>/dev/null
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yorick/yorick ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/gist/gist ${PREFIX}/bin
@@ -42,7 +48,8 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/yorick.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/gist.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yorick
-	${INSTALL_DATA} ${WRKSRC}/doc/*.{doc,tex,ps,pdf} ${PREFIX}/share/doc/yorick
+	${INSTALL_DATA} ${WRKSRC}/doc/*.{doc,tex,pdf} ${PREFIX}/share/doc/yorick
+	${INSTALL_DATA} ${WRKSRC}/g/*.ps ${PREFIX}/share/doc/yorick
 	${INSTALL_DATA_DIR} ${Y_SITE}
 	${INSTALL_DATA_DIR} ${Y_SITE}/g
 	${INSTALL_DATA_DIR} ${Y_SITE}/i
diff --git a/math/yorick/distinfo b/math/yorick/distinfo
index dbca12dde60..c2155be9c00 100644
--- a/math/yorick/distinfo
+++ b/math/yorick/distinfo
@@ -1,5 +1,5 @@
-MD5 (yorick-1.5.08.tgz) = LxPdm8L9FQOxgAbCo8JT7g==
-RMD160 (yorick-1.5.08.tgz) = nimfJ187G+xYhUQIMf2jacFEWc8=
-SHA1 (yorick-1.5.08.tgz) = Gm4Cj/+ojJqFpEUYiH5FzBkT7dY=
-SHA256 (yorick-1.5.08.tgz) = zJizuzj5X+5X+Y8CEZJCfZsyoFGjcbYdgEwyUTg2/NQ=
-SIZE (yorick-1.5.08.tgz) = 2037018
+MD5 (yorick-2.1.05.tgz) = IrUa3VAMdRwYKJ0kjyz1sg==
+RMD160 (yorick-2.1.05.tgz) = Lsa7i4Kr48kuA5k65+1ObRf2uTY=
+SHA1 (yorick-2.1.05.tgz) = p/9RUhVc2f0hLspzM+G30LxeJeo=
+SHA256 (yorick-2.1.05.tgz) = fK8TCWyPBDURrleQ6eGAUDGAGyoA6wrcmjKtOsBHP0o=
+SIZE (yorick-2.1.05.tgz) = 2242539
diff --git a/math/yorick/pkg/DESCR b/math/yorick/pkg/DESCR
index 7d6959979a7..03b09fd7129 100644
--- a/math/yorick/pkg/DESCR
+++ b/math/yorick/pkg/DESCR
@@ -1,14 +1,11 @@
-Yorick is an interpreted language for scientific computing
-and numerical analysis, very similar to Matlab.
+Yorick is an interpreted language for scientific computing and
+numerical analysis, very similar to Matlab.
 
-Yorick's array syntax, interpreted programs are compact,
-nearly free of explicit loops, and can run at speeds up to
-20% of optimized compiled speed.
+Yorick has a compact syntax, similar to C, but with array operators.
+It is easily expandable through dynamic linking of C libraries,
+allows efficient manipulation of arbitrary size/dimension arrays,
+and offers extensive graphic capabilities.
 
-It can do interactive graphics via the X Window System,
-including x-y plots, quadrilateral meshes and cell arrays.
-Includes tools to assist making animated and simple 3d
-graphs.
-
-Supports output directly to your screen, in PostScript and
-binary CGM format.
+Yorick includes an interactive graphics package, and a binary file
+package capable of translating to and from the raw numeric formats
+of all modern computers.
diff --git a/math/yorick/pkg/PLIST b/math/yorick/pkg/PLIST
index 22a47563b25..9ce18e60c88 100644
--- a/math/yorick/pkg/PLIST
+++ b/math/yorick/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 09:12:00 espie Exp $
-bin/gist
-bin/yorick
+@comment $OpenBSD: PLIST,v 1.7 2008/10/22 00:51:01 pvalchev Exp $
+@bin bin/gist
+@bin bin/yorick
 include/README
 include/bcast.h
 include/binio.h
 include/bound.h
+include/cblasy.h
+include/cfft.h
 include/cgm.h
 include/cgmin.h
 include/clip.h
@@ -16,11 +18,11 @@ include/drat.i
 include/draw.h
 include/engine.h
 include/eps.h
-include/extern_c.h
 include/fft.i
 include/gist.h
 include/graph.i
 include/gtext.h
+include/hack103.h
 include/hash.h
 include/heapsort.h
 include/hex.h
@@ -40,7 +42,10 @@ include/play.h
 include/playgl.h
 include/playu.h
 include/playw.h
+include/playwin.h
 include/playx.h
+include/plugin.h
+include/pmin.h
 include/prmtyp.h
 include/ps.h
 include/pstdio.h
@@ -55,26 +60,28 @@ include/ugetc.h
 include/upoll.h
 include/xbasic.h
 include/xfancy.h
+include/yapi.h
 include/yasync.h
 include/ydata.h
+include/yfnmatch.h
 include/yio.h
+include/yregexp.h
 include/yversion.h
 lib/libyor.a
 @man man/man1/gist.1
 @man man/man1/yorick.1
 share/doc/yorick/
 share/doc/yorick/drat.doc
-share/doc/yorick/drat.tex
 share/doc/yorick/graph.doc
 share/doc/yorick/hex.doc
 share/doc/yorick/library.doc
 share/doc/yorick/math.doc
+share/doc/yorick/ps.ps
+share/doc/yorick/pscom.ps
 share/doc/yorick/refs.pdf
-share/doc/yorick/refs.ps
 share/doc/yorick/refs.tex
 share/doc/yorick/std.doc
 share/doc/yorick/yorick.pdf
-share/doc/yorick/yorick.ps
 share/doc/yorick/yorick.tex
 share/yorick/
 share/yorick/g/
@@ -103,6 +110,7 @@ share/yorick/i/basfix.i
 share/yorick/i/bessel.i
 share/yorick/i/bowtie.i
 share/yorick/i/button.i
+share/yorick/i/calendar.i
 share/yorick/i/cheby.i
 share/yorick/i/collec.i
 share/yorick/i/color.i
@@ -118,33 +126,40 @@ share/yorick/i/demo5.i
 share/yorick/i/digit2.i
 share/yorick/i/ellipse.i
 share/yorick/i/elliptic.i
+share/yorick/i/fermi.i
+share/yorick/i/fermii.i
 share/yorick/i/filter.i
 share/yorick/i/fitlsq.i
 share/yorick/i/fitrat.i
 share/yorick/i/fits.i
 share/yorick/i/gamma.i
+share/yorick/i/gammp.i
 share/yorick/i/gcd.i
 share/yorick/i/hydra.i
+share/yorick/i/idlsave.i
+share/yorick/i/ieee.i
 share/yorick/i/kepler.i
-share/yorick/i/legal.i
 share/yorick/i/legndr.i
 share/yorick/i/make.i
+share/yorick/i/md5.i
 share/yorick/i/mkdoc.i
 share/yorick/i/movie.i
 share/yorick/i/msort.i
 share/yorick/i/multi.i
 share/yorick/i/netcdf.i
+share/yorick/i/pathfun.i
 share/yorick/i/pixels.i
+share/yorick/i/pkg_mngr.i
 share/yorick/i/pl3d.i
 share/yorick/i/plato.i
 share/yorick/i/plclab.i
 share/yorick/i/plwf.i
 share/yorick/i/pnm.i
 share/yorick/i/prefix.i
-share/yorick/i/prmtyp.i
 share/yorick/i/random.i
 share/yorick/i/rays.i
 share/yorick/i/readn.i
+share/yorick/i/regress.i
 share/yorick/i/rezone.i
 share/yorick/i/rkutta.i
 share/yorick/i/romberg.i
@@ -154,6 +169,7 @@ share/yorick/i/show.i
 share/yorick/i/silo.i
 share/yorick/i/slice3.i
 share/yorick/i/spline.i
+share/yorick/i/splinef.i
 share/yorick/i/string.i
 share/yorick/i/style.i
 share/yorick/i/sysafe.i
@@ -166,6 +182,7 @@ share/yorick/i/testg.i
 share/yorick/i/testlp.i
 share/yorick/i/testm.i
 share/yorick/i/testp.i
+share/yorick/i/teststr.i
 share/yorick/i/txpath.i
 share/yorick/i/ylmdec.i
 share/yorick/i/zroots.i