Release calc version 2.12.5.3

Release calc version 2.12.5.2
Release calc version 2.12.5.0
2025-08-22 01:23:28 +03:00 · 2017-05-21 15:39:01 -07:00 · 2017-05-21 15:39:00 -07:00 · 2017-05-21 15:39:00 -07:00
26 changed files with 741 additions and 635 deletions
--- a/60
+++ b/60
@@ -32,16 +32,25 @@ If you have tried all of the above and things still are not right,
 then it may be time to send in a bug report.  You can send bug
 and bug fixes reports to:

-    calc-bugs at asthe dot com
+	calc-bug-report at asthe dot com

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe', the web site URL uses 'isthe' ]]
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-Your subject must contain the words:
+    This replaces the old calc-bugs at asthe dot com address.

-       calc bug report
+    To be sure we see your EMail reporting a calc bug, please use the
+    following phase in your EMail Subject line:

-You may have additional words in your subject line.
+	calc bug report
+
+    That phrase in your subject line will help ensure your request
+    will get past our anti-spam filters.  You may have additional
+    words in your subject line.
+
+    However, you may find it more helpful to simply subscribe
+    to the calc-tester mailing list (see below) and then to
+    send your report to that mailing list as a wider set calc
+    testers may be able to help you.

 When you send your report, please include the following information:

@@ -77,14 +86,6 @@ Known bugs:

 =-=

-Problems that have known work-a-rounds:
-
-    * There is a bug in gcc v4.1.0 that causes calc to fail the regression
-      test.  The work-a-round is to compile with gcc v4.1.1 or later.  This
-      problems was observed on Fedora 5.
-
-=-=
-
 mis-features in calc:

    Some problems are not bugs but rather mis-features / things that could
@@ -132,6 +133,33 @@ mis-features in calc:

      will not.

+=-=
+
+To subscribe to the calc-tester mailing list, visit the following URL:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
+
+    This is a low volume moderated mailing list.
+
+    This mailing list replaces calc-tester at asthe dot com list.
+
+    If you need a human to help you with your mailing list subscription,
+    please send EMail to our special:
+
+	calc-tester-maillist-help at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    address.  To be sure we see your EMail asking for help with your
+    mailing list subscription, please use the following phase in your
+    EMail Subject line:
+
+	calc tester mailing list help
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
 ## Copyright (C) 1999-2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
@@ -148,8 +176,8 @@ mis-features in calc:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.3 $
-## @(#) $Id: BUGS,v 30.3 2014/09/07 06:20:41 chongo Exp $
+## @(#) $Revision: 30.5 $
+## @(#) $Id: BUGS,v 30.5 2014/10/12 12:23:43 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13
--- a/122
+++ b/122
@@ -1,4 +1,118 @@
-The following are the changes from calc version 2.12.4.14 to date:
+The following are the changes from calc version 2.12.5.3 to date:
+
+    Calc version 2.12.5.2 for Darwin (Mac OS X) users, code to installed
+    calc under /opt/calc.  Moreover the CHANGES file did not mention
+    /opt/calc.  Sorry about that!.
+
+    A much better tree for Darwin (Mac OS X) users would have been
+    to install cal under /opt/calc.  This release ONLY changes the Darwin
+    (Mac OS X) install tree to /usr/local.
+
+    Darwin (Mac OS X) users who installed calc version 2.12.5.2
+    should, after installing version 2.12.5.3:
+
+    	rm -rf /opt/calc
+
+
+The following are the changes from calc version 2.12.5.1 to 2.12.5.2:
+
+    NOTE: calc version 2.12.5.2, for Darwin (Mac OS X) users,
+    	  installed under /opt/calc.  We neglected to mention this
+	  AND /usr/local would have been a better choice.  Sorry!
+	  Fixed in calc version 2.12.5.3.
+
+    Removed rules and makefile variables assocated with shortened
+    calc version numbers of less than 4 levels.
+
+    Under OS X (darwin), if /usr/include is missing, warnings
+    are issued to help the user use xcode-select --install
+    so that one may properly compile C code.
+
+    Lowered REDC levels:
+
+	#define MAXREDC 256	/* number of entries in REDC cache */
+
+	#define SQ_ALG2 28	/* size for alternative squaring */
+	    config("sq2") == 28		/* was 3388 */
+	#define MUL_ALG2 28	/* size for alternative multiply */
+	    config("mul2") == 28	/* was 1780 */
+	#define POW_ALG2 20	/* size for using REDC for powers */
+	    config("pow2") == 20	/* was 176 */
+	#define REDC_ALG2 25	/* size for using alternative REDC */
+	    config("redc2") == 25	/* was 220 */
+
+    The alg_config.cal script appears to be not correctly finding the
+    best REDC values.  While it has been improved, alg_config.cal still
+    seems to be suspect on how it attempts to find the best values.
+
+    Fixed an intro help file mistake found by Roger Hardiman
+    <roger at rjh dot org dot uk>.
+
+
+The following are the changes from calc version 2.12.5.0 to 2.12.5.1:
+
+    Calc has a new calc-tester mailing list.  This list is for those
+    who are using/testing calc.  We also use this list to announce
+    new versions of calc.  To subscribe to the calc-tester mailing
+    list, visit the following URL:
+
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
+
+	This is a low volume moderated mailing list.
+
+	This mailing list replaces calc-tester at asthe dot com list.
+
+	If you need a human to help you with your mailing list subscription,
+	please send EMail to our special:
+
+	    calc-tester-maillist-help at asthe dot com
+
+	address.  To be sure we see your EMail asking for help with your
+	mailing list subscription, please use the following phase in your
+	EMail Subject line:
+
+	    calc tester mailing list help
+
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.
+
+    There is a new calc bug report EMail address:
+
+	    calc-bug-report at asthe dot com
+
+	This replaces the old calc-bugs at asthe dot com address.
+
+	To be sure we see your EMail reporting a calc bug, please use the
+	following phase in your EMail Subject line:
+
+	    calc bug report
+
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.
+
+	However, you may find it more helpful to simply subscribe
+	to the calc-tester mailing list (see above) and then to
+	send your report to that mailing list as a wider set calc
+	testers may be able to help you.
+
+    The following makefile rules that were related to printing the
+    upper values of the calc version, rules that were made obsolete
+    in calc version 2.12.4.14, have been removed:
+
+	calc_vers calc_ver calc_ve
+	vers ver ve
+
+    Noted that the hash() builtin function, internally known as
+    quickhash (used for internal objects such as the associative
+    arrays as well as other internal processes) uses the deprcated
+    32-bit FNV-0 hash.  The use of this deprecated hash is sufficient
+    for calc internal purposes.  Use of FNV-1a is recommended for
+    a general non-cryptographic quick hash.
+
+
+The following are the changes from calc version 2.12.4.14 to 2.12.5.0:

    For Apple OS X / Darwin target:

@@ -7027,7 +7141,7 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:

    A small bug in the library file regress.cal was fixed.

-## Copyright (C) 2001  Landon Curt Noll
+## Copyright (C) 2001-2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -7043,8 +7157,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.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.44 $
-## @(#) $Id: CHANGES,v 30.44 2014/09/22 03:40:07 chongo Exp $
+## @(#) $Revision: 30.50 $
+## @(#) $Id: CHANGES,v 30.50 2016/02/08 22:09:34 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
--- a/65
+++ b/65
@@ -6,14 +6,14 @@ This file is Copyrighted

    This file is covered under the following Copyright:

-	Copyright (C) 1999-2008  Landon Curt Noll
+	Copyright (C) 1999-2014  Landon Curt Noll
 	All rights reserved.

 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.

-    # @(#) $Revision: 30.4 $
-    # @(#) $Id: COPYING,v 30.4 2013/09/01 20:14:30 chongo Exp $
+    # @(#) $Revision: 30.6 $
+    # @(#) $Id: COPYING,v 30.6 2014/10/12 12:23:43 chongo Exp $
    # @(#) $Source: /usr/local/src/bin/calc/RCS/COPYING,v $

 -=-
@@ -53,45 +53,62 @@ Calc is covered by the GNU Lesser General Public License
 	    Boston, MA  02110-1301
 	    USA

-    The contact addresses for calc is as follows:
+    To subscribe to the calc-tester mailing list, visit the following URL:

-	Web:	http://www.isthe.com/chongo/tech/comp/calc/email.html
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html

-    To join the low volume calc mailing list.  Send a EMail message to:
+	This is a low volume moderated mailing list.

-	calc-tester-request at asthe dot com
+	This mailing list replaces calc-tester at asthe dot com list.

