From 3214ff342d163fee59ec532df270495dc4133615 Mon Sep 17 00:00:00 2001 From: rh Date: Fri, 14 Jan 2000 14:01:58 +0000 Subject: Update pspp to 0.3.0 Version 0.3.0 changes since 0.2.3: Bugs fixed: * Using alphanumeric variables in functions under AGGREGATE segfaulted. Fixed. * Under certain circumstances, the final case would be omitted from the results of an AGGREGATE operation. Fixed. * Undefined behavior was invoked by referencing a freed pointer under certain circumstances. Fixed. * A wrong record size was displayed when paging the active file to disk. Fixed. * Not having enough temporary space for sorting caused a core dump. Fixed. * Syntax errors in function descriptions on AGGREGATE caused core dumps. Fixed. * A null pointer was dereferenced, causing a core dump, when PERCENTILES was specified on FREQUENCIES. This fixes the problem, but PSPP still doesn't calculate percentiles. * SORT always sorted in ascending order. Fixed. * Some minor memory leaks in the expression parser were removed. * Many assertions fixed for strict ANSI C compliance. New features: * SET ECHO ON now implemented, but turned off by default. * PRINT specifier supported on END REPEAT. Other: * System libgmp2 library is used if installed instead of unconditionally using the included libgmp2 subset. * Extensive code cleanup, which continues. * Added CORRELATIONS command parser, but not implemented. --- math/pspp/Makefile | 9 +-- math/pspp/files/md5 | 4 +- math/pspp/files/patch-sum | 10 ++- math/pspp/patches/patch-ae | 147 ++++++++++++++++++++++++++++++++++++++++----- math/pspp/patches/patch-af | 20 ------ math/pspp/patches/patch-ag | 22 +++---- math/pspp/patches/patch-ah | 35 +++++------ math/pspp/patches/patch-ai | 40 ------------ 8 files changed, 168 insertions(+), 119 deletions(-) delete mode 100644 math/pspp/patches/patch-af delete mode 100644 math/pspp/patches/patch-ai (limited to 'math/pspp') diff --git a/math/pspp/Makefile b/math/pspp/Makefile index 7f1a0276b76..70c0404e657 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2000/01/10 19:11:09 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2000/01/14 14:01:58 rh Exp $ # -DISTNAME= pspp-0.2.3 +DISTNAME= pspp-0.3.0 CATEGORIES= math MASTER_SITES= ftp://franz.stat.wisc.edu/pub/PSPP/ \ ftp://alpha.gnu.org/gnu/pspp/ \ @@ -15,7 +15,6 @@ MASTER_SITES= ftp://franz.stat.wisc.edu/pub/PSPP/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/pspp/ -BUILD_DEPENDS+= autoconf:../../devel/autoconf DEPENDS+= gettext-0.10.*:../../devel/gettext DEPENDS+= ncurses-4.2:../../devel/ncurses @@ -27,8 +26,6 @@ GNU_CONFIGURE= yes USE_GTEXINFO= yes CPPFLAGS+= -Dunix=1 -I${LOCALBASE}/include CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" - -pre-configure: - ( cd ${WRKSRC}; autoconf ) +MAKE_ENV+= pkgsysconfdir="${PREFIX}/etc/pspp" .include "../../mk/bsd.pkg.mk" diff --git a/math/pspp/files/md5 b/math/pspp/files/md5 index 4cb64ecea25..6e3d173a82c 100644 --- a/math/pspp/files/md5 +++ b/math/pspp/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/03/15 15:04:13 rh Exp $ +$NetBSD: md5,v 1.3 2000/01/14 14:01:58 rh Exp $ -MD5 (pspp-0.2.3.tar.gz) = 443ff3b375439e3251dd3603bf8fae5d +MD5 (pspp-0.3.0.tar.gz) = e01db3c380604220caa36100f7239bdf diff --git a/math/pspp/files/patch-sum b/math/pspp/files/patch-sum index 8b521b951cd..2e499d37557 100644 --- a/math/pspp/files/patch-sum +++ b/math/pspp/files/patch-sum @@ -1,11 +1,9 @@ -$NetBSD: patch-sum,v 1.2 1999/07/13 01:31:07 jlam Exp $ +$NetBSD: patch-sum,v 1.3 2000/01/14 14:01:59 rh Exp $ MD5 (patch-aa) = 9968f7f4de23ea02b29876c7747c6674 MD5 (patch-ab) = 2161f75ea660dc822ca8932adefbd41c MD5 (patch-ac) = 4b672f9e3362f831a189c081ecac77c0 MD5 (patch-ad) = 2475cc1df4ae97f3ac75faa0ec03e4eb -MD5 (patch-ae) = 76b940b16ed37b2f4f9ee4953728efd4 -MD5 (patch-af) = 904e1c38c142db62f227bde29175d4b4 -MD5 (patch-ag) = 77ce889c1f8583baf79bfa436c2053c5 -MD5 (patch-ah) = 445fdcab1dbe499faf36eed9ca31a942 -MD5 (patch-ai) = 1c40dcac24606d3a162cb4943738d123 +MD5 (patch-ae) = 75a4520813c40b90ef0d85e44735296e +MD5 (patch-ag) = 8266026b8939be3182112ba0a752769b +MD5 (patch-ah) = 98219ca6052a8f123a5f6d8311f689c9 diff --git a/math/pspp/patches/patch-ae b/math/pspp/patches/patch-ae index b77ae926b84..4e8a57191a3 100644 --- a/math/pspp/patches/patch-ae +++ b/math/pspp/patches/patch-ae @@ -1,15 +1,134 @@ -$NetBSD: patch-ae,v 1.1 1999/07/13 01:31:09 jlam Exp $ +$NetBSD: patch-ae,v 1.2 2000/01/14 14:01:59 rh Exp $ ---- src/error.c.orig Fri Aug 14 10:39:09 1998 -+++ src/error.c Thu Jul 8 14:31:59 1999 -@@ -50,7 +50,9 @@ - #include "command.h" - - #if HAVE_LIBHISTORY --#if HAVE_READLINE_HISTORY_H -+#if HAVE_HISTORY_H -+#include -+#elif HAVE_READLINE_HISTORY_H - #include - #else - int write_history (char *); +--- /dev/null Fri Jan 14 13:54:07 2000 ++++ src/getopt.h Fri Jan 14 13:53:30 2000 +@@ -0,0 +1,129 @@ ++/* Declarations for getopt. ++ Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify it ++ under the terms of the GNU General Public License as published by the ++ Free Software Foundation; either version 2, or (at your option) any ++ later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ++ ++#ifndef _GETOPT_H ++#define _GETOPT_H 1 ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* For communication from `getopt' to the caller. ++ When `getopt' finds an option that takes an argument, ++ the argument value is returned here. ++ Also, when `ordering' is RETURN_IN_ORDER, ++ each non-option ARGV-element is returned here. */ ++ ++extern char *optarg; ++ ++/* Index in ARGV of the next element to be scanned. ++ This is used for communication to and from the caller ++ and for communication between successive calls to `getopt'. ++ ++ On entry to `getopt', zero means this is the first call; initialize. ++ ++ When `getopt' returns EOF, this is the index of the first of the ++ non-option elements that the caller should itself scan. ++ ++ Otherwise, `optind' communicates from one call to the next ++ how much of ARGV has been scanned so far. */ ++ ++extern int optind; ++ ++/* Callers store zero here to inhibit the error message `getopt' prints ++ for unrecognized options. */ ++ ++extern int opterr; ++ ++/* Set to an option character which was unrecognized. */ ++ ++extern int optopt; ++ ++/* Describe the long-named options requested by the application. ++ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector ++ of `struct option' terminated by an element containing a name which is ++ zero. ++ ++ The field `has_arg' is: ++ no_argument (or 0) if the option does not take an argument, ++ required_argument (or 1) if the option requires an argument, ++ optional_argument (or 2) if the option takes an optional argument. ++ ++ If the field `flag' is not NULL, it points to a variable that is set ++ to the value given in the field `val' when the option is found, but ++ left unchanged if the option is not found. ++ ++ To have a long-named option do something other than set an `int' to ++ a compiled-in constant, such as set a value from `optarg', set the ++ option's `flag' field to zero and its `val' field to a nonzero ++ value (the equivalent single-letter option character, if there is ++ one). For long options that have a zero `flag' field, `getopt' ++ returns the contents of the `val' field. */ ++ ++struct option ++{ ++#if __STDC__ ++ const char *name; ++#else ++ char *name; ++#endif ++ /* has_arg can't be an enum because some compilers complain about ++ type mismatches in all the code that assumes it is an int. */ ++ int has_arg; ++ int *flag; ++ int val; ++}; ++ ++/* Names for the values of the `has_arg' field of `struct option'. */ ++ ++#define no_argument 0 ++#define required_argument 1 ++#define optional_argument 2 ++ ++#if __STDC__ ++#if defined(__GNU_LIBRARY__) ++/* Many other libraries have conflicting prototypes for getopt, with ++ differences in the consts, in stdlib.h. To avoid compilation ++ errors, only prototype getopt for the GNU C library. */ ++extern int getopt (int argc, char *const *argv, const char *shortopts); ++#else /* not __GNU_LIBRARY__ */ ++extern int getopt (); ++#endif /* not __GNU_LIBRARY__ */ ++extern int getopt_long (int argc, char *const *argv, const char *shortopts, ++ const struct option *longopts, int *longind); ++extern int getopt_long_only (int argc, char *const *argv, ++ const char *shortopts, ++ const struct option *longopts, int *longind); ++ ++/* Internal only. Users should not call this directly. */ ++extern int _getopt_internal (int argc, char *const *argv, ++ const char *shortopts, ++ const struct option *longopts, int *longind, ++ int long_only); ++#else /* not __STDC__ */ ++extern int getopt (); ++extern int getopt_long (); ++extern int getopt_long_only (); ++ ++extern int _getopt_internal (); ++#endif /* not __STDC__ */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _GETOPT_H */ diff --git a/math/pspp/patches/patch-af b/math/pspp/patches/patch-af deleted file mode 100644 index fb219fc4473..00000000000 --- a/math/pspp/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.1 1999/07/13 01:31:09 jlam Exp $ - ---- src/filename.c.orig Mon Jan 18 13:00:08 1999 -+++ src/filename.c Thu Jul 8 14:44:06 1999 -@@ -209,6 +209,7 @@ - } - } - -+#if !HAVE_TILDE_EXPAND - #if unix - /* Expands csh tilde notation from the path INPUT into a malloc()'d - returned string. */ -@@ -293,6 +294,7 @@ - return xstrdup (input); - } - #endif /* !unix */ -+#endif - - /* normalize_filename(): This very OS-dependent routine canonicalizes - filename FN1. The filename should not need to be the name of an diff --git a/math/pspp/patches/patch-ag b/math/pspp/patches/patch-ag index c72f97e2f3f..83511ed031e 100644 --- a/math/pspp/patches/patch-ag +++ b/math/pspp/patches/patch-ag @@ -1,14 +1,12 @@ -$NetBSD: patch-ag,v 1.1 1999/07/13 01:31:10 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2000/01/14 14:01:59 rh Exp $ ---- src/filename.h.orig Fri Aug 14 10:40:39 1998 -+++ src/filename.h Thu Jul 8 14:44:29 1999 -@@ -31,7 +31,9 @@ - const char *getenv_default (const char *key, const char *def); - char *interp_vars (const char *, const char *(*)(const char *)); +--- lib/misc/getdelim.c.orig Fri Mar 12 18:21:55 1999 ++++ lib/misc/getdelim.c Fri Jan 14 13:57:39 2000 +@@ -21,7 +21,6 @@ + #include + #include + #include +-#include "common.h" -+#if !HAVE_TILDE_EXPAND - char *tilde_expand (const char *); -+#endif - char *search_path (const char *name, const char *path, const char *prepend); - - char *gnu_getcwd (void); + /* Reads a DELIMITER-separated field of any length from file STREAM. + *LINEPTR is a malloc'd string of size N; if *LINEPTR is NULL, it is diff --git a/math/pspp/patches/patch-ah b/math/pspp/patches/patch-ah index 2900b33f224..a67b387f5e9 100644 --- a/math/pspp/patches/patch-ah +++ b/math/pspp/patches/patch-ah @@ -1,25 +1,22 @@ -$NetBSD: patch-ah,v 1.1 1999/07/13 01:31:11 jlam Exp $ +$NetBSD: patch-ah,v 1.2 2000/01/14 14:01:59 rh Exp $ ---- src/getline.c.orig Thu Jan 21 19:54:44 1999 -+++ src/getline.c Thu Jul 8 14:34:13 1999 -@@ -354,14 +354,18 @@ - /* PORTME: Adapt to your local system's idea of the terminal. */ - #if HAVE_LIBREADLINE +--- src/getline.c.orig Fri Jan 14 13:41:51 2000 ++++ src/getline.c Fri Jan 14 13:44:14 2000 +@@ -47,6 +47,8 @@ --#if HAVE_READLINE_READLINE_H -+#if HAVE_READLINE_H -+#include -+#elif HAVE_READLINE_READLINE_H + #if HAVE_READLINE_HISTORY_H + #include ++#elif HAVE_HISTORY_H ++#include + #else /* no readline/history.h */ + extern void add_history (char *); + extern void using_history (void); +@@ -407,6 +409,8 @@ + + #if HAVE_READLINE_READLINE_H #include ++#elif HAVE_READLINE_H ++#include #else /* no readline/readline.h */ extern char *readline (char *); #endif /* no readline/readline.h */ - - #if HAVE_LIBHISTORY --#if HAVE_READLINE_HISTORY_H -+#if HAVE_HISTORY_H -+#include -+#elif HAVE_READLINE_HISTORY_H - #include - #else /* no readline/history.h */ - extern void add_history (char *); diff --git a/math/pspp/patches/patch-ai b/math/pspp/patches/patch-ai deleted file mode 100644 index 4de3d021ffa..00000000000 --- a/math/pspp/patches/patch-ai +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ai,v 1.1 1999/07/13 01:31:11 jlam Exp $ - ---- src/glob.c.orig Fri Aug 14 10:39:16 1998 -+++ src/glob.c Thu Jul 8 15:10:52 1999 -@@ -42,16 +42,6 @@ - #endif /* !HAVE_TERMCAP_H */ - #endif /* !HAVE_LIBTERMCAP */ - --#if HAVE_LIBHISTORY --#if HAVE_READLINE_HISTORY_H --#include --#else /* no readline/history.h */ --extern void using_history (); --extern int read_history (); --extern void stifle_history (); --#endif /* no readline/history.h */ --#endif /* -lhistory */ -- - #if HAVE_FPU_CONTROL_H - #include - #elif __BORLANDC__ -@@ -86,6 +76,18 @@ - #include "avl.h" - #include "vfm.h" - #include "command.h" -+ -+#if HAVE_LIBHISTORY -+#if HAVE_HISTORY_H -+#include -+#elif HAVE_READLINE_HISTORY_H -+#include -+#else /* no readline/history.h */ -+extern void using_history (); -+extern int read_history (); -+extern void stifle_history (); -+#endif /* no readline/history.h */ -+#endif /* -lhistory */ - - /* var.h */ - dictionary default_dict; -- cgit v1.2.3