Date: Sun, 2 May 1999 20:48:00 -0700 (PDT) From: pfgiffun@bachue.usc.unal.edu.co To: freebsd-gnats-submit@freebsd.org Subject: ports/11460: Update to the xlispstat port Message-ID: <19990503034800.1B11F15AD1@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 11460 >Category: ports >Synopsis: Update to the xlispstat port >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 2 20:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 3.1-Release >Organization: U. Nacional de Colombia >Environment: >Description: The xlispstat port was really outdated and I needed itto build the Visual Statistics (ViSta) package. I also sent a copy of the patches to the author and they will be folded in the distribution. >How-To-Repeat: >Fix: diff -rNu xlispstat.old/Makefile xlispstat/Makefile --- xlispstat.old/Makefile Thu Aug 20 05:20:55 1998 +++ xlispstat/Makefile Sun May 2 18:14:29 1999 @@ -1,21 +1,28 @@ # New ports collection makefile for: xlisp-stat -# Version required: 3.44 +# Version required: 3.52 # Date created: Tue Aug 15 17:57:48 CDT 1995 # Whom: erich@rrnet.com # # $Id: Makefile,v 1.7 1998/08/20 07:35:21 asami Exp $ # -DISTNAME= xlispstat-3-44 -PKGNAME= xlispstat-3.44 +DISTNAME= xlispstat-3-52-9 +PKGNAME= xlispstat-3.52.9 CATEGORIES= math lang -MASTER_SITES= ftp://ftp.stat.umn.edu/pub/xlispstat/old/3-44/ +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 MAINTAINER= erich@FreeBSD.org -.if !defined(DISPLAY) -BROKEN= Requires an X Display to build -.endif +#.if !defined(DISPLAY) +#BROKEN= Requires an X Display to build +#.endif + +USE_XLIB= yes HAS_CONFIGURE= yes +ALL_TARGET= .include <bsd.port.mk> diff -rNu xlispstat.old/files/md5 xlispstat/files/md5 --- xlispstat.old/files/md5 Fri Aug 18 03:53:13 1995 +++ xlispstat/files/md5 Sun Apr 18 12:56:30 1999 @@ -1 +1 @@ -MD5 (xlispstat-3-44.tar.gz) = 857e29ac6c8cf6f76bc58b276d8d5f20 +MD5 (xlispstat-3-52-9.tar.gz) = b1038d45dd0b0bfef905642ac3805a58 diff -rNu xlispstat.old/patches/patch-aa xlispstat/patches/patch-aa --- xlispstat.old/patches/patch-aa Fri Aug 18 03:53:14 1995 +++ xlispstat/patches/patch-aa Sun Apr 18 22:10:49 1999 @@ -1,50 +1,26 @@ -*** configure~ Tue Aug 15 11:29:08 1995 ---- configure Tue Aug 15 11:26:18 1995 +*** configure.orig Wed Dec 17 07:12:43 1997 +--- configure Sun Apr 18 22:08:56 1999 *************** -*** 514,519 **** ---- 514,536 ---- - fi - rm -f conftest* - -+ 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* -+ - - echo checking for ultrix - cat > conftest.${ac_ext} <<EOF -*************** -*** 953,958 **** ---- 970,981 ---- - if test -z "$FOREIGN_FLAG" && test "$bsd"; then - FOREIGN_FILE="bsd-foreign.h" - FOREIGN_FLAG=-DFOREIGNCALL -+ fi -+ -+ if test "$FOREIGN_FLAG" && test "$freebsd"; then -+ FOREIGN_FILE="bsd-foreign.h" -+ FOREIGN_FLAG=-DFOREIGNCALL -+ IEEE_FLAG="" - fi - - if test -z "$FOREIGN_FLAG"; then -*** ./xlprin.c~ Tue Aug 15 10:24:31 1995 ---- ./xlprin.c Tue Aug 15 10:30:22 1995 +*** 1304,1310 **** + if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +! FOREIGN_FILE="sysvr4-foreign.h" + foreign=1 + cat >> confdefs.h <<\EOF + #define HAVE_DLOPEN 1 +--- 1304,1310 ---- + if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +! FOREIGN_FILE="bsd-foreign.h" + foreign=1 + cat >> confdefs.h <<\EOF + #define HAVE_DLOPEN 1 +*** xlprin.c.orig Wed Sep 16 14:10:41 1998 +--- xlprin.c Sun Apr 18 13:48:01 1999 *************** -*** 781,787 **** +*** 808,814 **** } /* check for the first character being '#' or string looking like a number */ @@ -52,7 +28,7 @@ xlputc(fptr,'\\'); } ---- 781,787 ---- +--- 808,814 ---- } /* check for the first character being '#' or string looking like a number */ @@ -60,10 +36,10 @@ xlputc(fptr,'\\'); } -*** ./xlread.c~ Tue Aug 15 10:25:53 1995 ---- ./xlread.c Tue Aug 15 10:31:37 1995 +*** xlread.c.orig Mon May 25 11:45:05 1998 +--- xlread.c Sun Apr 18 21:17:55 1999 *************** -*** 1063,1069 **** +*** 1167,1173 **** pname(fptr,&escflag,&packindex); if (! null(getvalue(s_read_suppress))) return(NIL); @@ -71,7 +47,7 @@ if (packindex >= 0) { /* check for zero-length name */ if (buf[packindex+1] == 0) xlfail("zero length name after ':'"); ---- 1063,1069 ---- +--- 1167,1173 ---- pname(fptr,&escflag,&packindex); if (! null(getvalue(s_read_suppress))) return(NIL); @@ -80,7 +56,7 @@ /* check for zero-length name */ if (buf[packindex+1] == 0) xlfail("zero length name after ':'"); *************** -*** 1109,1115 **** +*** 1213,1219 **** LVAL val; pname(fptr,&escflag); if (! null(getvalue(s_read_suppress))) return(NIL); @@ -88,7 +64,7 @@ } #endif /* PACKAGES */ ---- 1109,1115 ---- +--- 1213,1219 ---- LVAL val; pname(fptr,&escflag); if (! null(getvalue(s_read_suppress))) return(NIL); @@ -97,79 +73,77 @@ #endif /* PACKAGES */ *************** -*** 1334,1340 **** +*** 1449,1455 **** + return 0; } - /* isnumber - check if this string is a number */ ! int isnumber P2C(char *, str, LVAL *, pval) { int dl=0, dr=0; char *p = str; ---- 1334,1340 ---- +--- 1449,1455 ---- + return 0; } - /* isnumber - check if this string is a number */ ! int xl_isnumber P2C(char *, str, LVAL *, pval) { int dl=0, dr=0; char *p = str; -*** ./xlisp.h~ Tue Aug 15 10:30:35 1995 ---- ./xlisp.h Tue Aug 15 10:30:49 1995 *************** -*** 1549,1555 **** - extern LVAL tentry _((int ch)); - extern int xlload _((char *fname, int vflag, int pflag)); - extern int xlread _((LVAL fptr, LVAL *pval, int recursive)); -! extern int isnumber _((char *str, LVAL *pval)); - - /* for xlstruct */ - extern LVAL xlrdstruct _((LVAL list)); ---- 1549,1555 ---- - extern LVAL tentry _((int ch)); - extern int xlload _((char *fname, int vflag, int pflag)); - extern int xlread _((LVAL fptr, LVAL *pval, int recursive)); -! extern int xl_isnumber _((char *str, LVAL *pval)); - - /* for xlstruct */ - extern LVAL xlrdstruct _((LVAL list)); -*** ./xlmath2.c~ Tue Aug 15 10:35:41 1995 ---- ./xlmath2.c Tue Aug 15 10:37:04 1995 -*************** -*** 80,86 **** - LOCAL ComplexNumber catan P1H(ComplexNumber); - LOCAL ComplexNumber catan2 P2H(ComplexNumber, ComplexNumber); +*** 1568,1574 **** + return (TRUE); + } + #else +! int isnumber P2C(char *, str, LVAL *, pval) + { + int dl=0, dr=0; + char *p = str; +--- 1568,1574 ---- + return (TRUE); + } + #else +! int xl_isnumber P2C(char *, str, LVAL *, pval) + { + int dl=0, dr=0; + char *p = str; +*** xlmath2.c.orig Thu Apr 20 08:50:43 1995 +--- xlmath2.c Sun Apr 18 21:25:39 1999 +*************** +*** 66,72 **** + #endif + LOCAL VOID badcop(V); LOCAL LVAL readnumber P1H(Number *); ! LOCAL VOID setmode P2H(Number *, int); LOCAL VOID matchmodes P2H(Number *, Number *); LOCAL LVAL lispnumber P1H(Number *); LOCAL LVAL binary P1H(int); ---- 80,86 ---- - LOCAL ComplexNumber catan P1H(ComplexNumber); - LOCAL ComplexNumber catan2 P2H(ComplexNumber, ComplexNumber); +--- 66,72 ---- + #endif + LOCAL VOID badcop(V); LOCAL LVAL readnumber P1H(Number *); ! LOCAL VOID xl_setmode P2H(Number *, int); LOCAL VOID matchmodes P2H(Number *, Number *); LOCAL LVAL lispnumber P1H(Number *); LOCAL LVAL binary P1H(int); *************** -*** 539,545 **** +*** 455,461 **** return(arg); } ! LOCAL VOID setmode P2C(Number *, x, int, mode) { switch (mode) { - #ifdef RATIOS ---- 539,545 ---- + #ifdef BIGNUMS +--- 455,461 ---- return(arg); } ! LOCAL VOID xl_setmode P2C(Number *, x, int, mode) { switch (mode) { - #ifdef RATIOS + #ifdef BIGNUMS *************** -*** 618,625 **** +*** 534,541 **** break; #endif } @@ -178,7 +152,7 @@ } LOCAL LVAL lispnumber P1C(Number *, x) ---- 618,625 ---- +--- 534,541 ---- break; #endif } @@ -188,24 +162,7 @@ LOCAL LVAL lispnumber P1C(Number *, x) *************** -*** 866,872 **** - case IN: - checkizero(arg.val); - #ifdef RATIOS -! setmode(&val, RT); - val.denom = arg.val; - break; - #else ---- 866,872 ---- - case IN: - checkizero(arg.val); - #ifdef RATIOS -! xl_setmode(&val, RT); - val.denom = arg.val; - break; - #else -*************** -*** 879,886 **** +*** 802,809 **** break; } else { @@ -214,7 +171,7 @@ } /* drop through */ #endif ---- 879,886 ---- +--- 802,809 ---- break; } else { @@ -224,7 +181,45 @@ /* drop through */ #endif *************** -*** 889,896 **** +*** 812,819 **** + val.fval /= arg.fval; + break; + case CI: +! setmode(&val, CF); +! setmode(&arg, CF); + /* drop through */ + case CF: + { +--- 812,819 ---- + val.fval /= arg.fval; + break; + case CI: +! xl_setmode(&val, CF); +! xl_setmode(&arg, CF); + /* drop through */ + case CF: + { +*************** +*** 856,863 **** + break; + } + else { +! setmode(&val, FL); +! setmode(&arg, FL); + } + /* drop through */ + case FL: +--- 856,863 ---- + break; + } + else { +! xl_setmode(&val, FL); +! xl_setmode(&arg, FL); + } + /* drop through */ + case FL: +*************** +*** 865,872 **** val.fval /= arg.fval; break; case CI: @@ -232,8 +227,8 @@ ! setmode(&arg, CF); /* drop through */ case CF: - #if 0 /* we can do better */ ---- 889,896 ---- + { +--- 865,872 ---- val.fval /= arg.fval; break; case CI: @@ -241,4 +236,4 @@ ! xl_setmode(&arg, CF); /* drop through */ case CF: - #if 0 /* we can do better */ + { diff -rNu xlispstat.old/patches/patch-ab xlispstat/patches/patch-ab --- xlispstat.old/patches/patch-ab Fri Aug 18 03:53:14 1995 +++ xlispstat/patches/patch-ab Sun Apr 18 22:14:11 1999 @@ -1,30 +1,65 @@ -*** Makefile.in.orig Fri Nov 4 04:32:49 1994 ---- Makefile.in Tue Aug 15 12:48:48 1995 +*** xllist.c.orig Sun Apr 18 22:12:23 1999 +--- xllist.c Sun Apr 18 22:13:39 1999 *************** -*** 35,41 **** - # CC -- usually cc, the C compiler to use - # LDCC -- usually also cc, the commant to link the objects - -! prefix = /usr/local - exec_prefix = ${prefix} - - XLSLIB=${prefix}/lib/xlispstat ---- 35,41 ---- - # CC -- usually cc, the C compiler to use - # LDCC -- usually also cc, the commant to link the objects +*** 991,997 **** + } -! prefix = ${PREFIX} - exec_prefix = ${prefix} + /* xsort - built-in function 'sort' */ +! LOCAL LVAL mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey) + { + /* Strategy: divide into two parts, (recurse) to sort each, then + merge them together */ +--- 991,997 ---- + } - XLSLIB=${prefix}/lib/xlispstat + /* xsort - built-in function 'sort' */ +! LOCAL LVAL xl_mergesort P3C(LVAL, list, LVAL, sortfcn, LVAL, sortkey) + { + /* Strategy: divide into two parts, (recurse) to sort each, then + merge them together */ *************** -*** 123,128 **** ---- 123,130 ---- - compiler/convert.fsl compiler/cells.fsl compiler/simplify.fsl \ - compiler/lift.fsl compiler/gencode.fsl compiler/peephole.fsl \ - compiler/assemble.fsl compiler/cmpfront.fsl -+ -+ all: xlispstat +*** 1018,1025 **** + rplacd(temp, NIL); /* split left and right parts */ + } - xlispstat: setup.shell xlisp.wks - ./setup.shell xlispstat ${XLSLIB} +! left = mergesort(left, sortfcn, sortkey); +! right = mergesort(right, sortfcn, sortkey); + + { + LVAL result, resultt = NULL, leftarg, rightarg; +--- 1018,1025 ---- + rplacd(temp, NIL); /* split left and right parts */ + } + +! left = xl_mergesort(left, sortfcn, sortkey); +! right = xl_mergesort(right, sortfcn, sortkey); + + { + LVAL result, resultt = NULL, leftarg, rightarg; +*************** +*** 1094,1105 **** + { + LVAL etype = gettvecetype(list); + list = coerce_to_list(list); +! list = mergesort(list, sortfcn, sortkey); + list = coerce_to_tvec(list, etype); + break; + } + case CONS: +! list = mergesort(list, sortfcn, sortkey); + break; + default: xlbadtype(list); + } +--- 1094,1105 ---- + { + LVAL etype = gettvecetype(list); + list = coerce_to_list(list); +! list = xl_mergesort(list, sortfcn, sortkey); + list = coerce_to_tvec(list, etype); + break; + } + case CONS: +! list = xl_mergesort(list, sortfcn, sortkey); + break; + default: xlbadtype(list); + } diff -rNu xlispstat.old/patches/patch-fp xlispstat/patches/patch-fp --- xlispstat.old/patches/patch-fp Wed Dec 31 19:00:00 1969 +++ xlispstat/patches/patch-fp Sun Apr 25 13:52:16 1999 @@ -0,0 +1,26 @@ +*** X11BSDstuff.c.orig Sun Apr 25 12:59:03 1999 +--- X11BSDstuff.c Sun Apr 25 13:50:35 1999 +*************** +*** 14,19 **** +--- 14,22 ---- + #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,56 **** +--- 54,62 ---- + VOID osinit(name) + char *name; + { ++ #ifdef __FreeBSD__ ++ fpsetmask(0); ++ #endif + time_stamp = time((time_t *) 0); + + disable_interrupts(); >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?19990503034800.1B11F15AD1>