-    Your subject must contain the words:
+	If you need a human to help you with your mailing list subscription,
+	please send EMail to our special:

-	calc mailing list subscription
+	    calc-tester-maillist-help at asthe dot com

-    You may have additional words in your subject line.
+	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-    Your message body (not the subject) should consist of:
+	address.  To be sure we see your EMail asking for help with your
+	mailing list subscription, please use the following phase in your
+	EMail Subject line:

-	 subscribe calc-tester address
-	 end
-	 name your_full_name
+	    calc tester mailing list help

-    where ``address'' is your EMail address and ``your_full_name'' is
-    your full name.
-
-    Feel free to follow the name line with additional EMail text as desired.
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.

 -=-

    Calc bug reports and calc bug fixes should be sent to:

-	calc-bugs at asthe dot com
+	    calc-bug-report at asthe dot com

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-    Your subject must contain the words:
+	This replaces the old calc-bugs at asthe dot com address.

-	   calc bug report
+	To be sure we see your EMail reporting a calc bug, please use the
+	following phase in your EMail Subject line:

-    You may have additional words in your subject line.
+	    calc bug report
+
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.
+
+	However, you may find it more helpful to simply subscribe
+	to the calc-tester mailing list (see above) and then to
+	send your report to that mailing list as a wider set calc
+	testers may be able to help you.
+
+-=-
+
+    The calc web site is located at:
+
+	http://www.isthe.com/chongo/tech/comp/calc/
+
+    NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.

 -=-

--- a/218
+++ b/218
@@ -39,8 +39,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 30.75 $$
-# @(#) $Id: Makefile.ship,v 30.75 2014/09/21 14:09:18 chongo Exp $
+MAKEFILE_REV= $$Revision: 30.85 $$
+# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $
 # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -846,6 +846,15 @@ READLINE_EXTRAS=
 #READLINE_LIB= -L/sw/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
 #
+# For Apple OS X: install homebrew and then:
+#
+#	brew install readline
+#
+# and use:
+#
+#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
+#READLINE_EXTRAS= -lhistory -lncurses
+#
 READLINE_INCLUDE=
 #READLINE_INCLUDE= -I/usr/gnu/include
 #READLINE_INCLUDE= -I/usr/local/include
@@ -975,22 +984,13 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.14
+VERSION= 2.12.5.3

 # Names of shared libraries with versions
 #
 LIB_EXT= .so
 LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}

-# legacy partial versions are no longer used, only removed
-#
-VERS= 2.12.4
-VER= 2.12
-VE= 2
-LIB_EXT_VERS= ${LIB_EXT}.${VERS}
-LIB_EXT_VER= ${LIB_EXT}.${VER}
-LIB_EXT_VE= ${LIB_EXT}.${VE}
-
 # standard utilities used during make
 #
 SHELL= /bin/sh
@@ -1215,10 +1215,6 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 # Darwin dynamic shared lib filenames
 LIB_EXT:= .dylib
 LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
-# legacy partial versions are no longer used, only removed
-LIB_EXT_VERS:= .${VERS}${LIB_EXT}
-LIB_EXT_VER:= .${VER}${LIB_EXT}
-LIB_EXT_VE:= .${VE}${LIB_EXT}
 # LDCONFIG not required on this platform, so we redefine it to an empty string
 LDCONFIG:=
 # DARWIN_ARCH= -arch i386 -arch ppc	# Universal binary
@@ -1227,6 +1223,15 @@ LDCONFIG:=
 # DARWIN_ARCH= -arch x86_64		# native 64-bit binary
 DARWIN_ARCH=				# native binary
 #
+# Starting with El Capitan OS X 10.11, root by default could not
+# mkdir under system locations, so we now use the /usr/local tree.
+#
+OPTDIR:= /usr/local
+BINDIR:= /${OPTDIR}/bin
+LIBDIR:= /${OPTDIR}/lib
+CALC_SHAREDIR:= /${OPTDIR}/share
+CALC_INCDIR:= /${OPTDIR}/include
+SCRIPTDIR:= ${BINDIR}/cscript
 endif

 ##################
@@ -1771,9 +1776,6 @@ CUSTOM_PASSDOWN=  \
    TOUCH=${TOUCH} \
    TRUE=${TRUE} \
    VERSION=${VERSION} \
-    VERS=${VERS} \
-    VER=${VER} \
-    VE=${VE} \
    target=${target}

 # The complete list of Makefile vars passed down to help/Makefile.
@@ -1991,7 +1993,33 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 #
 ###

