Update xlispstat to 3.52.18. Make me the maintainer (I guess because I'm

a card-carrying statistician).  Relevant changes from version 3.52.9:

	Switched to using sigsetjmp/siglonjmp when available to
		preserve signal masks (allows CONTROL-C to work on Linux).
	Modified startup to start hidden and minimized if -Embedded is
		in the command line.
	Cleaned up get-decoded-time.
	Removed savesys.lsp from distribution to force using
		save-workspace directly when building the mac or windows
		workspaces.  Using save-workspace from within a file means
		some special variables are bound.

	Added support for FreeBSD (enabled standard IEEE handling of
		floating point zero divide).
	Added SYSTEM:TYPED-VECTOR-ELEMENT-SIZE.
	Added unsigned C character to typed vector types.
	Added cptr-protect to add values onto list of values protected
		by a typed pointer.
	Added user exit functions.
	Added support for weak boxes.
	Added binding of *print-readably* to nil around default
		handler printing code and around do-debugger to avoid
		recursive errors.
	Added new customizable DDE server.
	Added minimal implementations of copy-readtable, readtablep, and
		set-syntax-from-char.
	Added error check for non-integer index in select.

	Fixed defpackage to prevent duplicate nicknames.
	Fixed structure printing to inherit print functions.
	Fixed lisp2ulong to signal an error for negative instead of
		positive arguments.
	Fixed buffer underflow problem in floating point formatting.
	Fixed make-string to check for negative length argument.
	Fixed some documentation mismatches.

9 files changed, 34 insertions, 80 deletions

diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 551ea858f28..d625cbde72b 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.10 2000/09/07 04:10:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/10/15 02:23:54 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1998/08/20 07:35:21 asami Exp
 #
 
-DISTNAME=		xlispstat-3-52-9
-PKGNAME=		xlispstat-3.52.9
+DISTNAME=		xlispstat-3-52-18
+PKGNAME=		xlispstat-3.52.18
 CATEGORIES=		math lang
-MASTER_SITES=		ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
+MASTER_SITES=		http://lib.stat.cmu.edu/xlispstat/Src/3-52/ \
+			ftp://ftp.stat.umn.edu/pub/xlispstat/3-52/
 
-MAINTAINER=		packages@netbsd.org
+MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html
 
-GNU_CONFIGURE=		yes
-USE_X11BASE=		yes
+GNU_CONFIGURE=		# defined
+USE_X11BASE=		# defined
 
-NOT_FOR_PLATFORM=	*-*-alpha	#core dumps
+NOT_FOR_PLATFORM=	*-*-alpha	# core dumps
 
 ALL_TARGET=		xlispstat
 
@@ -23,6 +24,6 @@ ALL_TARGET=		xlispstat
 MAKE_ENV+=		CPPFLAGS=
 .endif
 
-MAKE_ENV+=	DISPLAY=	# Prevent 'Rejected connection'
+MAKE_ENV+=		DISPLAY=	# Prevent 'Rejected connection'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xlispstat/files/md5 b/math/xlispstat/files/md5
index 87510d3d551..3f92bdd21e7 100644
--- a/math/xlispstat/files/md5
+++ b/math/xlispstat/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/12/21 10:45:31 frueauf Exp $
+$NetBSD: md5,v 1.3 2000/10/15 02:23:56 jlam Exp $
 
-MD5 (xlispstat-3-52-9.tar.gz) = b1038d45dd0b0bfef905642ac3805a58
+MD5 (xlispstat-3-52-18.tar.gz) = 33498b5f63e16e34bcdf310c5549d7cc
diff --git a/math/xlispstat/files/patch-sum b/math/xlispstat/files/patch-sum
index 611b2e29b9d..465853d8f83 100644
--- a/math/xlispstat/files/patch-sum
+++ b/math/xlispstat/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:10 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/10/15 02:23:56 jlam Exp $
 
