From fb4a03c1f1694a3d846034077572eb4e5f04967e Mon Sep 17 00:00:00 2001
From: Landon Curt Noll <github-mail@asthe.com>
Date: Mon, 18 Sep 2006 01:05:19 -0700
Subject: [PATCH] Release calc version 2.12.1.4

---
 CHANGES   | 7 +++++--
 check.awk | 6 +++---
 version.c | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 494572a..8bfe112 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@ The following are the changes from calc version 2.12.1 to date:
     Improved the support for cross-compiled environmens by using
     make symbols for all non-shell commands executed by Makefiles.
 
+    Fixed a problem with the make chk (and make check) awk script
+    which failed under OS X 10.4.7.
+
 
 The following are the changes from calc version 2.12.0 to 2.12.0.8:
 
@@ -6208,8 +6211,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.88 $
-## @(#) $Id: CHANGES,v 29.88 2006/09/18 06:29:07 chongo Exp $
+## @(#) $Revision: 29.89 $
+## @(#) $Id: CHANGES,v 29.89 2006/09/18 08:01:36 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
diff --git a/check.awk b/check.awk
index 6a71c2c..f036dfe 100644
--- a/check.awk
+++ b/check.awk
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.4 $
-# @(#) $Id: check.awk,v 29.4 2006/08/20 16:16:31 chongo Exp $
+# @(#) $Revision: 29.5 $
+# @(#) $Id: check.awk,v 29.5 2006/09/18 08:01:13 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/check.awk,v $
 #
 # Under source code control:	1996/05/25 22:07:58
@@ -64,7 +64,7 @@ NF == 0 {
 	end_seen = 1;
 }
 
-$1 ~ /^[0-9]+:/ || $1 ~ /^[0-9]+-[0-9]*:/ || $1 ~ /^"))$/ {
+$1 ~ /^[0-9]+:/ || $1 ~ /^[0-9]+-[0-9]*:/ || $1 ~ /^"\)\)$/ {
 	if (error > 0) {
 		if (havebuf2) {
 			print buf2;
diff --git a/version.c b/version.c
index 53bf2df..e9b9e44 100644
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.69 $
- * @(#) $Id: version.c,v 29.69 2006/09/18 06:29:07 chongo Exp $
+ * @(#) $Revision: 29.70 $
+ * @(#) $Id: version.c,v 29.70 2006/09/18 08:01:36 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -48,7 +48,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	1	/* patch level or 0 if no patch */
-#define MINOR_PATCH	3	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	4	/* test number or 0 if no minor patch */
 
 
 /*