-all: ${BLD_TYPE} CHANGES
+all: check_include ${BLD_TYPE} CHANGES
+
+check_include:
+	$(Q) if [ ! -d /usr/include ]; then \
+	    echo "ERROR: critical directory missing: /usr/include" 1>&2; \
+	    echo "Without this critical directory, we cannot compile." 1>&2; \
+	    echo 1>&2; \
+	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
+	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
+	    echo "must be installed and that you run the command:" 1>&2; \
+	    echo 1>&2; \
+	    echo "    xcode-select --install" 1>&2; \
+	    echo 1>&2; \
+	    exit 1; \
+	fi
+	$(Q) if [ ! -f /usr/include/stdio.h ]; then \
+	    echo "ERROR: critical include files are missing" 1>&2; \
+	    echo "Without this critical directory, we cannot compile." 1>&2; \
+	    echo 1>&2; \
+	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
+	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
+	    echo "must be installed and that you run the command:" 1>&2; \
+	    echo 1>&2; \
+	    echo "    xcode-select --install" 1>&2; \
+	    echo 1>&2; \
+	    exit 1; \
+	fi

 prep:
 	${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3'
@@ -2104,6 +2132,7 @@ calc.1: calc.man ${MAKE_FILE}
 	${Q} echo forming calc.1 from calc.man
 	@${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
 	        -e 's,$${BINDIR},${BINDIR},g' \
+	        -e 's,$${VERSION},${VERSION},g' \
 	        -e 's,$${CALCPATH},${CALCPATH},g' \
 	        -e 's,$${SCRIPTDIR},${SCRIPTDIR},g' \
 	        -e 's,$${CALC_INCDIR},${CALC_INCDIR},g' \
@@ -3733,57 +3762,6 @@ ver_calc${EXT}: version.c have_unused.h
 	${RM} -f $@
 	${LCC} ${ICFLAGS} -DCALC_VER ${ILDFLAGS} version.c -o $@

-###
-#
-# legacy partial versions are no longer used, only removed
-#
-# calc_vers:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	3 level version string.
-#
-# calc_ver:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	2 level version string.
-#
-# calc_ve:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	1 level version string.
-#
-# vers:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 3 level version string.
-#
-# ver:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 2 level version string.
-#
-# ve:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 1 level version string.
-#
-###
-
-calc_vers: ver_calc${EXT}
-	@./ver_calc${EXT} -V
-
-calc_ver: ver_calc${EXT}
-	@./ver_calc${EXT} -V | ${SED} -e 's/\.[^.]*$$//'
-
-calc_ve: ver_calc${EXT}
-	@./ver_calc${EXT} -V | ${SED} -e 's/\.[^.]*\.[^.]*$$//'
-
-vers:
-	@echo ${VERS}
-
-ver:
-	@echo ${VER}
-
-ve:
-	@echo ${VE}
-
 ###
 #
 # File distribution list generation.  You can ignore this section.
@@ -4306,12 +4284,6 @@ clobber: custom/Makefile clean
 	cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo remove files that are obsolete
-	${RM} -f libcalc${LIB_EXT_VERS}
-	${RM} -f libcalc${LIB_EXT_VER}
-	${RM} -f libcalc${LIB_EXT_VE}
-	${RM} -f libcustcalc${LIB_EXT_VERS}
-	${RM} -f libcustcalc${LIB_EXT_VER}
-	${RM} -f libcustcalc${LIB_EXT_VE}
 	${RM} -rf win32 build
 	${RM} -f no_implicit.arg
 	${RM} -f no_implicit.c no_implicit.o no_implicit${EXT}
@@ -4516,27 +4488,6 @@ endif
 	    ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-		fi; \
-	    fi; \
 	    ${LN} -f -s libcalc${LIB_EXT_VERSION} \
 	    		${T}${LIBDIR}/libcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
@@ -4547,27 +4498,6 @@ endif
 	    ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-		fi; \
-	    fi; \
 	    ${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
 	    		${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
@@ -4705,32 +4635,6 @@ uninstall: custom/Makefile
 		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT}"; \
 	    fi; \
 	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}";\
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-		echo -n "cannot uninstall "; \
-		echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-		echo \
-		  "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    fi; \
-	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
 	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
@@ -4748,30 +4652,6 @@ uninstall: custom/Makefile
 		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
 	    fi; \
 	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    fi; \
-	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
 	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -39,8 +39,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 30.75 $$
-# @(#) $Id: Makefile.ship,v 30.75 2014/09/21 14:09:18 chongo Exp $
+MAKEFILE_REV= $$Revision: 30.85 $$
+# @(#) $Id: Makefile.ship,v 30.85 2016/02/08 22:10:13 chongo Exp $
 # @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -823,6 +823,15 @@ READLINE_EXTRAS=
 #READLINE_LIB= -L/sw/lib -lreadline
 #READLINE_EXTRAS= -lhistory -lncurses
 #
+# For Apple OS X: install homebrew and then:
+#
+#	brew install readline
+#
+# and use:
+#
+#READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
+#READLINE_EXTRAS= -lhistory -lncurses
+#
 READLINE_INCLUDE=
 #READLINE_INCLUDE= -I/usr/gnu/include
 #READLINE_INCLUDE= -I/usr/local/include
@@ -952,22 +961,13 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.14
+VERSION= 2.12.5.3

 # Names of shared libraries with versions
 #
 LIB_EXT= .so
 LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}

-# legacy partial versions are no longer used, only removed
-#
-VERS= 2.12.4
-VER= 2.12
-VE= 2
-LIB_EXT_VERS= ${LIB_EXT}.${VERS}
-LIB_EXT_VER= ${LIB_EXT}.${VER}
-LIB_EXT_VE= ${LIB_EXT}.${VE}
-
 # standard utilities used during make
 #
 SHELL= /bin/sh
@@ -1347,9 +1347,6 @@ CUSTOM_PASSDOWN=  \
    TOUCH=${TOUCH} \
    TRUE=${TRUE} \
    VERSION=${VERSION} \
-    VERS=${VERS} \
-    VER=${VER} \
-    VE=${VE} \
    target=${target}

 # The complete list of Makefile vars passed down to help/Makefile.
@@ -1535,7 +1532,33 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 #
 ###

-all: ${BLD_TYPE} CHANGES
+all: check_include ${BLD_TYPE} CHANGES
+
+check_include:
+	$(Q) if [ ! -d /usr/include ]; then \
+	    echo "ERROR: critical directory missing: /usr/include" 1>&2; \
+	    echo "Without this critical directory, we cannot compile." 1>&2; \
+	    echo 1>&2; \
+	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
+	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
+	    echo "must be installed and that you run the command:" 1>&2; \
+	    echo 1>&2; \
+	    echo "    xcode-select --install" 1>&2; \
+	    echo 1>&2; \
+	    exit 1; \
+	fi
+	$(Q) if [ ! -f /usr/include/stdio.h ]; then \
+	    echo "ERROR: critical include files are missing" 1>&2; \
+	    echo "Without this critical directory, we cannot compile." 1>&2; \
+	    echo 1>&2; \
+	    echo "Perhaps your system isn't setup to compile C source?" 1>&2; \
+	    echo "For example, Apple OS X / darwin requres that XCode" 1>&2; \
+	    echo "must be installed and that you run the command:" 1>&2; \
+	    echo 1>&2; \
+	    echo "    xcode-select --install" 1>&2; \
+	    echo 1>&2; \
+	    exit 1; \
+	fi

 prep:
 	${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3'
@@ -1648,6 +1671,7 @@ calc.1: calc.man ${MAKE_FILE}
 	${Q} echo forming calc.1 from calc.man
 	@${SED} -e 's:$${LIBDIR}:${LIBDIR}:g' \
 	        -e 's,$${BINDIR},${BINDIR},g' \
+	        -e 's,$${VERSION},${VERSION},g' \
 	        -e 's,$${CALCPATH},${CALCPATH},g' \
 	        -e 's,$${SCRIPTDIR},${SCRIPTDIR},g' \
 	        -e 's,$${CALC_INCDIR},${CALC_INCDIR},g' \
@@ -3259,57 +3283,6 @@ ver_calc${EXT}: version.c have_unused.h
 	${RM} -f $@
 	${LCC} ${ICFLAGS} -DCALC_VER ${ILDFLAGS} version.c -o $@

-###
-#
-# legacy partial versions are no longer used, only removed
-#
-# calc_vers:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	3 level version string.
-#
-# calc_ver:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	2 level version string.
-#
-# calc_ve:
-#	This rule is the most accurate as it uses calc source to
-#	produce the version value.  This rule produces only a
-#	1 level version string.
-#
-# vers:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 3 level version string.
-#
-# ver:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 2 level version string.
-#
-# ve:
-#	This rule simply echoes the value found in this makefile.
-#	This rule produces only a 1 level version string.
-#
-###
-
-calc_vers: ver_calc${EXT}
-	@./ver_calc${EXT} -V
-
-calc_ver: ver_calc${EXT}
-	@./ver_calc${EXT} -V | ${SED} -e 's/\.[^.]*$$//'
-
-calc_ve: ver_calc${EXT}
-	@./ver_calc${EXT} -V | ${SED} -e 's/\.[^.]*\.[^.]*$$//'
-
-vers:
-	@echo ${VERS}
-
-ver:
-	@echo ${VER}
-
-ve:
-	@echo ${VE}
-
 ###
 #
 # File distribution list generation.  You can ignore this section.
@@ -3806,12 +3779,6 @@ clobber: custom/Makefile clean
 	cd cscript; ${RM} -f all; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo remove files that are obsolete
-	${RM} -f libcalc${LIB_EXT_VERS}
-	${RM} -f libcalc${LIB_EXT_VER}
-	${RM} -f libcalc${LIB_EXT_VE}
-	${RM} -f libcustcalc${LIB_EXT_VERS}
-	${RM} -f libcustcalc${LIB_EXT_VER}
-	${RM} -f libcustcalc${LIB_EXT_VE}
 	${RM} -rf win32 build
 	${RM} -f no_implicit.arg
 	${RM} -f no_implicit.c no_implicit.o no_implicit${EXT}
@@ -3999,27 +3966,6 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	    ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VER}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VE}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-		fi; \
-	    fi; \
 	    ${LN} -f -s libcalc${LIB_EXT_VERSION} \
 	    		${T}${LIBDIR}/libcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
@@ -4030,27 +3976,6 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	    ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VERS}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VER}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-		fi; \
-	    fi; \
-	    if [ "${LIB_EXT_VERSION}" != "${LIB_EXT_VE}" ]; then \
-		if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-		    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}; \
-		    echo -n "removed legacy and likely out of date: "; \
-		    echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-		fi; \
-	    fi; \
 	    ${LN} -f -s libcustcalc${LIB_EXT_VERSION} \
 	    		${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
@@ -4188,32 +4113,6 @@ uninstall: custom/Makefile
 		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT}"; \
 	    fi; \
 	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}";\
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VE}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}" ]; then \
-		echo -n "cannot uninstall "; \
-		echo "${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VER}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}" ]; then \
-		echo \
-		  "cannot uninstall ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERS}"; \
-	    fi; \
-	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
 	    if [ -f "${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}" ]; then \
@@ -4231,30 +4130,6 @@ uninstall: custom/Makefile
 		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
 	    fi; \
 	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VE}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VE}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VER}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VER}"; \
-	    fi; \
-	fi
-	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERS}" ]; then \
-		echo "cannot uninstall ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    else \
-		echo "uninstalled ${T}${LIBDIR}/libcalc${LIB_EXT_VERS}"; \
-	    fi; \
-	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
 	    if [ -f "${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}" ]; then \
--- a/66
+++ b/66
@@ -73,52 +73,64 @@ for a wish/todo list.  Code contributions are welcome.

 =-=

-To join the calc-tester mailing list.  Send an EMail message to:
+To subscribe to the calc-tester mailing list, visit the following URL:

-    calc-tester-request at asthe dot com
+	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+    This is a low volume moderated mailing list.

-Your subject must contain the words:
+    This mailing list replaces calc-tester at asthe dot com list.

-    calc mailing list subscription
+    If you need a human to help you with your mailing list subscription,
+    please send EMail to our special:

-You may have additional words in your subject line.
+	calc-tester-maillist-help at asthe dot com

-Your message body (not the subject) should consist of:
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-     subscribe calc-tester address
-     end
-     name your_full_name
+    address.  To be sure we see your EMail asking for help with your
+    mailing list subscription, please use the following phase in your
+    EMail Subject line:

-where ``address'' is your EMail address and ``your_full_name'' is
-your full name.
+	calc tester mailing list help