-MD5 (patch-ab) = b0a9ec6ae09844f075e5aa83a925d9fa
-MD5 (patch-ac) = a1e5fa59cd9121a138acb46778b7de40
-MD5 (patch-ad) = c590e642cb9c33233620f931288da70a
+MD5 (patch-ac) = 17d3627e68bee2bd086a5078cd61e8e0
+MD5 (patch-ad) = 51b7840e6d94fc01858c80b58ee54e88
diff --git a/math/xlispstat/patches/patch-ab b/math/xlispstat/patches/patch-ab
deleted file mode 100644
index 1a04e1eb3be..00000000000
--- a/math/xlispstat/patches/patch-ab
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/03 20:28:09 frueauf Exp $
-
---- xllist.c.orig	Tue Nov 25 13:07:14 1997
-+++ xllist.c	Fri Oct  2 18:19:47 1998
-@@ -991,7 +991,7 @@
- }
- 
- /* xsort - built-in function 'sort' */
--LOCAL LVAL mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey)
-+LOCAL LVAL xlmergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey)
- {
-   /* Strategy: divide into two parts, (recurse) to sort each, then
-      merge them together */
-@@ -1018,8 +1018,8 @@
-     rplacd(temp, NIL);		/* split left and right parts */
-   }
- 
--  left = mergesort(left, sortfcn, sortkey);
--  right = mergesort(right, sortfcn, sortkey);
-+  left = xlmergesort(left, sortfcn, sortkey);
-+  right = xlmergesort(right, sortfcn, sortkey);
- 
-   {
-     LVAL result, resultt = NULL, leftarg, rightarg;
-@@ -1094,12 +1094,12 @@
-     {
-       LVAL etype = gettvecetype(list);
-       list = coerce_to_list(list);
--      list = mergesort(list, sortfcn, sortkey);
-+      list = xlmergesort(list, sortfcn, sortkey);
-       list = coerce_to_tvec(list, etype);
-       break;
-     }
-   case CONS:
--    list = mergesort(list, sortfcn, sortkey);
-+    list = xlmergesort(list, sortfcn, sortkey);
-     break;
-   default: xlbadtype(list);
-   }
diff --git a/math/xlispstat/patches/patch-ac b/math/xlispstat/patches/patch-ac
index fb77868cb3e..08739a7c6f4 100644
--- a/math/xlispstat/patches/patch-ac
+++ b/math/xlispstat/patches/patch-ac
@@ -1,13 +1,14 @@
-$NetBSD: patch-ac,v 1.4 1999/01/01 09:03:36 garbled Exp $
---- Makefile.in.orig	Wed Sep 16 12:19:33 1998
-+++ Makefile.in	Fri Jan  1 01:48:18 1999
+$NetBSD: patch-ac,v 1.5 2000/10/15 02:23:56 jlam Exp $
+
+--- Makefile.in.orig	Tue Feb  1 18:22:53 2000
++++ Makefile.in
 @@ -6,7 +6,8 @@
  ##############################################################################
  ##############################################################################
  #
 -# XLSLIB -- directory for xlisp executable, startup, example, and help files
-+# XLSLIB -- directory for xlisp example and help files
-+# XLSLIBEXEC -- directory for xlisp executable and startup
++# XLSLIB -- directory for xlisp example, and help files
++# XLSLIBEXEC -- directory for xlisp executable and startup files
  # BINDIR -- directory for xlispstat shell script
  #
  # For the remaining parameters, if your machine has a subdirectory in the 
@@ -26,12 +27,12 @@ $NetBSD: patch-ac,v 1.4 1999/01/01 09:03:36 garbled Exp $
  	echo "(compile-file \"$<\") (exit)" | ./xlisp
  
 -CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG}
-+CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix
++CFLAGS += -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix=1
  
  LIBS = ${EXTRALIBS} -lm
  
 -LDFLAGS = ${ULDFLAGS}
-+LDFLAGS+= ${ULDFLAGS}
++LDFLAGS += ${ULDFLAGS}
  
  OSOBJS = xsdynload.o xssystem.o unixprim.o
  
