Date: Sun, 7 May 2000 11:54:52 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18439: Update port: math/xlispstat to 3.52.18 Message-ID: <20000507185452.6879037B997@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18439 >Category: ports >Synopsis: Update port: math/xlispstat to 3.52.18 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun May 07 12:00:04 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update to version 3.52.18 New file: patches/patch-aj patches/patch-ak Remove file: patches/patch-ad patches/patch-ae patches/patch-af patches/patch-ag patches/patch-ah patches/patch-ai >How-To-Repeat: >Fix: diff -urN /usr/ports/math/xlispstat/Makefile math/xlispstat/Makefile --- /usr/ports/math/xlispstat/Makefile Mon Apr 24 19:00:41 2000 +++ math/xlispstat/Makefile Wed May 3 09:00:00 2000 @@ -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 -urN /usr/ports/math/xlispstat/files/md5 math/xlispstat/files/md5 --- /usr/ports/math/xlispstat/files/md5 Fri Dec 24 08:50:16 1999 +++ math/xlispstat/files/md5 Wed May 3 09:00:00 2000 @@ -1 +1 @@ -MD5 (xlispstat-3-52-9.tar.gz) = b1038d45dd0b0bfef905642ac3805a58 +MD5 (xlispstat-3-52-18.tar.gz) = 33498b5f63e16e34bcdf310c5549d7cc diff -urN /usr/ports/math/xlispstat/patches/patch-ac math/xlispstat/patches/patch-ac --- /usr/ports/math/xlispstat/patches/patch-ac Fri Dec 24 08:50:17 1999 +++ math/xlispstat/patches/patch-ac Wed May 3 09:00:00 2000 @@ -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 -urN /usr/ports/math/xlispstat/patches/patch-ad math/xlispstat/patches/patch-ad --- /usr/ports/math/xlispstat/patches/patch-ad Fri Dec 24 08:50:17 1999 +++ math/xlispstat/patches/patch-ad Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- xlprin.c.orig Wed Sep 16 14:10:41 1998 -+++ xlprin.c Thu Dec 23 16:37:04 1999 -@@ -808,7 +808,7 @@ - } - /* check for the first character being '#' - or string looking like a number */ -- if (*str == '#' || isnumber(str,NULL)) -+ if (*str == '#' || xl_isnumber(str,NULL)) - xlputc(fptr,'\\'); - } - diff -urN /usr/ports/math/xlispstat/patches/patch-ae math/xlispstat/patches/patch-ae --- /usr/ports/math/xlispstat/patches/patch-ae Fri Dec 24 08:50:18 1999 +++ math/xlispstat/patches/patch-ae Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- xlread.c.orig Mon May 25 11:45:05 1998 -+++ xlread.c Thu Dec 23 16:43:50 1999 -@@ -1167,7 +1167,7 @@ - - pname(fptr,&escflag,&packindex); - if (! null(getvalue(s_read_suppress))) return(NIL); -- if (escflag || packindex >= 0 || !isnumber(buf,&val)) { -+ if (escflag || packindex >= 0 || !xl_isnumber(buf,&val)) { - if (packindex >= 0) { - /* check for zero-length name */ - if (buf[packindex+1] == 0) xlfail("zero length name after ':'"); -@@ -1213,7 +1213,7 @@ - LVAL val; - pname(fptr,&escflag); - if (! null(getvalue(s_read_suppress))) return(NIL); -- return (escflag || !isnumber(buf,&val) ? xlenter(buf) : val); -+ return (escflag || !xl_isnumber(buf,&val) ? xlenter(buf) : val); - } - #endif /* PACKAGES */ - -@@ -1449,7 +1449,7 @@ - return 0; - } - --int isnumber P2C(char *, str, LVAL *, pval) -+int xl_isnumber P2C(char *, str, LVAL *, pval) - { - int dl=0, dr=0; - char *p = str; diff -urN /usr/ports/math/xlispstat/patches/patch-af math/xlispstat/patches/patch-af --- /usr/ports/math/xlispstat/patches/patch-af Fri Dec 24 08:50:18 1999 +++ math/xlispstat/patches/patch-af Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- xlisp.h.orig Fri Mar 27 06:16:11 1998 -+++ xlisp.h Thu Dec 23 16:44:31 1999 -@@ -1642,7 +1642,7 @@ - extern LVAL tentry _((int ch)); - extern int xlload _((char *fname, int vflag, int pflag)); - extern int xlread _((LVAL fptr, LVAL *pval, int rflag, int pwflag)); --extern int isnumber _((char *str, LVAL *pval)); -+extern int xl_isnumber _((char *str, LVAL *pval)); - - /* for xlstruct */ - extern LVAL xlrdstruct _((LVAL list)); diff -urN /usr/ports/math/xlispstat/patches/patch-ag math/xlispstat/patches/patch-ag --- /usr/ports/math/xlispstat/patches/patch-ag Fri Dec 24 08:50:18 1999 +++ math/xlispstat/patches/patch-ag Thu Jan 1 09:00:00 1970 @@ -1,84 +0,0 @@ ---- xlmath2.c.orig Thu Apr 20 08:50:43 1995 -+++ xlmath2.c Thu Dec 23 16:45:48 1999 -@@ -66,7 +66,7 @@ - #endif - LOCAL VOID badcop(V); - LOCAL LVAL readnumber P1H(Number *); --LOCAL VOID setmode P2H(Number *, int); -+LOCAL VOID xl_setmode P2H(Number *, int); - LOCAL VOID matchmodes P2H(Number *, Number *); - LOCAL LVAL lispnumber P1H(Number *); - LOCAL LVAL binary P1H(int); -@@ -455,7 +455,7 @@ - return(arg); - } - --LOCAL VOID setmode P2C(Number *, x, int, mode) -+LOCAL VOID xl_setmode P2C(Number *, x, int, mode) - { - switch (mode) { - #ifdef BIGNUMS -@@ -534,8 +534,8 @@ - break; - #endif - } -- if (x->mode != mode) setmode(x, mode); -- if (y->mode != mode) setmode(y, mode); -+ if (x->mode != mode) xl_setmode(x, mode); -+ if (y->mode != mode) xl_setmode(y, mode); - } - - LOCAL LVAL lispnumber P1C(Number *, x) -@@ -789,7 +789,7 @@ - case IN: - checkizero(arg.val); - #ifdef BIGNUMS -- setmode(&val, RT); -+ xl_setmode(&val, RT); - val.denom = arg.val; - break; - #else -@@ -802,8 +802,8 @@ - break; - } - else { -- setmode(&val, FL); -- setmode(&arg, FL); -+ xl_setmode(&val, FL); -+ xl_setmode(&arg, FL); - } - /* drop through */ - #endif -@@ -812,8 +812,8 @@ - val.fval /= arg.fval; - break; - case CI: -- setmode(&val, CF); -- setmode(&arg, CF); -+ xl_setmode(&val, CF); -+ xl_setmode(&arg, CF); - /* drop through */ - case CF: - { -@@ -856,8 +856,8 @@ - break; - } - else { -- setmode(&val, FL); -- setmode(&arg, FL); -+ xl_setmode(&val, FL); -+ xl_setmode(&arg, FL); - } - /* drop through */ - case FL: -@@ -865,8 +865,8 @@ - val.fval /= arg.fval; - break; - case CI: -- setmode(&val, CF); -- setmode(&arg, CF); -+ xl_setmode(&val, CF); -+ xl_setmode(&arg, CF); - /* drop through */ - case CF: - { diff -urN /usr/ports/math/xlispstat/patches/patch-ah math/xlispstat/patches/patch-ah --- /usr/ports/math/xlispstat/patches/patch-ah Fri Dec 24 08:50:18 1999 +++ math/xlispstat/patches/patch-ah Thu Jan 1 09:00:00 1970 @@ -1,22 +0,0 @@ ---- X11BSDstuff.c.orig Thu Dec 23 16:46:58 1999 -+++ X11BSDstuff.c Thu Dec 23 16:59:36 1999 -@@ -14,6 +14,9 @@ - #include "version.h" - /***** probably needs to be protected by check that dirent is available */ - #include <dirent.h> -+#ifdef __FreeBSD__ -+#include <floatingpoint.h> -+#endif - - extern VOID StPollEvent(V); - extern int StBlockForInput(V); -@@ -51,6 +54,9 @@ - VOID osinit(name) - char *name; - { -+#ifdef __FreeBSD__ -+ fpsetmask(0); -+#endif - time_stamp = time((time_t *) 0); - - disable_interrupts(); diff -urN /usr/ports/math/xlispstat/patches/patch-ai math/xlispstat/patches/patch-ai --- /usr/ports/math/xlispstat/patches/patch-ai Fri Dec 24 08:50:18 1999 +++ math/xlispstat/patches/patch-ai Thu Jan 1 09:00:00 1970 @@ -1,37 +0,0 @@ ---- xllist.c.orig Thu Dec 23 17:03:26 1999 -+++ xllist.c Thu Dec 23 17:02:50 1999 -@@ -991,7 +991,7 @@ - } - - /* xsort - built-in function 'sort' */ --LOCAL LVAL mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey) -+LOCAL LVAL xl_mergesort 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 = xl_mergesort(left, sortfcn, sortkey); -+ right = xl_mergesort(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 = xl_mergesort(list, sortfcn, sortkey); - list = coerce_to_tvec(list, etype); - break; - } - case CONS: -- list = mergesort(list, sortfcn, sortkey); -+ list = xl_mergesort(list, sortfcn, sortkey); - break; - default: xlbadtype(list); - } diff -urN /usr/ports/math/xlispstat/patches/patch-aj math/xlispstat/patches/patch-aj --- /usr/ports/math/xlispstat/patches/patch-aj Thu Jan 1 09:00:00 1970 +++ math/xlispstat/patches/patch-aj Wed May 3 09:00:00 2000 @@ -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 -urN /usr/ports/math/xlispstat/patches/patch-ak math/xlispstat/patches/patch-ak --- /usr/ports/math/xlispstat/patches/patch-ak Thu Jan 1 09:00:00 1970 +++ math/xlispstat/patches/patch-ak Wed May 3 09:00:00 2000 @@ -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 -urN /usr/ports/math/xlispstat/pkg/DESCR math/xlispstat/pkg/DESCR --- /usr/ports/math/xlispstat/pkg/DESCR Fri Apr 21 19:09:12 2000 +++ math/xlispstat/pkg/DESCR Wed May 3 09:00:00 2000 @@ -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 -urN /usr/ports/math/xlispstat/pkg/PLIST math/xlispstat/pkg/PLIST --- /usr/ports/math/xlispstat/pkg/PLIST Fri Dec 24 08:50:19 1999 +++ math/xlispstat/pkg/PLIST Wed May 3 09:00:00 2000 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000507185452.6879037B997>