-Feel free to follow the name line with additional EMail text as desired.
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.

-=-=
+-=-

-Send Calc bug and bug fixes to:
+Calc bug reports and calc bug fixes should be sent to:

-    calc-bugs at asthe dot com
+	calc-bug-report at asthe dot com

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-but see the BUGS file first.
+    This replaces the old calc-bugs at asthe dot com address.

-Your subject must contain the words:
+    To be sure we see your EMail reporting a calc bug, please use the
+    following phase in your EMail Subject line:

-       calc bug report
+	calc bug report

-You may have additional words in your subject line.
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
+    However, you may find it more helpful to simply subscribe
+    to the calc-tester mailing list (see above) and then to
+    send your report to that mailing list as a wider set calc
+    testers may be able to help you.
+
+-=-

 The calc web site is located at:

-	http://www.isthe.com/chongo/tech/comp/calc/
+    http://www.isthe.com/chongo/tech/comp/calc/

-## Copyright (C) 1999  Landon Curt Noll
+NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
+
+## Copyright (C) 1999,2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -134,8 +146,8 @@ The calc web site is located at:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.1 $
-## @(#) $Id: README,v 30.1 2007/03/16 11:09:46 chongo Exp $
+## @(#) $Revision: 30.3 $
+## @(#) $Id: README,v 30.3 2014/10/12 12:23:43 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/RCS/README,v $
 ##
 ## Under source code control:	1995/10/25 05:27:59