diff --git a/math/xlispstat/patches/patch-ad b/math/xlispstat/patches/patch-ad
index 969e55bf9d1..73560459d90 100644
--- a/math/xlispstat/patches/patch-ad
+++ b/math/xlispstat/patches/patch-ad
@@ -1,19 +1,19 @@
-$NetBSD: patch-ad,v 1.2 1998/12/21 10:45:31 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 2000/10/15 02:23:56 jlam Exp $
 
---- setup.shell.orig	Wed Sep  7 16:34:36 1994
-+++ setup.shell	Sat Oct  3 16:50:37 1998
+--- setup.shell.orig	Wed Sep  7 10:34:36 1994
++++ setup.shell
 @@ -2,11 +2,12 @@
  cat > $1 <<+++
  #!/bin/sh
  XLISPLIB=$2 export XLISPLIB
-+XLSLIBEXEC=$3 export XLSLIBEXEC
++XLISPLIBEXEC=$3 export XLISPLIBEXEC
  if test -f xlisp.wks; then WKS="xlisp.wks";
 -else WKS="\${XLISPLIB}/xlisp.wks";
-+else WKS="\${XLSLIBEXEC}/xlisp.wks";
++else WKS="\${XLISPLIBEXEC}/xlisp.wks";
  fi
  if test -f xlisp; then XLISP=xlisp;
 -else XLISP="\${XLISPLIB}/xlisp"
-+else XLISP="\${XLSLIBEXEC}/xlisp"
++else XLISP="\${XLISPLIBEXEC}/xlisp"
  fi
  exec \${XLISP} -w\${WKS} \$*
  +++
diff --git a/math/xlispstat/pkg/COMMENT b/math/xlispstat/pkg/COMMENT
index 7601bd95bc3..dc161ea8d7c 100644
--- a/math/xlispstat/pkg/COMMENT
+++ b/math/xlispstat/pkg/COMMENT
@@ -1 +1 @@
-Statistics/X11 based lisp interpreter
+Statistics/X11-based LISP interpreter
diff --git a/math/xlispstat/pkg/DESCR b/math/xlispstat/pkg/DESCR
index a36b5f3dabb..d4d38e76169 100644
--- a/math/xlispstat/pkg/DESCR
+++ b/math/xlispstat/pkg/DESCR
@@ -1,20 +1,12 @@
-This is XLISP-STAT 3.52 Release 9 for generic bsd systems (with simple
-tektronix graphics from the gnuplot system), or X11.
-
 XLISP-STAT is a statistical environment based on a dialect of the Lisp
 language called XLISP.  To facilitate statistical computations, standard Lisp
 functions for addition, logarithms, etc., have been modified to operate on
 lists and arrays of numbers, and a number of basic statistical functions have
 been added.
 
-Updates to this system will be posted periodically in the anonymous
-ftp directory of umnstat.stat.umn.edu (128.101.51.1).
-
 A tutorial introduction to the system is available. It is written
 primarily for the Macintosh version, but the differences to the UNIX
 version are minor; see below. The tutorial is available as a set of
 LaTeX files in xlispstat.doc.tar.Z at the ftp address above.
 
-For further information contact
-
-                luke@umnstat.stat.umn.edu
+For further information contact: luke@umnstat.stat.umn.edu
diff --git a/math/xlispstat/pkg/PLIST b/math/xlispstat/pkg/PLIST
index ad7d4830597..68dde5844ed 100644
--- a/math/xlispstat/pkg/PLIST
+++ b/math/xlispstat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/12/21 10:45:31 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/10/15 02:23:56 jlam Exp $
 bin/xlispstat
 libexec/xlispstat/xlisp
 libexec/xlispstat/xlisp.wks
@@ -36,8 +36,8 @@ share/xlispstat/Examples/rotatedemo.lsp
 share/xlispstat/Examples/tour.lsp
 share/xlispstat/Examples/tourdemo.lsp
 share/xlispstat/xlisp.hlp
-@dirrm share/xlispstat/Autoload
-@dirrm share/xlispstat/Data
 @dirrm share/xlispstat/Examples
+@dirrm share/xlispstat/Data
+@dirrm share/xlispstat/Autoload
 @dirrm share/xlispstat
 @dirrm libexec/xlispstat