From 18775fea0e4641d969bc7392a4467df9ad7af167 Mon Sep 17 00:00:00 2001 From: weingart Date: Sun, 28 May 2006 21:21:51 +0000 Subject: [PATCH] Update to sc-7.16 ok pval@ --- math/sc/Makefile | 7 +++--- math/sc/distinfo | 8 +++---- math/sc/patches/patch-Makefile | 41 +++++++++++----------------------- math/sc/patches/patch-abbrev_c | 16 +++++++++++++ math/sc/patches/patch-interp_c | 39 -------------------------------- math/sc/patches/patch-lex_c | 21 ++++------------- math/sc/patches/patch-pipe_c | 21 ----------------- math/sc/patches/patch-psc_c | 16 ++++--------- math/sc/patches/patch-sc_c | 30 +++++++++---------------- math/sc/patches/patch-sc_doc | 10 ++++----- math/sc/patches/patch-torev | 8 +++---- math/sc/pkg/PLIST | 3 ++- 12 files changed, 66 insertions(+), 154 deletions(-) create mode 100644 math/sc/patches/patch-abbrev_c delete mode 100644 math/sc/patches/patch-interp_c delete mode 100644 math/sc/patches/patch-pipe_c diff --git a/math/sc/Makefile b/math/sc/Makefile index dddf04c4c73..9b908fd23d0 100644 --- a/math/sc/Makefile +++ b/math/sc/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.8 2004/12/27 07:41:44 alek Exp $ +# $OpenBSD: Makefile,v 1.9 2006/05/28 21:21:51 weingart Exp $ COMMENT= "curses spreadsheet-calculator program" -DISTNAME= sc-7.15 -PKGNAME= ${DISTNAME}p1 +DISTNAME= sc-7.16 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/financial/spreadsheet/} @@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c curses m +WANTLIB= c curses m termcap MAN1= sc.1 psc.1 diff --git a/math/sc/distinfo b/math/sc/distinfo index 19f8845fbe8..002e4c5172d 100644 --- a/math/sc/distinfo +++ b/math/sc/distinfo @@ -1,4 +1,4 @@ -MD5 (sc-7.15.tar.gz) = 89c0d76f2c0aabe1cf1c80eae7a13e8f -RMD160 (sc-7.15.tar.gz) = e0daf761edfbdce30a78a4a9ff5b91dcb1027f58 -SHA1 (sc-7.15.tar.gz) = e75cccdbb62b64efd192f6279361294319c21823 -SIZE (sc-7.15.tar.gz) = 189849 +MD5 (sc-7.16.tar.gz) = 1db636e9b2dc7cd73c40aeece6852d47 +RMD160 (sc-7.16.tar.gz) = bcaffd292bc3d0868e5be870fee743c6b3294377 +SHA1 (sc-7.16.tar.gz) = 33c77561fbbecc7fa3cf0d62ce244172edd0de3d +SIZE (sc-7.16.tar.gz) = 210809 diff --git a/math/sc/patches/patch-Makefile b/math/sc/patches/patch-Makefile index 99c4b05fc87..0e67865f72d 100644 --- a/math/sc/patches/patch-Makefile +++ b/math/sc/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.3 2003/06/16 21:37:17 millert Exp $ ---- Makefile.orig Mon Nov 5 17:37:05 2001 -+++ Makefile Mon Jun 16 15:31:29 2003 +$OpenBSD: patch-Makefile,v 1.4 2006/05/28 21:21:51 weingart Exp $ +--- Makefile.orig Fri Sep 13 21:39:56 2002 ++++ Makefile Fri May 5 10:57:43 2006 @@ -20,19 +20,19 @@ NAME=SC # packaging this with an O/S, for example, you'll probably want to change # this to /usr. Otherwise, /usr/local is probably more appropriate, unless @@ -22,35 +22,15 @@ $OpenBSD: patch-Makefile,v 1.3 2003/06/16 21:37:17 millert Exp $ #LIBDIR=/usr/local/share/$(name) # reno -LIBDIR=${prefix}/lib/$(name) +LIBDIR=${PREFIX}/share/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up - #SIMPLE=-DSIMPLE -@@ -70,8 +70,8 @@ RINT= - - # Set RE_COMP if you have the re_comp/re_exec regular expression routines - # (most BSD based systems do). --#RE_COMP= --RE_COMP=-DRE_COMP -+RE_COMP= -+#RE_COMP=-DRE_COMP - - # Set REGCMP if you have the regcmp/regex regular expression routines - # (most System V based systems do) -@@ -149,7 +149,7 @@ RIGHTBUG= - # increase the number of terminals (mostly AT&T), SCO's does though. - # YACC=yacc - # NOTE: Do not use with bison 1.16! Get a new version.... --YACC=bison -y -+YACC=yacc - - # MS-DOS needs y_tab instead of the normal y.tab - #YTAB=y_tab -@@ -299,13 +299,14 @@ LN=ln +@@ -331,13 +331,19 @@ LN=ln ######################################### # Use this for Linux -CC=gcc -+CC?=gcc ++#CC=gcc # Only use -Wall for testing, since it produces warnings that are of no # real effect on the reliability of the program, but may concern some # people who don't understand them. @@ -59,7 +39,12 @@ $OpenBSD: patch-Makefile,v 1.3 2003/06/16 21:37:17 millert Exp $ -LIB=-lm -lncurses +#CFLAGS=-DSYSV3 -O2 -pipe +#LIB=-lm -lncurses -+LIB=-lm -lcurses ++ ++######################################### ++# Use this for OpenBSD ++CC?=cc ++LIB=-lm -lcurses -ltermcap ++YACC=yacc # All of the source files - SRC=Makefile color.c cmds.c crypt.c eres.sed frame.c format.c gram.y help.c \ + SRC=Makefile abbrev.c cmds.c color.c crypt.c eres.sed frame.c format.c gram.y \ diff --git a/math/sc/patches/patch-abbrev_c b/math/sc/patches/patch-abbrev_c new file mode 100644 index 00000000000..a80f7421146 --- /dev/null +++ b/math/sc/patches/patch-abbrev_c @@ -0,0 +1,16 @@ +$OpenBSD: patch-abbrev_c,v 1.1 2006/05/28 21:21:51 weingart Exp $ +--- abbrev.c.orig Tue Dec 18 12:22:10 2001 ++++ abbrev.c Fri May 5 11:06:05 2006 +@@ -43,10 +43,10 @@ add_abbr(char *string) + struct abbrev *a; + struct abbrev *nexta; + +- (void) strcpy(px, "| "); ++ (void) strlcpy(px, "| ", sizeof px); + if (!(pager = getenv("PAGER"))) + pager = DFLT_PAGER; +- (void) strcat(px, pager); ++ (void) strlcat(px, pager, sizeof px); + f = openfile(px, &pid, NULL); + if (!f) { + error("Can't open pipe to %s", pager); diff --git a/math/sc/patches/patch-interp_c b/math/sc/patches/patch-interp_c deleted file mode 100644 index b89f85f29ef..00000000000 --- a/math/sc/patches/patch-interp_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-interp_c,v 1.2 2002/08/06 00:45:17 pvalchev Exp $ ---- interp.c.orig Wed Nov 7 01:35:40 2001 -+++ interp.c Mon Aug 5 17:45:50 2002 -@@ -485,15 +485,13 @@ dotts(int hr, int min, int sec) - double - dotime(int which, double when) - { -- long time(); -- - static long t_cache; - static struct tm tm_cache; - struct tm *tp; -- long tloc; -+ time_t tloc; - - if (which == NOW) -- return (double)time((long *)0); -+ return (double)time(NULL); - - tloc = (long)when; - -@@ -944,7 +942,7 @@ docat(register char *s1, register char * - } - - char * --dodate(long tloc) -+dodate(time_t tloc) - { - char *tp; - char *p; -@@ -1199,7 +1197,7 @@ seval(register struct enode *se) - case IF: - case '?': return (eval(se->e.o.left) ? seval(se->e.o.right->e.o.left) - : seval(se->e.o.right->e.o.right)); -- case DATE: return (dodate((long)(eval(se->e.o.right)))); -+ case DATE: return (dodate((time_t)(eval(se->e.o.right)))); - case FMT: return (dofmt(seval(se->e.o.left), eval(se->e.o.right))); - case UPPER: return (docase(UPPER, seval(se->e.o.right))); - case LOWER: return (docase(LOWER, seval(se->e.o.right))); diff --git a/math/sc/patches/patch-lex_c b/math/sc/patches/patch-lex_c index 513eb1e009f..819afe0f8bf 100644 --- a/math/sc/patches/patch-lex_c +++ b/math/sc/patches/patch-lex_c @@ -1,20 +1,7 @@ -$OpenBSD: patch-lex_c,v 1.3 2003/06/16 21:37:17 millert Exp $ ---- lex.c.orig Mon Nov 5 17:40:12 2001 -+++ lex.c Mon Jun 16 15:25:30 2003 -@@ -433,10 +433,10 @@ char dont_use[] = { - ctl('x'), ctl('z'), 0 - }; - --void -+int - charout(int c) - { -- (void)putchar(c); -+ return putchar(c); - } - - void -@@ -592,7 +592,7 @@ nmgetch() +$OpenBSD: patch-lex_c,v 1.4 2006/05/28 21:21:51 weingart Exp $ +--- lex.c.orig Thu May 4 09:52:42 2006 ++++ lex.c Thu May 4 09:52:54 2006 +@@ -642,7 +642,7 @@ nmgetch() #endif diff --git a/math/sc/patches/patch-pipe_c b/math/sc/patches/patch-pipe_c deleted file mode 100644 index 01da01c26f5..00000000000 --- a/math/sc/patches/patch-pipe_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-pipe_c,v 1.1 2002/08/06 00:45:17 pvalchev Exp $ ---- pipe.c.orig Mon Nov 5 17:40:19 2001 -+++ pipe.c Mon Aug 5 18:29:30 2002 -@@ -8,6 +8,7 @@ - */ - - #include -+#include - #include - #include "sc.h" - -@@ -19,9 +20,6 @@ - #endif - #else - #include --#ifndef SYSIII --#include --#endif - #endif - - diff --git a/math/sc/patches/patch-psc_c b/math/sc/patches/patch-psc_c index 6e58da29848..e2119b5dcf1 100644 --- a/math/sc/patches/patch-psc_c +++ b/math/sc/patches/patch-psc_c @@ -1,15 +1,7 @@ -$OpenBSD: patch-psc_c,v 1.1 2002/08/06 00:45:17 pvalchev Exp $ ---- psc.c.orig Mon Nov 5 17:40:27 2001 -+++ psc.c Mon Aug 5 17:47:42 2002 -@@ -22,7 +22,6 @@ char *rev = "$Revision: 1.1 $"; - #include - #include - #include --#include - #include "sc.h" - - #define END 0 -@@ -73,7 +72,7 @@ main(int argc, char **argv) +$OpenBSD: patch-psc_c,v 1.2 2006/05/28 21:21:51 weingart Exp $ +--- psc.c.orig Thu May 4 10:08:27 2006 ++++ psc.c Thu May 4 10:08:34 2006 +@@ -73,7 +73,7 @@ main(int argc, char **argv) register char *p; progname = argv[0]; diff --git a/math/sc/patches/patch-sc_c b/math/sc/patches/patch-sc_c index 3be03c55149..1eb574c7c95 100644 --- a/math/sc/patches/patch-sc_c +++ b/math/sc/patches/patch-sc_c @@ -1,29 +1,21 @@ -$OpenBSD: patch-sc_c,v 1.1 2002/08/06 00:45:17 pvalchev Exp $ ---- sc.c.orig Wed Nov 7 18:12:02 2001 -+++ sc.c Mon Aug 5 17:47:16 2002 -@@ -16,7 +16,6 @@ - #include - #include - #include --#include - - #ifdef BSD42 - #include -@@ -262,7 +261,7 @@ main (int argc, char **argv) +$OpenBSD: patch-sc_c,v 1.2 2006/05/28 21:21:51 weingart Exp $ +--- sc.c.orig Thu May 4 10:10:28 2006 ++++ sc.c Thu May 4 10:10:40 2006 +@@ -274,7 +274,7 @@ main (int argc, char **argv) else progname = argv[0]; -- while ((c = getopt(argc, argv, "axmoncrCReP:vq")) != EOF) { -+ while ((c = getopt(argc, argv, "axmoncrCReP:vq")) != -1) { +- while ((c = getopt(argc, argv, "axmoncrCReP:W:vq")) != EOF) { ++ while ((c = getopt(argc, argv, "axmoncrCReP:W:vq")) != -1) { switch (c) { case 'a': skipautorun = 1; -@@ -403,7 +402,7 @@ main (int argc, char **argv) - - optind = 0; +@@ -425,7 +425,7 @@ main (int argc, char **argv) + #endif + optind = 1; stopdisp(); -- while ((o = getopt(argc, argv, "xmoncrCReP:vq")) != EOF) { -+ while ((o = getopt(argc, argv, "xmoncrCReP:vq")) != -1) { +- while ((o = getopt(argc, argv, "axmoncrCReP:W:vq")) != EOF) { ++ while ((o = getopt(argc, argv, "axmoncrCReP:W:vq")) != -1) { switch (o) { case 'v': Vopt = 1; diff --git a/math/sc/patches/patch-sc_doc b/math/sc/patches/patch-sc_doc index 8e3348150ee..52fcb6055dd 100644 --- a/math/sc/patches/patch-sc_doc +++ b/math/sc/patches/patch-sc_doc @@ -1,7 +1,7 @@ -$OpenBSD: patch-sc_doc,v 1.3 2003/06/16 20:19:29 pvalchev Exp $ ---- sc.doc.orig Thu Nov 8 04:16:18 2001 -+++ sc.doc Mon Aug 5 18:37:40 2002 -@@ -111,7 +111,7 @@ often based on other cell values. +$OpenBSD: patch-sc_doc,v 1.4 2006/05/28 21:21:51 weingart Exp $ +--- sc.doc.orig Thu May 4 10:12:29 2006 ++++ sc.doc Thu May 4 10:13:05 2006 +@@ -113,7 +113,7 @@ often based on other cell values. .LP For an online tutorial, type the command: .IP @@ -10,7 +10,7 @@ $OpenBSD: patch-sc_doc,v 1.3 2003/06/16 20:19:29 pvalchev Exp $ .LP To print a quick reference card, type the command: .IP -@@ -3926,7 +3926,7 @@ Undefining the F1 key will restore the d +@@ -4441,7 +4441,7 @@ the specified filename. .\" ========== .SH FILES .TP 3in diff --git a/math/sc/patches/patch-torev b/math/sc/patches/patch-torev index 785882b0307..a8704e1eb15 100644 --- a/math/sc/patches/patch-torev +++ b/math/sc/patches/patch-torev @@ -1,8 +1,8 @@ -$OpenBSD: patch-torev,v 1.1 2003/06/16 20:19:29 pvalchev Exp $ ---- torev.orig Fri Mar 7 12:47:43 2003 -+++ torev Fri Mar 7 12:48:16 2003 +$OpenBSD: patch-torev,v 1.2 2006/05/28 21:21:51 weingart Exp $ +--- torev.orig Thu May 4 10:04:39 2006 ++++ torev Thu May 4 10:05:46 2006 @@ -1,4 +1,5 @@ - REVISION=`sed -e '/Revision/!D' -e 's/.*$Revision: 1.1 $.*/\1/' version.c` + REVISION=`sed -e '/Revision/!D' -e 's/.*$Revision: 1.2 $.*/\1/' version.c` sed -e s/pname/$name/g -e s/PNAME/$NAME/g \ -e "s%#LIBDIR#%$LIBDIR%g" \ - -e "s/#REVISION#/$REVISION/" $1 diff --git a/math/sc/pkg/PLIST b/math/sc/pkg/PLIST index 5529a5baaaa..a2269a668b4 100644 --- a/math/sc/pkg/PLIST +++ b/math/sc/pkg/PLIST @@ -1,8 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/09/15 09:12:00 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2006/05/28 21:21:51 weingart Exp $ bin/psc bin/sc bin/scqref @man man/man1/psc.1 @man man/man1/sc.1 share/sc/ +share/sc/plugins/ share/sc/tutorial.sc