7 files changed, 150 insertions, 94 deletions

diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 9d9e252edd13..d737b4d02c4b 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	xlispstat
-PORTVERSION=	3.52.9
+PORTVERSION=	3.52.18
 CATEGORIES=	math lang
 MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/current/   \
 		http://lib.stat.cmu.edu/xlispstat/Src/current/  \
 		ftp://ftp.stat.unipg.it/pub/stat/xlispstat/current/     \
 		ftp://srsuna.shlrc.mq.edu.au/pub/xlispstat/current/     \
 		ftp://statlab.uni-heidelberg.de/pub/mirrors/umn/xlispstat/current/
-DISTNAME=	xlispstat-3-52-9
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-HAS_CONFIGURE=	yes
-ALL_TARGET=
+GNU_CONFIGURE=	yes
+ALL_TARGET=	${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/math/xlispstat/distinfo b/math/xlispstat/distinfo
index 8a9dc43365f0..d938ea8f6159 100644
--- a/math/xlispstat/distinfo
+++ b/math/xlispstat/distinfo
@@ -1 +1 @@
-MD5 (xlispstat-3-52-9.tar.gz) = b1038d45dd0b0bfef905642ac3805a58
+MD5 (xlispstat-3-52-18.tar.gz) = 33498b5f63e16e34bcdf310c5549d7cc
diff --git a/math/xlispstat/files/patch-ac b/math/xlispstat/files/patch-ac
index 88d62d3c3e1e..5d2b5e32e9c9 100644
--- a/math/xlispstat/files/patch-ac
+++ b/math/xlispstat/files/patch-ac
@@ -1,35 +1,11 @@
---- configure.orig	Wed Dec 17 06:12:43 1997
-+++ configure	Thu Dec 23 16:38:07 1999
-@@ -521,6 +521,23 @@
-   ac_n= ac_c='\c' ac_t=
- fi
- 
-+echo checking for FreeBSD
-+cat > conftest.${ac_ext} <<EOF
-+#include "confdefs.h"
-+#ifdef __FreeBSD__
-+  yes
-+#endif
-+
-+EOF
-+eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-+if egrep "yes" conftest.out >/dev/null 2>&1; then
-+  rm -rf conftest*
-+  bsd=1
-+  freebsd=1
-+
-+fi
-+rm -f conftest*
-+
- 
- 
- ac_aux_dir=
-@@ -1304,7 +1321,7 @@
- if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--  FOREIGN_FILE="sysvr4-foreign.h"
-+  FOREIGN_FILE="bsd-foreign.h"
-   foreign=1
-   cat >> confdefs.h <<\EOF
- #define HAVE_DLOPEN 1
+--- configure.orig	Fri Mar 24 01:03:59 2000
++++ configure	Wed May  3 09:00:00 2000
+@@ -580,7 +580,7 @@
+ # Set some default values
+ #
+ LIBS=-lm
+-UCFLAGS=-O
++UCFLAGS=$CFLAGS
+ ULDFLAGS=
+ X11INCDIR_FLAG=
+ X11LIBDIR_FLAG=
diff --git a/math/xlispstat/files/patch-aj b/math/xlispstat/files/patch-aj
new file mode 100644
index 000000000000..125891637795
--- /dev/null
+++ b/math/xlispstat/files/patch-aj
@@ -0,0 +1,75 @@
+--- Makefile.in.orig	Wed Feb  2 08:22:53 2000
++++ Makefile.in	Wed May  3 09:00:00 2000
+@@ -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
+ # BINDIR -- directory for xlispstat shell script
+ #
+ # For the remaining parameters, if your machine has a subdirectory in the 
+@@ -34,7 +35,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
+-XLSLIB=${prefix}/lib/xlispstat
++XLSLIB=${prefix}/share/xlispstat
++XLSLIBEXEC=${prefix}/libexec/xlispstat
+ BINDIR=${exec_prefix}/bin
+ 
+ GRAPHSYS = @GRAPHSYS@
+@@ -67,11 +69,11 @@
+ .lsp.fsl:
+ 	echo "(compile-file \"$<\") (exit)" | ./xlisp
+ 
+-CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG}
++CFLAGS = -D${GRAPHSYS} ${UCFLAGS} ${X11INCDIR_FLAG} -Dunix
+ 
+ LIBS = ${EXTRALIBS} -lm
+ 
+-LDFLAGS = ${ULDFLAGS}
++LDFLAGS+= ${ULDFLAGS}
+ 
+ OSOBJS = xsdynload.o xssystem.o unixprim.o
+ 
+@@ -118,7 +120,7 @@
+ 	compiler/assemble.fsl compiler/cmpfront.fsl
+ 
+ xlispstat: setup.shell xlisp.wks
+-	./setup.shell xlispstat ${XLSLIB}
++	./setup.shell xlispstat ${XLSLIB} ${XLSLIBEXEC}
+ 	chmod a+x xlispstat
+ 
+ xlisp.wks: xlisp ${CMPFSLFILES} ${FSLFILES} ${AUTOFSLFILES}
+@@ -141,20 +143,21 @@
+ install: installexecs installlsp
+ 
+ installexecs: xlispstat xlisp installdirs
+-	-cp xlispstat ${BINDIR}/xlispstat
+-	-cp xlisp ${XLSLIB}
++	${BSD_INSTALL_SCRIPT} xlispstat ${BINDIR}/xlispstat
++	${BSD_INSTALL_PROGRAM} xlisp ${XLSLIBEXEC}
+ 
+ installlsp: xlisp.wks xlisp.hlp ${AUTOFSLFILES} ${CMPFSLFILES} installdirs
+-	-cp xlisp.wks ${XLSLIB}
+-	-cp xlisp.hlp ${XLSLIB}
+-	-cp Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
+-	-cp Data/*.lsp ${XLSLIB}/Data
+-	-cp Examples/*.lsp ${XLSLIB}/Examples
+-#	-cp ${CMPFSLFILES} ${XLSLIB}/compiler
++	${BSD_INSTALL_SCRIPT} xlisp.wks ${XLSLIBEXEC}
++	${BSD_INSTALL_DATA} xlisp.hlp ${XLSLIB}
++	${BSD_INSTALL_DATA} Autoload/_autoidx.lsp Autoload/*.fsl ${XLSLIB}/Autoload
++	${BSD_INSTALL_DATA} Data/*.lsp ${XLSLIB}/Data
++	${BSD_INSTALL_DATA} Examples/*.lsp ${XLSLIB}/Examples
++#	${BSD_INSTALL_DATA} ${CMPFSLFILES} ${XLSLIB}/compiler
+ 
+ installdirs:
+ 	-mkdir -p ${BINDIR}
+ 	-mkdir -p ${XLSLIB}
++	-mkdir -p ${XLSLIBEXEC}
+ 	-mkdir ${XLSLIB}/Data
+ 	-mkdir ${XLSLIB}/Examples
+ 	-mkdir ${XLSLIB}/Autoload
diff --git a/math/xlispstat/files/patch-ak b/math/xlispstat/files/patch-ak
new file mode 100644
index 000000000000..f5e6ef63b721
--- /dev/null
+++ b/math/xlispstat/files/patch-ak
@@ -0,0 +1,17 @@
+--- setup.shell.orig	Wed Sep  7 23:34:36 1994
++++ setup.shell	Wed May  3 09:00:00 2000
+@@ -2,11 +2,12 @@
+ cat > $1 <<+++
+ #!/bin/sh
+ XLISPLIB=$2 export XLISPLIB
++XLSLIBEXEC=$3 export XLSLIBEXEC
+ if test -f xlisp.wks; then WKS="xlisp.wks";
+-else WKS="\${XLISPLIB}/xlisp.wks";
++else WKS="\${XLSLIBEXEC}/xlisp.wks";
+ fi
+ if test -f xlisp; then XLISP=xlisp;
+-else XLISP="\${XLISPLIB}/xlisp"
++else XLISP="\${XLSLIBEXEC}/xlisp"
+ fi
+ exec \${XLISP} -w\${WKS} \$*
+ +++
diff --git a/math/xlispstat/pkg-descr b/math/xlispstat/pkg-descr
index 6931b5a53e02..2636141e3ea1 100644
--- a/math/xlispstat/pkg-descr
+++ b/math/xlispstat/pkg-descr
@@ -1,20 +1,7 @@
-This is XLISP-STAT 3.44 Release 3 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
+WWW: http://www.stat.umn.edu/~luke/xls/xlsinfo/xlsinfo.html
diff --git a/math/xlispstat/pkg-plist b/math/xlispstat/pkg-plist
index 622fa9c0476a..5ef09eaae43f 100644
--- a/math/xlispstat/pkg-plist
+++ b/math/xlispstat/pkg-plist
@@ -1,41 +1,42 @@
 bin/xlispstat
-lib/xlispstat/Autoload/_autoidx.lsp
-lib/xlispstat/Autoload/bayes.fsl
-lib/xlispstat/Autoload/glim.fsl
-lib/xlispstat/Autoload/maximize.fsl
-lib/xlispstat/Autoload/nonlin.fsl
-lib/xlispstat/Autoload/oneway.fsl
-lib/xlispstat/Autoload/stepper.fsl
-lib/xlispstat/Data/absorbtion.lsp
-lib/xlispstat/Data/aircraft.lsp
-lib/xlispstat/Data/book.lsp
-lib/xlispstat/Data/car-prices.lsp
-lib/xlispstat/Data/diabetes.lsp
-lib/xlispstat/Data/heating.lsp
-lib/xlispstat/Data/iris.lsp
-lib/xlispstat/Data/leukemia.lsp
-lib/xlispstat/Data/metabolism.lsp
-lib/xlispstat/Data/oxygen.lsp
-lib/xlispstat/Data/puromycin.lsp
-lib/xlispstat/Data/randu.lsp
-lib/xlispstat/Data/stackloss.lsp
-lib/xlispstat/Data/tutorial.lsp
-lib/xlispstat/Examples/abrasiondemo.lsp
-lib/xlispstat/Examples/addbox.lsp
-lib/xlispstat/Examples/addhandrotate.lsp
-lib/xlispstat/Examples/bcdemo.lsp
-lib/xlispstat/Examples/dataprotos.lsp
-lib/xlispstat/Examples/fstat.lsp
-lib/xlispstat/Examples/inspect.lsp
-lib/xlispstat/Examples/plotcontrols.lsp
-lib/xlispstat/Examples/regdemo.lsp
-lib/xlispstat/Examples/rotatedemo.lsp
-lib/xlispstat/Examples/tour.lsp
-lib/xlispstat/Examples/tourdemo.lsp
-lib/xlispstat/xlisp
-lib/xlispstat/xlisp.hlp
-lib/xlispstat/xlisp.wks
-@dirrm lib/xlispstat/Autoload
-@dirrm lib/xlispstat/Data
-@dirrm lib/xlispstat/Examples
-@dirrm lib/xlispstat
+libexec/xlispstat/xlisp
+libexec/xlispstat/xlisp.wks
+share/xlispstat/Autoload/_autoidx.lsp
+share/xlispstat/Autoload/bayes.fsl
+share/xlispstat/Autoload/glim.fsl
+share/xlispstat/Autoload/maximize.fsl
+share/xlispstat/Autoload/nonlin.fsl
+share/xlispstat/Autoload/oneway.fsl
+share/xlispstat/Autoload/stepper.fsl
+share/xlispstat/Data/absorbtion.lsp
+share/xlispstat/Data/aircraft.lsp
+share/xlispstat/Data/book.lsp
+share/xlispstat/Data/car-prices.lsp
+share/xlispstat/Data/diabetes.lsp
+share/xlispstat/Data/heating.lsp
+share/xlispstat/Data/iris.lsp
+share/xlispstat/Data/leukemia.lsp
+share/xlispstat/Data/metabolism.lsp
+share/xlispstat/Data/oxygen.lsp
+share/xlispstat/Data/puromycin.lsp
+share/xlispstat/Data/randu.lsp
+share/xlispstat/Data/stackloss.lsp
+share/xlispstat/Data/tutorial.lsp
+share/xlispstat/Examples/abrasiondemo.lsp
+share/xlispstat/Examples/addbox.lsp
+share/xlispstat/Examples/addhandrotate.lsp
+share/xlispstat/Examples/bcdemo.lsp
+share/xlispstat/Examples/dataprotos.lsp
+share/xlispstat/Examples/fstat.lsp
+share/xlispstat/Examples/inspect.lsp
+share/xlispstat/Examples/plotcontrols.lsp
+share/xlispstat/Examples/regdemo.lsp
+share/xlispstat/Examples/rotatedemo.lsp
+share/xlispstat/Examples/tour.lsp
+share/xlispstat/Examples/tourdemo.lsp
+share/xlispstat/xlisp.hlp
+@dirrm share/xlispstat/Examples
+@dirrm share/xlispstat/Data
+@dirrm share/xlispstat/Autoload
+@dirrm share/xlispstat
+@dirrm libexec/xlispstat