From 770f6c44ca04e503fa563da56593b7540348f9dc Mon Sep 17 00:00:00 2001 From: markd Date: Sat, 12 Dec 2015 19:50:36 +0000 Subject: Update bc to 1.06.95 After nine years there is no evidence of a 1.07 coming out, and this version fixes segfaults if "-l" argument given. --- math/bc/Makefile | 8 ++--- math/bc/distinfo | 14 ++++---- math/bc/patches/patch-aa | 69 -------------------------------------- math/bc/patches/patch-ab | 45 ------------------------- math/bc/patches/patch-ac | 13 ------- math/bc/patches/patch-bc_storage.c | 12 +++++++ 6 files changed, 22 insertions(+), 139 deletions(-) delete mode 100644 math/bc/patches/patch-aa delete mode 100644 math/bc/patches/patch-ab delete mode 100644 math/bc/patches/patch-ac create mode 100644 math/bc/patches/patch-bc_storage.c (limited to 'math') diff --git a/math/bc/Makefile b/math/bc/Makefile index f3c6ef755b4..8028a3cf441 100644 --- a/math/bc/Makefile +++ b/math/bc/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2013/07/15 02:02:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2015/12/12 19:50:36 markd Exp $ -DISTNAME= bc-1.06 -PKGREVISION= 3 +DISTNAME= bc-1.06.95 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_GNU:=bc/} +MASTER_SITES= ftp://alpha.gnu.org/gnu/bc/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= reed@reedmedia.net HOMEPAGE= http://www.gnu.org/software/bc/bc.html diff --git a/math/bc/distinfo b/math/bc/distinfo index ead58fa4c60..1517341b93d 100644 --- a/math/bc/distinfo +++ b/math/bc/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 23:33:31 agc Exp $ +$NetBSD: distinfo,v 1.5 2015/12/12 19:50:36 markd Exp $ -SHA1 (bc-1.06.tar.gz) = c8f258a7355b40a485007c40865480349c157292 -RMD160 (bc-1.06.tar.gz) = e0394a090ad42f289a80de1dd26d2cf591f88481 -SHA512 (bc-1.06.tar.gz) = a61fa22689bccd843e5f99bfc0ec1fe5577536522392067e4e35bae0914250c1f7d198cfd8bfc4489b969cde0fb200c90028d0be06e99a99afa61f3ce841bf4e -Size (bc-1.06.tar.gz) = 278926 bytes -SHA1 (patch-aa) = 338b4e1232f4d10dee35183dec16b8da62f0cabf -SHA1 (patch-ab) = 7f51824877c1573c737c6fa5695d1f2443e3b335 -SHA1 (patch-ac) = f9213e083374b61a9db4aa3315d21a8579e0704f +SHA1 (bc-1.06.95.tar.bz2) = 18717e0543b1dda779a71e6a812f11b8261a705a +RMD160 (bc-1.06.95.tar.bz2) = d58c2d7a1f4b7bfa910f26e5809f3169a6e0da76 +SHA512 (bc-1.06.95.tar.bz2) = 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1 +Size (bc-1.06.95.tar.bz2) = 290069 bytes +SHA1 (patch-bc_storage.c) = e4b4304d40bf131a262b634f5b728b232048a2f1 diff --git a/math/bc/patches/patch-aa b/math/bc/patches/patch-aa deleted file mode 100644 index ee677e6260c..00000000000 --- a/math/bc/patches/patch-aa +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/29 23:57:38 reed Exp $ - ---- doc/bc.info.orig Fri Nov 15 18:09:27 2002 -+++ doc/bc.info Fri Nov 15 18:16:06 2002 -@@ -1,4 +1,9 @@ --This is bc.info, produced by makeinfo version 4.0 from bc.texi. -+This is bc.info, produced by makeinfo version 4.2 from bc.texi. -+ -+INFO-DIR-SECTION Mathematics -+START-INFO-DIR-ENTRY -+* bc: (bc). An arbitrary precision calculator language. -+END-INFO-DIR-ENTRY - -  - File: bc.info, Node: Top, Next: Introduction, Prev: (dir), Up: (dir) -@@ -971,29 +976,29 @@ - -  - Tag Table: --Node: Top65 --Node: Introduction354 --Node: Description515 --Node: Command Line Options1969 --Node: Basic Elements2533 --Node: Numbers2704 --Node: Variables3467 --Node: Comments4576 --Node: Expressions5317 --Node: About Expressions and Special Variables5597 --Node: Basic Expressions7333 --Node: Relational Expressions10274 --Node: Boolean Expressions11279 --Node: Precedence11834 --Node: Special Expressions12994 --Node: Statements14376 --Node: Pseudo Statements21001 --Node: Functions21649 --Node: Math Library Functions25703 --Node: Examples26413 --Node: Readline and Libedit Options28431 --Node: GNU `bc' and Other Implementations29458 --Node: Limits34700 --Node: Environment Variables35953 -+Node: Top203 -+Node: Introduction492 -+Node: Description653 -+Node: Command Line Options2107 -+Node: Basic Elements2671 -+Node: Numbers2842 -+Node: Variables3605 -+Node: Comments4714 -+Node: Expressions5455 -+Node: About Expressions and Special Variables5735 -+Node: Basic Expressions7471 -+Node: Relational Expressions10412 -+Node: Boolean Expressions11417 -+Node: Precedence11972 -+Node: Special Expressions13132 -+Node: Statements14514 -+Node: Pseudo Statements21139 -+Node: Functions21787 -+Node: Math Library Functions25841 -+Node: Examples26551 -+Node: Readline and Libedit Options28569 -+Node: GNU `bc' and Other Implementations29596 -+Node: Limits34838 -+Node: Environment Variables36091 -  - End Tag Table diff --git a/math/bc/patches/patch-ab b/math/bc/patches/patch-ab deleted file mode 100644 index 26e77477f3f..00000000000 --- a/math/bc/patches/patch-ab +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/09/29 23:57:39 reed Exp $ - ---- doc/dc.info.orig Fri Nov 15 18:09:53 2002 -+++ doc/dc.info Fri Nov 15 18:16:01 2002 -@@ -1,4 +1,9 @@ --This is dc.info, produced by makeinfo version 4.0 from dc.texi. -+This is dc.info, produced by makeinfo version 4.2 from dc.texi. -+ -+INFO-DIR-SECTION Mathematics -+START-INFO-DIR-ENTRY -+* dc: (dc). A reverse-polish arbitrary precision calculator. -+END-INFO-DIR-ENTRY - - START-INFO-DIR-ENTRY - * dc: (dc). Arbritrary precision RPN "Desktop Calculator". -@@ -425,17 +430,17 @@ - -  - Tag Table: --Node: Top1084 --Node: Introduction1663 --Node: Invocation2880 --Node: Printing Commands3724 --Node: Arithmetic4902 --Node: Stack Control7815 --Node: Registers8228 --Node: Parameters9154 --Node: Strings10415 --Node: Status Inquiry13385 --Node: Miscellaneous13942 --Node: Reporting bugs14909 -+Node: Top1227 -+Node: Introduction1806 -+Node: Invocation3023 -+Node: Printing Commands3867 -+Node: Arithmetic5045 -+Node: Stack Control7958 -+Node: Registers8371 -+Node: Parameters9297 -+Node: Strings10558 -+Node: Status Inquiry13528 -+Node: Miscellaneous14085 -+Node: Reporting bugs15052 -  - End Tag Table diff --git a/math/bc/patches/patch-ac b/math/bc/patches/patch-ac deleted file mode 100644 index 43db1cc7372..00000000000 --- a/math/bc/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/03/05 04:00:01 jlam Exp $ - ---- bc/scan.l.orig 2000-09-13 14:25:47.000000000 -0400 -+++ bc/scan.l -@@ -143,7 +143,7 @@ static int rl_len = 0; - - /* Definitions for readline access. */ - extern FILE *rl_instream; --_PROTOTYPE(char *readline, (char *)); -+_PROTOTYPE(char *readline, (const char *)); - - /* rl_input puts upto MAX characters into BUF with the number put in - BUF placed in *RESULT. If the yy input file is the same as diff --git a/math/bc/patches/patch-bc_storage.c b/math/bc/patches/patch-bc_storage.c new file mode 100644 index 00000000000..e5f40ba53bb --- /dev/null +++ b/math/bc/patches/patch-bc_storage.c @@ -0,0 +1,12 @@ +$NetBSD: patch-bc_storage.c,v 1.1 2015/12/12 19:50:36 markd Exp $ + +--- bc/storage.c.orig 2006-09-05 02:39:31.000000000 +0000 ++++ bc/storage.c +@@ -99,6 +99,7 @@ more_functions (VOID) + { + f = &functions[indx]; + f->f_defined = FALSE; ++ f->f_void = FALSE; + f->f_body = (char *) bc_malloc (BC_START_SIZE); + f->f_body_size = BC_START_SIZE; + f->f_code_size = 0; -- cgit v1.2.3