--- a/assocfunc.c
+++ b/assocfunc.c
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.2 $
- * @(#) $Id: assocfunc.c,v 30.2 2013/08/11 08:41:38 chongo Exp $
+ * @(#) $Revision: 30.3 $
+ * @(#) $Id: assocfunc.c,v 30.3 2014/09/30 00:55:11 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/assocfunc.c,v $
 *
 * Under source code control:	1993/07/20 23:04:27
@@ -83,7 +83,7 @@ associndex(ASSOC *ap, BOOL create, long dim, VALUE *indices)
 	 * so that we can first select the correct hash chain, and
 	 * also so we can quickly compare each element for a match.
 	 */
-	hash = FNV1_32_BASIS;
+	hash = QUICKHASH_BASIS;
 	for (i = 0; i < dim; i++)
 		hash = hashvalue(&indices[i], hash);

--- a/cal/README
+++ b/cal/README
@@ -35,12 +35,44 @@ Calc resource file files are provided because they serve as examples of
 how use the calc language, and/or because the authors thought them to
 be useful!

-If you write something that you think is useful, please send it to:
+If you write something that you think is useful, please join the
+low volume calc mailing list calc-tester.  Then send your contribution
+to the calc-tester mailing list.

-    calc-contrib at asthe dot com
+To subscribe to the calc-tester mailing list, visit the following URL:

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	https://www.listbox.com/subscribe/?list_id=239342
+
+    To help determine you are a human and not just a spam bot,
+    you will be required to provide the following additional info:
+
+	Your Name
+	Calc Version
+	Operating System
+	The date 7 days ago
+
+    This is a low volume moderated mailing list.
+
+    This mailing list replaces calc-tester at asthe dot com list.
+
+    If you need a human to help you with your mailing list subscription,
+    please send EMail to our special:
+
+	calc-tester-maillist-help at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    address.  To be sure we see your EMail asking for help with your
+    mailing list subscription, please use the following phase in your
+    EMail Subject line:
+
+	calc tester mailing list help
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
+=-=

 By convention, a resource file only defines and/or initializes functions,
 objects and variables.	(The regress.cal and testxxx.cal regression test
@@ -1766,7 +1798,7 @@ zeta2.cal
    for information on this special zeta function.


-## Copyright (C) 2000  David I. Bell and Landon Curt Noll
+## Copyright (C) 2000,2014  David I. Bell and Landon Curt Noll
 ##
 ## Primary author: Landon Curt Noll
 ##
@@ -1784,8 +1816,8 @@ zeta2.cal
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.8 $
-## @(#) $Id: README,v 30.8 2013/09/02 01:46:05 chongo Exp $
+## @(#) $Revision: 30.9 $
+## @(#) $Id: README,v 30.9 2014/10/06 08:44:18 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32
--- a/cal/alg_config.cal
+++ b/cal/alg_config.cal
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.11 $
- * @(#) $Id: alg_config.cal,v 30.11 2014/09/07 06:13:04 chongo Exp $
+ * @(#) $Revision: 30.12 $
+ * @(#) $Id: alg_config.cal,v 30.12 2016/02/06 08:38:56 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/alg_config.cal,v $
 *
 * Under source code control:	2006/06/07 14:10:11
@@ -364,7 +364,8 @@ define best_mul2()
    /*
     * setup
     */
-    test_time = 30.0;
+    printf("WARNING: This tool may not be computing the correct best value\n");
+    test_time = 5.0;
    printf("The best_mul2() function will take a LONG time to run!\n");
    printf("It is important that best_mul2() run on an othwewise idle host!\n");
    if (config("user_debug") <= 0) {
@@ -376,7 +377,7 @@ define best_mul2()
    /*
     * firewall - must have a >1 ratio for the initial length
     */
-    high = 16;
+    high = 8;
    best_val = high;
    if (config("user_debug") > 0) {
 	printf("testing multiply alg1/alg2 ratio for len = %d\n", high);
@@ -400,7 +401,7 @@ define best_mul2()
 	 * We will multiplicatively expand our test level until
 	 * the ratio drops below 1.0.
 	 */
-	expand = ((ratio >= 10) ? 1024 : 2^round(ratio));
+	expand = 2;
 	low = high;
 	high *= expand;
 	if (config("user_debug") > 1) {
@@ -844,7 +845,8 @@ define best_sq2()
    /*
     * setup
     */
-    test_time = 30.0;
+    printf("WARNING: This tool may not be computing the correct best value\n");
+    test_time = 5.0;
    printf("The best_sq2() function will take a LONG time to run!\n");
    printf("It is important that best_sq2() run on an othwewise idle host!\n");
    if (config("user_debug") <= 0) {
@@ -856,7 +858,7 @@ define best_sq2()
    /*
     * firewall - must have a >1 ratio for the initial length
     */
-    high = 16;
+    high = 8;
    best_val = high;
    if (config("user_debug") > 0) {
 	printf("testing square alg1/alg2 ratio for len = %d\n", high);
@@ -880,7 +882,7 @@ define best_sq2()
 	 * We will multiplicatively expand our test level until
 	 * the ratio drops below 1.0.
 	 */
-	expand = ((ratio >= 10) ? 1024 : 2^round(ratio));
+	expand = 2;
 	low = high;
 	high *= expand;
 	if (config("user_debug") > 1) {
@@ -1346,6 +1348,7 @@ define best_pow2()
    /*
     * setup
     */
+    printf("WARNING: This tool may not be computing the correct best value\n");
    test_time = 60.0;
    printf("The best_pow2() function will take a LONG time to run!\n");
    printf("It is important that best_pow2() run on an othwewise idle host!\n");
--- a/cal/regress.cal
+++ b/cal/regress.cal
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.12 $
- * @(#) $Id: regress.cal,v 30.12 2013/09/02 02:32:55 chongo Exp $
+ * @(#) $Revision: 30.13 $
+ * @(#) $Id: regress.cal,v 30.13 2016/02/06 08:39:35 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/regress.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:36
@@ -403,14 +403,14 @@ define test_config()
 					'512: config("trace") == 0');
 	vrfy(config("maxprint") == 16,
 					'513: config("maxprint") == 16');
-	vrfy(config("mul2") == 1780,
-					'514: config("mul2") == 1780');
-	vrfy(config("sq2") == 3388,
-					'515: config("sq2") == 3388');
-	vrfy(config("pow2") == 176,
-					'516: config("pow2") == 176');
-	vrfy(config("redc2") == 220,
-					'517: config("redc2") == 220');
+	vrfy(config("mul2") == 28,
+					'514: config("mul2") == 28');
+	vrfy(config("sq2") == 28,
+					'515: config("sq2") == 28');
+	vrfy(config("pow2") == 20,
+					'516: config("pow2") == 20');
+	vrfy(config("redc2") == 25,
+					'517: config("redc2") == 25');
 	vrfy(config("tilde"),
 					'518: config("tilde")');
 	vrfy(config("tab"),
--- a/calc.man
+++ b/calc.man
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 1999-2007	Landon Curt Noll
+.\" Copyright (C) 1999-2007,2014	Landon Curt Noll
 .\"
 .\" Calc is open software; you can redistribute it and/or modify it under
 .\" the terms of the version 2.1 of the GNU Lesser General Public License
@@ -15,8 +15,8 @@
 .\" received a copy with calc; if not, write to Free Software Foundation, Inc.
 .\" 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 .\"
-.\" @(#) $Revision: 30.5 $
-.\" @(#) $Id: calc.man,v 30.5 2013/08/11 08:41:38 chongo Exp $
+.\" @(#) $Revision: 30.6 $
+.\" @(#) $Id: calc.man,v 30.6 2014/10/06 08:39:45 chongo Exp $
 .\" @(#) $Source: /usr/local/src/bin/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
@@ -1115,45 +1115,62 @@ To contribute comments, suggestions, enhancements
 and interesting
 .B calc
 resource files, and
-shell scripts please join the low volume calc mailing list.
+shell scripts please join the calc-tester
+low volume moderated calc mailing list.
 .sp
-To join the low volume calc mailing list, send EMail to:
+To the calc-tester mailing list, visit the following URL:
 .sp
 .in +0.5i
 .nf
-calc-tester-request at asthe dot com
+https://www.listbox.com/subscribe/?list_id=239342
 .fi
 .in -0.5i
 .sp
-Your subject must contain the words:
+To help determine you are a human and not just a spam bot,
+you will be required to provide the following additional information:
 .sp
 .in +0.5i
 .nf
-calc mailing list subscription
+Your Name
+
+Calc Version
+   For example, the current version is: ${VERSION}
+
+Operating System
+   If you don't know your operating system, enter: unknown
+
+The date 7 days ago
+   Consult a calendar :-)
+.fi
+.in -0.5i
+.sp
+If you need a human to help you with your mailing list subscription,
+or if you have problems with the above procedure, please
+send EMail to our special address:
+.sp
+.in +0.5i
+.nf
+calc-tester-maillist-help at asthe dot com
+
+NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+NOTE: Yes, the EMail address uses 'asthe',
+      while the web site uses 'isthe'.
+.fi
+.in -0.5i
+.sp
+To be sure we see your EMail asking for help with your mailing list
+subscription, please use the following phase in your EMail Subject line
+your subject must contain the words:
+.sp
+.in +0.5i
+.nf
+calc tester mailing list help
 .fi
 .in -0.5i
 .sp
 You may have additional words in your subject line.
 .sp
-Your message body must contain:
-.sp
-.in +0.5i
-.nf
-subscribe calc-tester address
-end
-name your_full_name
-.fi
-.in -0.5i
-.sp
-where
-.B address
-s your EMail address and
-.B your_full_name
-is your full name.
-Feel free to follow the
-.B name
-line with additional EMail text as desired.
-.sp
 .SH "BUG REPORTS / BUG FIXES"
 \&
 .br
@@ -1162,12 +1179,12 @@ Send bug reports and bug fixes to:
 .sp
 .in +0.5i
 .nf
-calc-bugs at asthe dot com
+calc-bug-report at asthe dot com

-[[ NOTE: Replace 'at' with @, 'dot' is with . ]]
-[[       and remove the spaces ]]
-[[ NOTE: The EMail address uses 'asthe' and
-[[       the web site URL uses 'isthe' ]]
+NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+NOTE: Yes, the EMail address uses 'asthe',
+      while the web site uses 'isthe'.
 .fi
 .in -0.5i
 .sp
@@ -1180,6 +1197,10 @@ calc bug report
 .in -0.5i
 .sp
 You may have additional words in your subject line.
+.in
+However, you may find it more helpful to simply subscribe to the
+calc-tester mailing list (see above) and then to send your report
+to that mailing list as a wider set calc testers may be able to help you.
 .sp
 See the
 .I BUGS
--- a/cscript/README.src
+++ b/cscript/README.src
@@ -43,20 +43,44 @@ This next example WRONG:
    # is is also wrong because the first line does not end in -f
    print "This example has invalid comments"

-#####
-
-If you write something that you think is useful, please send it to:
-
-    calc-contrib at asthe dot com
-
-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+=-=

 For more info, see:

    help script
    help cscript

+#####
+
+If you write something that you think is useful, please join the
+low volume calc mailing list calc-tester.  Then send your contribution
+to the calc-tester mailing list.
+
+To subscribe to the calc-tester mailing list, visit the following URL:
+
+	http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html
+
+    This is a low volume moderated mailing list.
+
+    This mailing list replaces calc-tester at asthe dot com list.
+
+    If you need a human to help you with your mailing list subscription,
+    please send EMail to our special:
+
+	calc-tester-maillist-help at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    address.  To be sure we see your EMail asking for help with your
+    mailing list subscription, please use the following phase in your
+    EMail Subject line:
+
+	calc tester mailing list help
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
 =-=

 4dsphere
@@ -117,8 +141,8 @@ simple
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.3 $
-## @(#) $Id: README.src,v 30.3 2014/08/24 22:04:32 chongo Exp $
+## @(#) $Revision: 30.5 $
+## @(#) $Id: README.src,v 30.5 2014/10/12 12:23:43 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/cscript/RCS/README.src,v $
 ##
 ## Under source code control:	1999/12/17 10:23:40
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# @(#) $Revision: 30.35 $
-# @(#) $Id: Makefile.head,v 30.35 2014/09/21 14:09:18 chongo Exp $
+# @(#) $Revision: 30.40 $
+# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $
 # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -352,22 +352,13 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.14
+VERSION= 2.12.5.3

 # Names of shared libraries with versions
 #
 LIB_EXT= .so
 LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}

-# legacy partial versions are no longer used, only removed
-#
-VERS= 2.12.4
-VER= 2.12
-VE= 2
-LIB_EXT_VERS= ${LIB_EXT}.${VERS}
-LIB_EXT_VER= ${LIB_EXT}.${VER}
-LIB_EXT_VE= ${LIB_EXT}.${VE}
-
 # standard tools
 #
 SHELL= /bin/sh
@@ -599,10 +590,6 @@ CC= ${PURIFY} ${LCC} ${CCWERR}
 # Darwin dynamic shared lib filenames
 LIB_EXT:= .dylib
 LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
-# legacy partial versions are no longer used, only removed
-LIB_EXT_VERS:= .${VERS}${LIB_EXT}
-LIB_EXT_VER:= .${VER}${LIB_EXT}
-LIB_EXT_VE:= .${VE}${LIB_EXT}
 # LDCONFIG not required on this platform, so we redefine it to an empty string
 LDCONFIG:=
 # DARWIN_ARCH= -arch i386 -arch ppc	# Universal binary
@@ -611,6 +598,15 @@ LDCONFIG:=
 # DARWIN_ARCH= -arch x86_64		# native 64-bit binary
 DARWIN_ARCH=				# native binary
 #
+# Starting with El Capitan OS X 10.11, root by default could not
+# mkdir under system locations, so we now use the /usr/local tree.
+#
+OPTDIR:= /usr/local
+BINDIR:= /${OPTDIR}/bin
+LIBDIR:= /${OPTDIR}/lib
+CALC_SHAREDIR:= /${OPTDIR}/share
+CALC_INCDIR:= /${OPTDIR}/include
+SCRIPTDIR:= ${BINDIR}/cscript
 endif

 ##################
@@ -1243,9 +1239,6 @@ clobber: clean
 	${RM} -f libcustcalc.*.dylib
 	${RM} -f libcustcalc.a
 	${V} echo remove files that are obsolete
-	${RM} -f libcustcalc${LIB_EXT_VERS}
-	${RM} -f libcustcalc${LIB_EXT_VER}
-	${RM} -f libcustcalc${LIB_EXT_VE}
 #if 0	/* start of skip for non-Gnu makefiles */
 	${RM} -f Makefile.simple
 #endif	/* end of skip for non-Gnu makefiles */
--- a/custom/Makefile.head
+++ b/custom/Makefile.head
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# @(#) $Revision: 30.35 $
-# @(#) $Id: Makefile.head,v 30.35 2014/09/21 14:09:18 chongo Exp $
+# @(#) $Revision: 30.40 $
+# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $
 # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -352,22 +352,13 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.14
+VERSION= 2.12.5.3

 # Names of shared libraries with versions
 #
 LIB_EXT= .so
 LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}

-# legacy partial versions are no longer used, only removed
-#
-VERS= 2.12.4
-VER= 2.12
-VE= 2
-LIB_EXT_VERS= ${LIB_EXT}.${VERS}
-LIB_EXT_VER= ${LIB_EXT}.${VER}
-LIB_EXT_VE= ${LIB_EXT}.${VE}
-
 # standard tools
 #
 SHELL= /bin/sh
--- a/custom/Makefile.simple
+++ b/custom/Makefile.simple
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
-# @(#) $Revision: 30.35 $
-# @(#) $Id: Makefile.head,v 30.35 2014/09/21 14:09:18 chongo Exp $
+# @(#) $Revision: 30.40 $
+# @(#) $Id: Makefile.head,v 30.40 2016/02/08 22:10:13 chongo Exp $
 # @(#) $Source: /usr/local/src/bin/calc/custom/RCS/Makefile.head,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -337,22 +337,13 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.14
+VERSION= 2.12.5.3

 # Names of shared libraries with versions
 #
 LIB_EXT= .so
 LIB_EXT_VERSION= ${LIB_EXT}.${VERSION}

-# legacy partial versions are no longer used, only removed
-#
-VERS= 2.12.4
-VER= 2.12
-VE= 2
-LIB_EXT_VERS= ${LIB_EXT}.${VERS}
-LIB_EXT_VER= ${LIB_EXT}.${VER}
-LIB_EXT_VE= ${LIB_EXT}.${VE}
-
 # standard tools
 #
 SHELL= /bin/sh
@@ -798,9 +789,6 @@ clobber: clean
 	${RM} -f libcustcalc.*.dylib
 	${RM} -f libcustcalc.a
 	${V} echo remove files that are obsolete
-	${RM} -f libcustcalc${LIB_EXT_VERS}
-	${RM} -f libcustcalc${LIB_EXT_VER}
-	${RM} -f libcustcalc${LIB_EXT_VE}

 # install everything
 #
--- a/custom/Makefile.tail
+++ b/custom/Makefile.tail
@@ -293,9 +293,6 @@ clobber: clean
 	${RM} -f libcustcalc.*.dylib
 	${RM} -f libcustcalc.a
 	${V} echo remove files that are obsolete
-	${RM} -f libcustcalc${LIB_EXT_VERS}
-	${RM} -f libcustcalc${LIB_EXT_VER}
-	${RM} -f libcustcalc${LIB_EXT_VE}
 #if 0	/* start of skip for non-Gnu makefiles */
 	${RM} -f Makefile.simple
 #endif	/* end of skip for non-Gnu makefiles */
--- a/func.c
+++ b/func.c
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.10 $
- * @(#) $Id: func.c,v 30.10 2014/08/31 14:54:50 chongo Exp $
+ * @(#) $Revision: 30.11 $
+ * @(#) $Id: func.c,v 30.11 2014/09/30 00:55:11 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/func.c,v $
 *
 * Under source code control:	1990/02/15 01:48:15
@@ -1676,7 +1676,7 @@ f_hash(int count, VALUE **vals)
 	result.v_type = V_NUM;
 	result.v_subtype = V_NOSUBTYPE;

-	hash = FNV1_32_BASIS;
+	hash = QUICKHASH_BASIS;
 	while (count-- > 0)
 		hash = hashvalue(*vals++, hash);
 	result.v_num = utoq((FULL) hash);
--- a/help/contrib
+++ b/help/contrib
@@ -36,45 +36,73 @@ as a diff -c /dev/null your-file patch, or as a uuencoded and
 gziped (or compressed) tar file).

 To contribute code, scripts, resource files and/or to help please
-join the low volume calc mailing list by sending EMail to:
+join the low volume calc mailing list calc-tester.  Then send
+your contribution to the calc-tester mailing list.

-    calc-contrib at asthe dot com
+To subscribe to the calc-tester mailing list, visit the following URL:

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	https://www.listbox.com/subscribe/?list_id=239342

-Your subject must contain the words:
+    To help determine you are a human and not just a spam bot,
+    you will be required to provide the following additional info:

-    calc mailing list subscription
+	Your Name
+	Calc Version
+	Operating System
+	The date 7 days ago

-You may have additional words in your subject line.
+    This is a low volume moderated mailing list.

-Feel free to follow the name line with additional EMail text as desired.
+    This mailing list replaces calc-tester at asthe dot com list.

-Thanks for considering submitting code to calc.	 Calc is a collective
-work by a number of people.  It would not be what it is today without
-your efforts and submissions!
+    If you need a human to help you with your mailing list subscription,
+    please send EMail to our special:
+
+	calc-tester-maillist-help at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    address.  To be sure we see your EMail asking for help with your
+    mailing list subscription, please use the following phase in your
+    EMail Subject line:
+
+	calc tester mailing list help
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.

 =-=

 Calc bug reports and calc bug fixes should be sent to:

-    calc-bugs at asthe dot com
+	calc-bug-report at asthe dot com

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-Your subject must contain the words:
+    This replaces the old calc-bugs at asthe dot com address.

-       calc bug report
+    To be sure we see your EMail reporting a calc bug, please use the
+    following phase in your EMail Subject line:

-You may have additional words in your subject line.
+	calc bug report

-See the BUGS file or try the help command:
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.

-    help bugs
+    However, you may find it more helpful to simply subscribe
+    to the calc-tester mailing list (see above) and then to
+    send your report to that mailing list as a wider set calc
+    testers may be able to help you.

-for details on bug reporting.
+=-=
+
+The calc web site is located at:
+
+    http://www.isthe.com/chongo/tech/comp/calc/
+
+NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.

 =-=

@@ -83,7 +111,7 @@ http://www.isthe.com/chongo/

 chongo (share and enjoy) /\../\

-## Copyright (C) 1999  Landon Curt Noll
+## Copyright (C) 1999,2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -99,8 +127,8 @@ chongo (share and enjoy) /\../\
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.1 $
-## @(#) $Id: contrib,v 30.1 2007/03/16 11:10:42 chongo Exp $
+## @(#) $Revision: 30.2 $
+## @(#) $Id: contrib,v 30.2 2014/10/06 08:39:45 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/contrib,v $
 ##
 ## Under source code control:	1997/03/09 16:33:22
--- a/help/hash
+++ b/help/hash
@@ -13,11 +13,21 @@ DESCRIPTION
    Returns a hash value for one or more values of arbitrary types.

    The calc hash value is based on the core Fowler/Noll/Vo hash
-    known as FNV-1.  The return value, however, cannot be used
+    known as FNV-0.  The return value, however, cannot be used
    as an FNV hash value because calc's internal function also
    takes into account more abstract concepts such as data types.

-    See:
+    WARNING: Use of FNV-0 is NOT recommended for general purposes.
+    	     Calc uses FNV-0 for internal objects such as associative
+	     arrays as well as other internal processes.  Calc
+	     maintains the use of FNV-0 for backwards compatibility.
+
+	     You should use the FNV-1a hash instead!!!!!
+
+    Use the fnv() builtin function for general quick, non-cryptographic
+    hash purposes.
+
+    See also:

 	 http://www.isthe.com/chongo/tech/comp/fnv/

@@ -35,9 +45,9 @@ LINK LIBRARY
    none

 SEE ALSO
-    ishash, sha1
+    ishash, fnv, sha1

-## Copyright (C) 1999-2007  Landon Curt Noll
+## Copyright (C) 1999-2007,2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -53,8 +63,8 @@ SEE ALSO
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.2 $
-## @(#) $Id: hash,v 30.2 2007/07/05 17:37:41 chongo Exp $
+## @(#) $Revision: 30.3 $
+## @(#) $Id: hash,v 30.3 2014/10/06 08:45:56 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/hash,v $
 ##
 ## Under source code control:	1996/03/12 23:10:01
--- a/help/intro
+++ b/help/intro
@@ -54,7 +54,7 @@ What is calc?

    Functions can be used in expressions.  There are a great number of
    pre-defined functions.  For example, the following will calculate
-    the factorial of the value of 'old':
+    the factorial of the value of 'whey':

 	    fact(whey)

@@ -185,8 +185,8 @@ What is calc?
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.1 $
-## @(#) $Id: intro,v 30.1 2007/03/16 11:10:42 chongo Exp $
+## @(#) $Revision: 30.2 $
+## @(#) $Id: intro,v 30.2 2016/02/06 08:25:30 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/intro,v $
 ##
 ## Under source code control:	1991/07/21 04:37:21
--- a/help/todo
+++ b/help/todo
@@ -1,28 +1,36 @@
 Calc Todo Items:

-    The following items should be addressed sometime in the short to
-    medium term future, if not before the next release.
+    Code contributions are welcome.  First Subscribe to the calc-tester
+    mailing list.  Next, send patches to the calc-tester mailing list.

-    Code contributions are welcome.  Send patches to:
+    To subscribe to the calc-tester mailing list, visit the following URL:

-	    calc-contrib at asthe dot com
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html

-    Calc bug reports, however, should send to:
+	This is a low volume moderated mailing list.

-	    calc-bugs at asthe dot com
+	This mailing list replaces calc-tester at asthe dot com list.

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	If you need a human to help you with your mailing list subscription,
+	please send EMail to our special:

-    See the BUGS file or try the calc command:
+	    calc-tester-maillist-help at asthe dot com

-	    help bugs
+	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .

-    See also the 'wishlist' help files for the calc enhancement wish list.
+	address.  To be sure we see your EMail asking for help with your
+	mailing list subscription, please use the following phase in your
+	EMail Subject line:
+
+	    calc tester mailing list help
+
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.

 =-=

-Very High priority items:
+High priority items:

    * Improve the way that calc parses statements such as if, for, while
      and do so that when a C programmer does.  This works as expected:
@@ -62,7 +70,7 @@ Very High priority items:

 =-=

-High priority items:
+Medium priority items:

    * Verify, complete or fix the 'SEE ALSO' help file sections.

@@ -87,7 +95,7 @@ High priority items:

 =-=

-Medium priority items:
+Low priority items:

    * Complete the use of CONST where appropriate:

@@ -117,7 +125,39 @@ Medium priority items:
    * Add a builtin function to access the 64 bit FNV hash which
      is currently being used internally in seed.c.

-## Copyright (C) 1999-2007  Landon Curt Noll
+=-=
+
+Calc bug reports and calc bug fixes should be sent to:
+
+	calc-bug-report at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    This replaces the old calc-bugs at asthe dot com address.
+
+    To be sure we see your EMail reporting a calc bug, please use the
+    following phase in your EMail Subject line:
+
+	calc bug report
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
+    However, you may find it more helpful to simply subscribe
+    to the calc-tester mailing list (see above) and then to
+    send your report to that mailing list as a wider set calc
+    testers may be able to help you.
+
+=-=
+
+The calc web site is located at:
+
+    http://www.isthe.com/chongo/tech/comp/calc/
+
+NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
+
+## Copyright (C) 1999-2007,2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -133,8 +173,8 @@ Medium priority items:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.2 $
-## @(#) $Id: todo,v 30.2 2007/09/08 02:52:42 chongo Exp $
+## @(#) $Revision: 30.4 $
+## @(#) $Id: todo,v 30.4 2014/10/12 12:23:43 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/todo,v $
 ##
 ## Under source code control:	1999/10/20 07:42:55
--- a/help/wishlist
+++ b/help/wishlist
@@ -1,22 +1,37 @@
 Calc Enhancement Wish List:

-    Send calc comments, suggestions, bug fixes, enhancements and
+    We welcome calc comments, suggestions, bug fixes, enhancements and
    interesting calc scripts that you would like you see included in
-    future distributions to:
+    future distributions.

-	    calc-contrib at asthe dot com
+    To send such items, first subscribe to the calc-tester mailing list.
+    Then send your comments, suggestions, bug fixes, enhancements and
+    interesting calc scripts to the calc-tester mailing list.

-    The following items are in the calc wish list.  Programs like this
-    can be extended and improved forever.
+    To subscribe to the calc-tester mailing list, visit the following URL:

-    Calc bug reports, however, should be sent to:
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-tester.html

-	    calc-bugs at asthe dot com
+	This is a low volume moderated mailing list.

-    [[ NOTE: Replace 'at' with @, 'dot' is with . and remove the spaces ]]
-    [[ NOTE: The EMail address uses 'asthe' and the web site URL uses 'isthe' ]]
+	This mailing list replaces calc-tester at asthe dot com list.

-    See the 'todo' help file for higher priority todo items.
+	If you need a human to help you with your mailing list subscription,
+	please send EMail to our special:
+
+	    calc-tester-maillist-help at asthe dot com
+
+	    NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+	address.  To be sure we see your EMail asking for help with your
+	mailing list subscription, please use the following phase in your
+	EMail Subject line:
+
+	    calc tester mailing list help
+
+	That phrase in your subject line will help ensure your
+	request will get past our anti-spam filters.  You may have
+	additional words in your subject line.

 =-=

@@ -187,7 +202,39 @@ Calc Enhancement Wish List:
    *  Add read -once -try "filename" which would do nothing
       if "filename" was not a readable file.

-## Copyright (C) 1999  Landon Curt Noll
+=-=
+
+Calc bug reports and calc bug fixes should be sent to:
+
+	calc-bug-report at asthe dot com
+
+	NOTE: Remove spaces and replace 'at' with @, 'dot' with .
+
+    This replaces the old calc-bugs at asthe dot com address.
+
+    To be sure we see your EMail reporting a calc bug, please use the
+    following phase in your EMail Subject line:
+
+	calc bug report
+
+    That phrase in your subject line will help ensure your
+    request will get past our anti-spam filters.  You may have
+    additional words in your subject line.
+
+    However, you may find it more helpful to simply subscribe
+    to the calc-tester mailing list (see above) and then to
+    send your report to that mailing list as a wider set calc
+    testers may be able to help you.
+
+=-=
+
+The calc web site is located at:
+
+    http://www.isthe.com/chongo/tech/comp/calc/
+
+NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
+
+## Copyright (C) 1999,2014  Landon Curt Noll
 ##
 ## Calc is open software; you can redistribute it and/or modify it under
 ## the terms of the version 2.1 of the GNU Lesser General Public License
@@ -203,8 +250,8 @@ Calc Enhancement Wish List:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ##
-## @(#) $Revision: 30.1 $
-## @(#) $Id: wishlist,v 30.1 2007/03/16 11:10:42 chongo Exp $
+## @(#) $Revision: 30.3 $
+## @(#) $Id: wishlist,v 30.3 2014/10/12 12:23:43 chongo Exp $
 ## @(#) $Source: /usr/local/src/bin/calc/help/RCS/wishlist,v $
 ##
 ## Under source code control:	1991/07/21 04:37:24
--- a/quickhash.c
+++ b/quickhash.c
@@ -1,7 +1,12 @@
 /*
- * quickhash - quickly hash a calc value using a quasi Fowler/Noll/Vo hash
+ * quickhash - quickly hash a calc value using a 32-bit FNV-0 hash
 *
- * Copyright (C) 1999-2007  Landon Curt Noll
+ * WARNING: General use of FNV-0 hash is not recommended.  Calc uses FNV-0
+ *	    for a specific You should use FNV-1a hash instead.  See:
+ *
+ *	http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ *
+ * Copyright (C) 1999-2007,2014  Landon Curt Noll
 *
 * Calc is open software; you can redistribute it and/or modify it under
 * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -17,8 +22,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.1 $
- * @(#) $Id: quickhash.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
+ * @(#) $Revision: 30.2 $
+ * @(#) $Id: quickhash.c,v 30.2 2014/09/30 00:55:46 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/quickhash.c,v $
 *
 * Under source code control:	1995/03/04 11:34:23
@@ -59,6 +64,8 @@ S_FUNC QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
 /*
 * quasi_fnv - quasi Fowler/Noll/Vo-0 32 bit hash
 *
+ * NOTE: General use of FNV-0 hadh
+ *
 * The basis of this hash algorithm was taken from an idea sent
 * as reviewer comments to the IEEE POSIX P1003.2 committee by:
 *
@@ -108,7 +115,7 @@ S_FUNC QCKHASH blk_hash(BLOCK *blk, QCKHASH val);
 * to the (val) hash state.  This is a simulation of hashing
 * a variable type.
 *
- * The Fowler/Noll/Vo hash does a very good job in producing
+ * The 32-bit FNV-0 hash does a very good job in producing
 * a 32 bit hash arrays of octets in a short amount of time.
 * It is not bad for hashing calc data as well.	 So doing a
 * quick and dirty job of hashing on a part of a calc value
@@ -139,7 +146,7 @@ S_FUNC QCKHASH blk_hash(BLOCK *blk, QCKHASH val);


 /*
- * fnv_qhash - compute the next Fowler/Noll/Vo hash given a NUMBER
+ * fnv_qhash - compute the next 32-bit FNV-0 hash given a NUMBER
 *
 * given:
 *	q	pointer to a NUMBER
@@ -154,7 +161,7 @@ S_FUNC QCKHASH blk_hash(BLOCK *blk, QCKHASH val);


 /*
- * fnv_chash - compute the next Fowler/Noll/Vo hash given a COMPLEX
+ * fnv_chash - compute the next 32-bit FNV-0 hash given a COMPLEX
 *
 * given:
 *	c	pointer to a COMPLEX
--- a/seed.c
+++ b/seed.c
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.1 $
- * @(#) $Id: seed.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
+ * @(#) $Revision: 30.2 $
+ * @(#) $Id: seed.c,v 30.2 2014/09/30 01:00:04 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/seed.c,v $
 *
 * Under source code control:	1999/10/03 10:06:53
@@ -117,7 +117,7 @@ typedef struct s_hash64 hash64;


 /*
- * FNV-1 initial basis
+ * 64-bit initial basis - Based on the 64-bit FNV basis value
 *
 * We start the hash at a non-zero value at the beginning so that
 * hashing blocks of data with all 0 bits do not map onto the same
@@ -151,17 +151,17 @@ typedef struct s_hash64 hash64;
 * good hash function.
 */
 #if defined(HAVE_B64)
-# define FNV1_64_BASIS ((hash64)(0xcbf29ce484222325ULL))
+# define PRIVATE_64_BASIS ((hash64)(0xcbf29ce484222325ULL))
 #else
-# define FNV1_64_BASIS_0 ((USB32)0x2325)
-# define FNV1_64_BASIS_1 ((USB32)0x8422)
-# define FNV1_64_BASIS_2 ((USB32)0x9ce4)
-# define FNV1_64_BASIS_3 ((USB32)0xcbf2)
+# define PRIVATE_64_BASIS_0 ((USB32)0x2325)
+# define PRIVATE_64_BASIS_1 ((USB32)0x8422)
+# define PRIVATE_64_BASIS_2 ((USB32)0x9ce4)
+# define PRIVATE_64_BASIS_3 ((USB32)0xcbf2)
 #endif


 /*
- * hash_buf - perform a Fowler/Noll/Vo-1 64 bit hash
+ * prvate_hash64_buf - perform a Fowler/Noll/Vo-1 64 bit hash
 *
 * input:
 *	buf	- start of buffer to hash
@@ -172,7 +172,7 @@ typedef struct s_hash64 hash64;
 *	64 bit hash as a static hash64 structure
 */
 S_FUNC hash64
-hash_buf(char *buf, unsigned len)
+prvate_hash64_buf(char *buf, unsigned len)
 {
 	hash64 hval;		/* current hash value */
 #if !defined(HAVE_B64)
@@ -205,10 +205,15 @@ hash_buf(char *buf, unsigned len)
 	 *	http://www.isthe.com/chongo/tech/comp/fnv/
 	 *
 	 * for more details as well as other forms of the FNV hash.
+	 *
+	 * NOTE: For general hash functions, we recommend using the
+	 *	 FNV-1a hash function.  The use of FNV-1 is kept
+	 *	 for backwards compatibility purposes and because
+	 *	 the use of FNV-1 in this special purpose, suffices.
 	 */
 #if defined(HAVE_B64)
 	/* hash each octet of the buffer */
-	for (hval = FNV1_64_BASIS; buf < buf_end; ++buf) {
+	for (hval = PRIVATE_64_BASIS; buf < buf_end; ++buf) {

 	    /* multiply by 1099511628211ULL mod 2^64 using 64 bit longs */
 	    hval *= (hash64)1099511628211ULL;
@@ -220,10 +225,10 @@ hash_buf(char *buf, unsigned len)
 #else /* HAVE_B64 */

 	/* hash each octet of the buffer */
-	val[0] = FNV1_64_BASIS_0;
-	val[1] = FNV1_64_BASIS_1;
-	val[2] = FNV1_64_BASIS_2;
-	val[3] = FNV1_64_BASIS_3;
+	val[0] = PRIVATE_64_BASIS_0;
+	val[1] = PRIVATE_64_BASIS_1;
+	val[2] = PRIVATE_64_BASIS_2;
+	val[3] = PRIVATE_64_BASIS_3;
 	for (; buf < buf_end; ++buf) {

 	    /*
@@ -441,7 +446,7 @@ pseudo_seed(void)
    /*
     * seed the generator with the above data
     */
-    hash_val = hash_buf((char *)&sdata, sizeof(sdata));
+    hash_val = prvate_hash64_buf((char *)&sdata, sizeof(sdata));

    /*
     * load the hash data into the ZVALUE
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.24 $
- * @(#) $Id: version.c,v 30.24 2014/08/31 15:43:39 chongo Exp $
+ * @(#) $Revision: 30.30 $
+ * @(#) $Id: version.c,v 30.30 2016/02/08 22:09:34 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/version.c,v $
 *
 * Under source code control:	1990/05/22 11:00:58
@@ -48,8 +48,8 @@ static char *program;

 #define MAJOR_VER	2	/* major library version */
 #define MINOR_VER	12	/* minor library version */
-#define MAJOR_PATCH	4	/* major software level under library version */
-#define MINOR_PATCH	14	/* minor software level or 0 if not patched */
+#define MAJOR_PATCH	5	/* major software level under library version */
+#define MINOR_PATCH	3	/* minor software level or 0 if not patched */


 /*
@@ -150,7 +150,6 @@ version(void)
 * This function prints a version string, rpm style:
 *
 *		x.y.z.w-r
- *		x.y.z-r
 *
 * where 'r' comes from the content of the release file.
 */
@@ -184,13 +183,8 @@ print_rpm_version(char *release)
 	/*
 	 * form the version buffer
 	 */
-	if (MINOR_PATCH > 0) {
-		printf("%d.%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
-				      calc_major_patch, calc_minor_patch, buf);
-	} else {
-		printf("%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
-				     calc_major_patch, buf);
-	}
+	printf("%d.%d.%d.%d-%s\n", calc_major_ver, calc_minor_ver,
+			      calc_major_patch, calc_minor_patch, buf);
 	return;
 }

--- a/zmath.h
+++ b/zmath.h
@@ -17,8 +17,8 @@
 * received a copy with calc; if not, write to Free Software Foundation, Inc.
 * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 *
- * @(#) $Revision: 30.5 $
- * @(#) $Id: zmath.h,v 30.5 2014/08/24 21:56:51 chongo Exp $
+ * @(#) $Revision: 30.7 $
+ * @(#) $Id: zmath.h,v 30.7 2016/02/06 08:39:35 chongo Exp $
 * @(#) $Source: /usr/local/src/bin/calc/RCS/zmath.h,v $
 *
 * Under source code control:	1993/07/30 19:42:48
@@ -180,12 +180,12 @@ typedef SB32 LEN;			/* unit of length storage */


 /*
- * FNV-1 basis
+ * Quickhash basis
 *
 * We start the hash at a non-zero value at the beginning so that
 * hashing blocks of data with all 0 bits do not map onto the same
- * 0 hash value.  The virgin value that we use below is the hash value
- * that we would get from following 32 ASCII characters:
+ * 0 hash value.  The virgin value that we use below is the 32-bit
+ * FNV-0 hash value that we would get from following 32 ASCII characters:
 *
 *		chongo <Landon Curt Noll> /\../\
 *
@@ -213,7 +213,7 @@ typedef SB32 LEN;			/* unit of length storage */
 * to be a cryptographic hash function, just a fast and reasonably
 * good hash function.
 */
-#define FNV1_32_BASIS ((QCKHASH)(0x811c9dc5))
+#define QUICKHASH_BASIS ((QCKHASH)(0x811c9dc5))


 /*
@@ -229,12 +229,12 @@ typedef SB32 LEN;			/* unit of length storage */
 #define MAXLEN	((LEN) 0x7fffffff >> 3) /* longest value allowed */


-#define MAXREDC 64			/* number of entries in REDC cache */
-#define SQ_ALG2 3388			/* size for alternative squaring */
-#define MUL_ALG2 1780			/* size for alternative multiply */
-#define POW_ALG2 176			/* size for using REDC for powers */
+#define MAXREDC 256			/* number of entries in REDC cache */
+#define SQ_ALG2 28			/* size for alternative squaring */
+#define MUL_ALG2 28			/* size for alternative multiply */
+#define POW_ALG2 20			/* size for using REDC for powers */
 /* old REDC_ALG2 was 5/4 of POW_ALG2, so we will keep the same ratio */
-#define REDC_ALG2 220			/* size for using alternative REDC */
+#define REDC_ALG2 25			/* size for using alternative REDC */


 typedef union {
Author	SHA1	Message	Date
Landon Curt Noll	d25186fc52	Release calc version 2.12.5.3	2017-05-21 15:39:01 -07:00
Landon Curt Noll	28d1e35362	Release calc version 2.12.5.2	2017-05-21 15:39:00 -07:00
Landon Curt Noll	1ae2f953d3	Release calc version 2.12.5.0	2017-05-21 15:39:00 -07:00