diff options
author | John Marino <marino@FreeBSD.org> | 2016-08-23 16:25:35 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2016-08-23 16:25:35 +0000 |
commit | 0b70cc11ffd8c2dce5ad58d94d3a93062dd16caa (patch) | |
tree | f47957c34b21b51f26e3ff794dc0b0cca87973af /math | |
parent | net/tcpkali: document ncurses requirement (diff) |
math/oleo: document ncurses and remove extern errno
While here, regenerate all patches with makepatch
Notes
Notes:
svn path=/head/; revision=420708
Diffstat (limited to 'math')
23 files changed, 98 insertions, 82 deletions
diff --git a/math/oleo/Makefile b/math/oleo/Makefile index 2f56d8a0a06b..fada2bf2cbe1 100644 --- a/math/oleo/Makefile +++ b/math/oleo/Makefile @@ -3,17 +3,17 @@ PORTNAME= oleo PORTVERSION= 1.99.16 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= math MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org -COMMENT= The GNU spreadsheet for X11 and terminals +COMMENT= GNU spreadsheet for X11 and terminals LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= bison localbase perl5 +USES= bison localbase ncurses perl5 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-x --without-xlt --without-SciPlot diff --git a/math/oleo/files/patch-Makefile.in b/math/oleo/files/patch-Makefile.in index fe123bbbd2ad..242a49a5735b 100644 --- a/math/oleo/files/patch-Makefile.in +++ b/math/oleo/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Jul 22 18:51:35 2000 -+++ Makefile.in Fri Jul 28 04:28:46 2000 -@@ -124,14 +124,14 @@ +--- Makefile.in.orig 2001-03-10 14:32:45 UTC ++++ Makefile.in +@@ -124,14 +124,14 @@ ACLOCAL_AMFLAGS = -I m4 D = `date +%G%m%d.%H%M%S` @@ -15,5 +15,5 @@ -docdir = $(prefix)/Oleo +docdir = $(datadir)/doc/oleo doc_DATA = AUTHORS FAQ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + # remove all the symlinks that come from automake diff --git a/math/oleo/files/patch-Xresources_Makefile.in b/math/oleo/files/patch-Xresources_Makefile.in index c0d488ee0bbb..4e9f4d99d480 100644 --- a/math/oleo/files/patch-Xresources_Makefile.in +++ b/math/oleo/files/patch-Xresources_Makefile.in @@ -1,6 +1,6 @@ ---- Xresources/Makefile.in.orig 2001-03-10 15:32:46.000000000 +0100 -+++ Xresources/Makefile.in 2014-02-14 10:40:45.000000000 +0100 -@@ -41,7 +41,7 @@ +--- Xresources/Makefile.in.orig 2001-03-10 14:32:46 UTC ++++ Xresources/Makefile.in +@@ -41,7 +41,7 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include @@ -9,7 +9,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ -@@ -235,10 +235,10 @@ +@@ -235,10 +235,10 @@ mostlyclean distclean maintainer-clean install-data-hook: diff --git a/math/oleo/files/patch-configure.in b/math/oleo/files/patch-configure.in index dda291c3f25b..9541e59acab1 100644 --- a/math/oleo/files/patch-configure.in +++ b/math/oleo/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig Thu Nov 23 05:31:55 2000 -+++ configure.in Sat Dec 2 10:41:01 2000 -@@ -208,13 +208,15 @@ +--- configure.in.orig 2001-03-10 14:32:29 UTC ++++ configure.in +@@ -213,13 +213,15 @@ dnl This needs to be done after the X an dnl the libplot from GNU plotutils sometimes requires linking the dnl X and Motif libraries dnl diff --git a/math/oleo/files/patch-doc_Makefile.in b/math/oleo/files/patch-doc_Makefile.in index a5f5122a722b..346cd1474639 100644 --- a/math/oleo/files/patch-doc_Makefile.in +++ b/math/oleo/files/patch-doc_Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig Sat Mar 10 15:32:46 2001 -+++ doc/Makefile.in Mon Jun 7 21:52:58 2004 -@@ -87,7 +87,7 @@ +--- doc/Makefile.in.orig 2001-03-10 14:32:46 UTC ++++ doc/Makefile.in +@@ -87,7 +87,7 @@ INTLOBJS = @INTLOBJS@ LIBOBJS = @LIBOBJS@ LN_S = @LN_S@ MAINT = @MAINT@ @@ -9,7 +9,7 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ MOTIF_CFLAGS = @MOTIF_CFLAGS@ MOTIF_LIBS = @MOTIF_LIBS@ -@@ -125,7 +125,7 @@ +@@ -125,7 +125,7 @@ TEXIS = basics.texi bugs.texi cell-refs. EXTRA_DIST = $(TEXIS) oleo_web.html texi2html oleo1.png noinst_DATA = oleo_web.html $(TEXIS) diff --git a/math/oleo/files/patch-doc_oleo.texi b/math/oleo/files/patch-doc_oleo.texi index 45afb4206e7d..d3bf158a50bb 100644 --- a/math/oleo/files/patch-doc_oleo.texi +++ b/math/oleo/files/patch-doc_oleo.texi @@ -1,7 +1,7 @@ ---- doc/oleo.texi.orig Thu Dec 24 09:24:23 1998 -+++ doc/oleo.texi Sat Sep 18 03:24:39 1999 -@@ -2,6 +2,9 @@ - @c %**start of header +--- doc/oleo.texi.orig 2000-08-10 21:01:55 UTC ++++ doc/oleo.texi +@@ -7,6 +7,9 @@ + @setfilename oleo.info @settitle Oleo @value{version} +@direntry diff --git a/math/oleo/files/patch-doc_texi2html.in b/math/oleo/files/patch-doc_texi2html.in index 55ae0733ed44..64f19ec474ab 100644 --- a/math/oleo/files/patch-doc_texi2html.in +++ b/math/oleo/files/patch-doc_texi2html.in @@ -1,4 +1,4 @@ ---- doc/texi2html.in.orig 2015-04-20 17:22:33 UTC +--- doc/texi2html.in.orig 2000-04-08 12:20:05 UTC +++ doc/texi2html.in @@ -3790,9 +3790,9 @@ sub update_sec_num { my $ret; diff --git a/math/oleo/files/patch-po_Makefile.in.in b/math/oleo/files/patch-po_Makefile.in.in index 8c483b50f5c1..ad08c92213fc 100644 --- a/math/oleo/files/patch-po_Makefile.in.in +++ b/math/oleo/files/patch-po_Makefile.in.in @@ -1,6 +1,6 @@ ---- po/Makefile.in.in.orig 1998-08-27 23:15:29.000000000 +0200 -+++ po/Makefile.in.in 2014-02-14 10:38:35.000000000 +0100 -@@ -16,6 +16,8 @@ +--- po/Makefile.in.in.orig 1998-08-27 21:15:29 UTC ++++ po/Makefile.in.in +@@ -16,6 +16,8 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -9,7 +9,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = $(prefix)/@DATADIRNAME@ -@@ -111,16 +113,16 @@ +@@ -111,16 +113,16 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all if test -r "$(MKINSTALLDIRS)"; then \ @@ -30,7 +30,7 @@ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ -@@ -153,12 +155,12 @@ +@@ -153,12 +155,12 @@ install-data-yes: all done if test "$(PACKAGE)" = "gettext"; then \ if test -r "$(MKINSTALLDIRS)"; then \ diff --git a/math/oleo/files/patch-src_Makefile.in b/math/oleo/files/patch-src_Makefile.in index 279325421bce..1f8d86a9c165 100644 --- a/math/oleo/files/patch-src_Makefile.in +++ b/math/oleo/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Thu Nov 23 05:39:58 2000 -+++ src/Makefile.in Sat Dec 2 10:44:42 2000 -@@ -158,7 +158,7 @@ +--- src/Makefile.in.orig 2001-03-10 14:32:46 UTC ++++ src/Makefile.in +@@ -161,7 +161,7 @@ oleo_SOURCES = parse.y byte-compile.c ev @UseMotif_TRUE@MYCFL = ${X_CFLAGS} @UseMotif_FALSE@MYCFL = ${X_CFLAGS} @@ -9,7 +9,7 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC} CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL} -DBUILD_PREFIX='"'${BUILD_PREFIX}'"' -@@ -251,8 +251,8 @@ +@@ -254,8 +254,8 @@ ANSI2KNR = ../lib/ansi2knr @UseMotif_FALSE@@HaveXbase_FALSE@postscript$U.o pcl$U.o epson$U.o \ @UseMotif_FALSE@@HaveXbase_FALSE@prtext$U.o afm$U.o mdi$U.o gsl$U.o \ @UseMotif_FALSE@@HaveXbase_FALSE@plotter$U.o legend$U.o diff --git a/math/oleo/files/patch-src_basic.h b/math/oleo/files/patch-src_basic.h index 6cd7d73f0a2c..36ff38341ebe 100644 --- a/math/oleo/files/patch-src_basic.h +++ b/math/oleo/files/patch-src_basic.h @@ -1,6 +1,6 @@ ---- src/basic.h.orig 2008-02-08 16:40:42.000000000 +0100 -+++ src/basic.h 2008-02-08 16:40:48.000000000 +0100 -@@ -36,9 +36,6 @@ +--- src/basic.h.orig 2000-08-10 21:02:49 UTC ++++ src/basic.h +@@ -36,9 +36,6 @@ enum motion_magic extern const int colmagic[9]; extern const int rowmagic[9]; diff --git a/math/oleo/files/patch-src_eval.c b/math/oleo/files/patch-src_eval.c index aa889457419f..c28bffb162b5 100644 --- a/math/oleo/files/patch-src_eval.c +++ b/math/oleo/files/patch-src_eval.c @@ -1,6 +1,6 @@ ---- src/eval.c.orig Wed Jul 14 23:06:00 2004 -+++ src/eval.c Wed Jul 14 23:11:06 2004 -@@ -78,7 +78,11 @@ +--- src/eval.c.orig 2001-02-13 23:38:05 UTC ++++ src/eval.c +@@ -78,7 +78,11 @@ static void add_flt (); RETSIGTYPE math_sig (); #endif @@ -13,7 +13,7 @@ #ifdef SMALLEVAL int __to_flt (struct value *); int __to_int (struct value *); -@@ -565,7 +569,7 @@ +@@ -565,7 +569,7 @@ eval_expression (expr) case CONST_NINF: case CONST_NAN: p->type = TYP_FLT; @@ -22,7 +22,7 @@ break; case VAR: -@@ -1540,7 +1544,7 @@ +@@ -1540,7 +1544,7 @@ update_cell(CELL *cell) } int diff --git a/math/oleo/files/patch-src_global.h b/math/oleo/files/patch-src_global.h index 4594ce52a581..84f2c3c64c87 100644 --- a/math/oleo/files/patch-src_global.h +++ b/math/oleo/files/patch-src_global.h @@ -1,6 +1,14 @@ ---- src/global.h.org Thu Feb 15 05:54:50 2001 -+++ src/global.h Sat Jul 19 13:45:39 2003 -@@ -208,7 +208,7 @@ +--- src/global.h.orig 2001-02-14 20:54:50 UTC ++++ src/global.h +@@ -20,6 +20,7 @@ + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#include <errno.h> + #include "sysdef.h" + #include "utils.h" + +@@ -208,7 +209,7 @@ extern char mname[]; extern char nname[]; extern VOIDSTAR parse_hash; @@ -9,3 +17,11 @@ /* These have two uses. During parsing, these contain the * base address of all relative references. During evaluation, +@@ -231,7 +232,6 @@ extern int default_lock; + + extern unsigned short current_cycle; + extern int ioerror; +-extern int errno; + extern const char oleo_version_string[]; + + extern double astof (char **); diff --git a/math/oleo/files/patch-src_io-motif.c b/math/oleo/files/patch-src_io-motif.c index 383b6930ba57..3bd730f4465e 100644 --- a/math/oleo/files/patch-src_io-motif.c +++ b/math/oleo/files/patch-src_io-motif.c @@ -1,6 +1,6 @@ ---- src/io-motif.c.orig Wed Jan 19 18:23:57 2005 -+++ src/io-motif.c Wed Jan 19 18:26:41 2005 -@@ -1495,7 +1495,7 @@ +--- src/io-motif.c.orig 2001-03-09 11:33:29 UTC ++++ src/io-motif.c +@@ -1495,7 +1495,7 @@ static void TickTypeCB(Widget w, XtPoint #endif XmTextFieldSetEditable(tw, True); break; @@ -9,7 +9,7 @@ #if 0 fprintf(stderr, "Huh ? TickTypeCB(axis %d type %d) -> sensitive \n", axis, val); #endif -@@ -6058,7 +6058,11 @@ +@@ -6058,7 +6058,11 @@ void versionCB(Widget w, XtPointer clien #endif #ifdef HAVE_LIBPLOT @@ -21,7 +21,7 @@ xms1 = xms; xms2 = XmStringCreateLtoR(xbae, XmFONTLIST_DEFAULT_TAG); xms = XmStringConcat(xms1, xms2); -@@ -6142,6 +6146,7 @@ +@@ -6142,6 +6146,7 @@ MotifButton(int r, int c, char *lbl, cha return; } @@ -29,7 +29,7 @@ if (XbaeMatrixGetCellWidget(mat, r-1, c-1) == NULL) { button = XtVaCreateManagedWidget(lbl, xmPushButtonWidgetClass, mat, NULL); XbaeMatrixSetCellWidget(mat, r-1, c-1, button); -@@ -6151,4 +6156,5 @@ +@@ -6151,4 +6156,5 @@ MotifButton(int r, int c, char *lbl, cha fprintf(stderr, "MotifButton(%d,%d,%s,%s)\n", r-1, c-1, lbl, command); } diff --git a/math/oleo/files/patch-src_io-term.c b/math/oleo/files/patch-src_io-term.c index d0374732df68..225eacc87989 100644 --- a/math/oleo/files/patch-src_io-term.c +++ b/math/oleo/files/patch-src_io-term.c @@ -1,5 +1,5 @@ ---- src/io-term.c.orig 2014-02-14 10:32:37.000000000 +0100 -+++ src/io-term.c 2014-02-14 10:32:58.000000000 +0100 +--- src/io-term.c.orig 2001-02-13 23:38:06 UTC ++++ src/io-term.c @@ -1,7 +1,7 @@ /* * $Id: io-term.c,v 1.51 2001/02/13 23:38:06 danny Exp $ @@ -9,7 +9,7 @@ * * This file is part of Oleo, the GNU Spreadsheet. * -@@ -220,6 +220,7 @@ +@@ -220,6 +220,7 @@ do_set_option (char *ptr) { int set_opt = 1; int i, l; @@ -17,7 +17,7 @@ char *p; while (*ptr == ' ') -@@ -234,9 +235,11 @@ +@@ -234,9 +235,11 @@ do_set_option (char *ptr) if (Preferences[i].copynext) { ptr += strlen(Preferences[i].name) + 1; @@ -32,7 +32,7 @@ if (Preferences[i].cont == 0) return 1; -@@ -1023,7 +1026,7 @@ +@@ -1023,7 +1026,7 @@ main (int argc, char **argv) case 'v': case 'V': printf(_("%s %s\n"), GNU_PACKAGE, VERSION); diff --git a/math/oleo/files/patch-src_io-term.h b/math/oleo/files/patch-src_io-term.h index df73b04bdf98..cc108be9b05b 100644 --- a/math/oleo/files/patch-src_io-term.h +++ b/math/oleo/files/patch-src_io-term.h @@ -1,5 +1,5 @@ ---- src/io-term.h.orig 2008-02-08 16:38:59.000000000 +0100 -+++ src/io-term.h 2008-02-08 16:38:48.000000000 +0100 +--- src/io-term.h.orig 2001-02-10 08:27:04 UTC ++++ src/io-term.h @@ -21,6 +21,7 @@ */ diff --git a/math/oleo/files/patch-src_io-utils.c b/math/oleo/files/patch-src_io-utils.c index 05b02e8aa396..6eba715df165 100644 --- a/math/oleo/files/patch-src_io-utils.c +++ b/math/oleo/files/patch-src_io-utils.c @@ -1,6 +1,6 @@ ---- src/io-utils.c.org Sat Jul 19 13:42:11 2003 -+++ src/io-utils.c Sat Jul 19 13:48:32 2003 -@@ -71,7 +71,7 @@ +--- src/io-utils.c.orig 2001-02-13 23:38:06 UTC ++++ src/io-utils.c +@@ -71,7 +71,7 @@ char numb_oflo[] = "#################### double __plinf; double __neinf; @@ -9,7 +9,7 @@ char nname[] = "#NOT_A_NUMBER"; char iname[] = "#INFINITY"; -@@ -125,7 +125,7 @@ +@@ -125,7 +125,7 @@ init_infinity (void) __neinf = divide (-1., 0.); (void) signal (SIGFPE, ignore_sig); #endif diff --git a/math/oleo/files/patch-src_io-x11.c b/math/oleo/files/patch-src_io-x11.c index 99ddcb4ffad4..c4e15bfafb70 100644 --- a/math/oleo/files/patch-src_io-x11.c +++ b/math/oleo/files/patch-src_io-x11.c @@ -1,5 +1,5 @@ ---- src/io-x11.c.orig Wed Jul 14 23:14:24 2004 -+++ src/io-x11.c Wed Jul 14 23:14:28 2004 +--- src/io-x11.c.orig 2001-03-09 11:33:29 UTC ++++ src/io-x11.c @@ -34,7 +34,6 @@ #include <stdio.h> #include <ctype.h> diff --git a/math/oleo/files/patch-src_plotter.c b/math/oleo/files/patch-src_plotter.c index def62641a299..23d308a02997 100644 --- a/math/oleo/files/patch-src_plotter.c +++ b/math/oleo/files/patch-src_plotter.c @@ -1,6 +1,6 @@ ---- src/plotter.c.orig Wed Jan 19 18:27:00 2005 -+++ src/plotter.c Wed Jan 19 18:27:27 2005 -@@ -2639,7 +2639,7 @@ +--- src/plotter.c.orig 2000-11-22 19:33:01 UTC ++++ src/plotter.c +@@ -2639,7 +2639,7 @@ sp_plot_point(Multigrapher *mg, const Po case SP_PLOT_PIE: sp_pie_plot_point(mg, point); break; @@ -9,7 +9,7 @@ /* ?? */ } } -@@ -2770,7 +2770,7 @@ +@@ -2770,7 +2770,7 @@ sp_begin_plot(Multigrapher *mg, double s case SP_PLOT_PIE: sp_pie_begin_graph(mg, scale, trans_x, trans_y); break; @@ -18,7 +18,7 @@ /* ??? */ } -@@ -2790,7 +2790,7 @@ +@@ -2790,7 +2790,7 @@ sp_end_plot(Multigrapher *mg) case SP_PLOT_PIE: sp_pie_end_graph(mg); break; diff --git a/math/oleo/files/patch-src_posixtm.y b/math/oleo/files/patch-src_posixtm.y index 4f1e28324dec..30d8c75a2c53 100644 --- a/math/oleo/files/patch-src_posixtm.y +++ b/math/oleo/files/patch-src_posixtm.y @@ -1,6 +1,6 @@ ---- src/posixtm.y.orig Thu Jan 2 11:29:14 2003 -+++ src/posixtm.y Thu Jan 2 11:30:01 2003 -@@ -85,6 +85,7 @@ +--- src/posixtm.y.orig 2000-07-22 06:13:16 UTC ++++ src/posixtm.y +@@ -85,6 +85,7 @@ date : YYABORT; } } diff --git a/math/oleo/files/patch-src_ref.c b/math/oleo/files/patch-src_ref.c index f7e9c2a48953..12dc558afc5d 100644 --- a/math/oleo/files/patch-src_ref.c +++ b/math/oleo/files/patch-src_ref.c @@ -1,6 +1,6 @@ ---- src/ref.c.orig Wed Feb 14 08:38:06 2001 -+++ src/ref.c Sat Jul 19 13:51:39 2003 -@@ -263,7 +263,7 @@ +--- src/ref.c.orig 2001-02-13 23:38:06 UTC ++++ src/ref.c +@@ -263,7 +263,7 @@ char * read_new_value (CELLREF row, CELLREF col, char *form, char *val) { unsigned char *new_bytes; @@ -9,7 +9,7 @@ cur_row = row; cur_col = col; -@@ -348,7 +348,7 @@ +@@ -348,7 +348,7 @@ read_new_value (CELLREF row, CELLREF col else if (!stricmp (nname, val)) { SET_TYP (my_cell, TYP_FLT); diff --git a/math/oleo/files/patch-src_sysdef.h b/math/oleo/files/patch-src_sysdef.h index ffbad7e4255d..687ff3d69e0d 100644 --- a/math/oleo/files/patch-src_sysdef.h +++ b/math/oleo/files/patch-src_sysdef.h @@ -1,6 +1,6 @@ ---- src/sysdef.h.orig Sun Feb 4 16:54:21 2001 -+++ src/sysdef.h Sun Jun 6 23:08:43 2004 -@@ -119,7 +119,9 @@ +--- src/sysdef.h.orig 2001-02-04 15:54:21 UTC ++++ src/sysdef.h +@@ -119,7 +119,9 @@ extern char *strstr (); #endif /* !defined(__STDC__) */ diff --git a/math/oleo/files/patch-src_utils.c b/math/oleo/files/patch-src_utils.c index d5a8cc1fc8da..3370665208b8 100644 --- a/math/oleo/files/patch-src_utils.c +++ b/math/oleo/files/patch-src_utils.c @@ -1,5 +1,5 @@ ---- src/utils.c.orig Sun Jun 9 13:13:57 2002 -+++ src/utils.c Sun Jun 9 13:14:22 2002 +--- src/utils.c.orig 2001-02-13 23:38:06 UTC ++++ src/utils.c @@ -66,7 +66,7 @@ #define _IOSTRG 0 #endif diff --git a/math/oleo/files/patch-src_xrdb.c b/math/oleo/files/patch-src_xrdb.c index baec3df8fbe9..96bd16badeef 100644 --- a/math/oleo/files/patch-src_xrdb.c +++ b/math/oleo/files/patch-src_xrdb.c @@ -1,5 +1,5 @@ ---- src/xrdb.c.orig Wed Jul 14 23:30:28 2004 -+++ src/xrdb.c Wed Jul 14 23:30:29 2004 +--- src/xrdb.c.orig 2000-08-10 21:02:51 UTC ++++ src/xrdb.c @@ -57,7 +57,6 @@ /* This should be included before the X include files; otherwise, we get warnings about redefining NULL under BSD 4.3. */ |