Release calc version 2.12.6.2

Verify that h*2^n-1 is not a multiple of 3
Fixed a misleading indent reported by Thomas Walter
2025-08-19 01:13:27 +03:00 · 2017-09-06 17:42:41 -07:00 · 2017-09-06 17:41:56 -07:00 · 2017-09-06 17:40:49 -07:00 · 2017-06-18 08:11:43 -07:00 · 2017-06-18 04:11:44 -07:00
604 changed files with 3312 additions and 11158 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,100 @@
+# files and directories created during the building of calc and other Makefile actions
+#
+# NOTE: While many of these might be part of a released calc tarball, they are
+#	not consider development source.  Some other file(s) and/or programs
+#	generate these files.
+#
+.dynamic
+.hsrc
+Makefile.simple
+NOTES
+align32.h
+args.h
+cal/.all
+calc
+calc.1
+calc.usage
+calcerr.c
+calcerr.h
+conf.h
+cscript/.all
+cscript/4dsphere
+cscript/README
+cscript/fproduct
+cscript/mersenne
+cscript/piforever
+cscript/plus
+cscript/powerterm
+cscript/simple
+cscript/square
+custom/.all
+custom/Makefile.simple
+custom/libcustcalc*
+endian
+endian_calc.h
+fposval.h
+have_const.h
+have_fpos.h
+have_fpos_pos.h
+have_getpgid.h
+have_getprid.h
+have_getsid.h
+have_gettime.h
+have_memmv.h
+have_newstr.h
+have_offscl.h
+have_posscl.h
+have_rusage.h
+have_stdlib.h
+have_stdvs
+have_strdup.h
+have_string.h
+have_times.h
+have_uid_t.h
+have_unistd.h
+have_unused.h
+have_urandom.h
+have_ustat.h
+help/.all
+help/COPYING
+help/COPYING-LGPL
+help/binding
+help/bindings
+help/bug
+help/bugs
+help/builtin
+help/change
+help/changes
+help/copy
+help/cscript
+help/custom_cal
+help/errorcode
+help/errorcodes
+help/full
+help/funclist
+help/funclist.c
+help/libcalc
+help/man
+help/new_custom
+help/resource
+help/type
+help/usage
+libcalc*
+libcustcalc*
+longbits
+longbits.h
+sample_many
+sample_rand
+terminal.h
+ver_calc
+
+# other commonly excluded patterns
+#
+*~
+*.BAK
+core*
+.DS_Store
+*.dSYM/
+*.[oa]
+.*.swp
+*,v
--- a/4
+++ b/4
@@ -176,10 +176,6 @@ To subscribe to the calc-tester mailing list, visit the following URL:
 ## 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: 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
 ## File existed as early as:	1994
 ##
--- a/275
+++ b/275
@@ -1,9 +1,172 @@
-The following are the changes from calc version 2.12.5.1 to date:
+The following are the changes from calc version 2.12.6.1 to date:

-    Removed rules and makefile variables assocated with shortened
+    Improved gen_v1(h,n) in lucas.cal to use an even faster search method.
+
+    Improved are checking in lucas.cal.  In particular both h and n must be
+    integers >= 1.  In the case of both rodseth_xhn(x, h, n) and gen_v1(h, n)
+    h must be odd.
+
+    Fixed an C code intending issue that was reported by Thomas Walter
+    <th dot walter42 at gmx dot de> in zfunc.c.
+
+
+The following are the changes from calc version 2.12.6.0 to 2.12.6.0:
+
+    Added the makefile variable ${COMMON_ADD} that will add flags
+    to all compile and link commands. The ${COMMON_ADD} flags are
+    appended to both ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}.  This
+    facility is available to nearly all platforms except those with
+    very old make commands that do not understand the += operator.
+
+    Example on macOS (Darwin), one may invoke clang's -fsanitize
+    facility by:
+
+	make clobber all \
+	  COMMON_ADD='-fsanitize=undefined -fsanitize=address'
+
+    Another example.  To force C warnings to be treated as errors:
+
+	make COMMON_ADD='-Werror'
+
+    Created a GitHub repository for calc:
+
+	https://github.com/lcn2/calc
+
+    NOTE: The calc GitHub repository represents the an active
+	  development stream.  While an effort will be made to keep
+	  the master branch of the calc GitHub repository in working
+	  order, that tree may be unstable.  Those wishing for more
+	  reliable releases use releases found at calc mirror sites:
+
+	    http://www.isthe.com/chongo/tech/comp/calc/calc-mirror.html
+
+    IMPORTANT NOTE:
+
+	On 2017 June 05, the calc GitHub history was re-written.
+	Anyone who was tracking the calc "pre-release" on GitHub prior
+	to version 2.12.6.0 should do a:
+
+	    git reset --hard origin/master
+	    git cleanup -f
+
+	Or you may just want to start over:
+
+	    rm -rf calc
+	    git clone https://github.com/lcn2/calc.git
+
+	Sorry about that.  The previous GitHub repository was an useful
+	experiment.  Based on what we learned, we decided to rebuild it.
+
+    Renamed README to README.FIRST.  Added README.md for the
+    GitHub repository.
+
+    Fixed reading from standard input (stdin) when -p is given on
+    the command line.  This now prints hello:
+
+	echo hello | calc -p 'stdin = files(0); print fgetline(stdin);'
+
+    Added more debugging related to stdin when bit 4 of calc_debug
+    is set (e.g., running calc with -D16).
+
+    Updated the calc(1) man page and 'help file' to explain about
+    reading from standard input (stdin).
+
+    Added some clarifying remarks for 'help ptest' explaining that
+    the ptest builtin can return 1 is some cases where the test
+    value is a pseudoprime.
+
+    Removed duplicate copyright comments from the help/builtin that
+    is built.
+
+    Fixed a number of typos in the CHANGES file.
+
+The following are the changes from calc version 2.12.5.4 to 2.12.5.6:
+
+    Recompile to match current RHEL7.2 libc and friends.
+
+    Added fix by Alexandre Fedotov <fedotov at mail dot desy dot de>
+    to prepend ${T} in front of the CALCPATH path components
+    ${CALC_SHAREDIR} and ${CUSTOMDIR}.  Add ${T} in front of ${HELPDIR}
+    and ${CUSTONHELPDIR} when making conf.h.
+
+    Improved the jacobi help page.
+
+    Rewrote gen_v1() in the lucas.cal resource file using the method
+    based on a paper:
+
+ 	"A note on primality tests for N = h*2^n-1", by Oystein J. Rodseth,
+	Department of Mathematics, University of Bergen, BIT Numerical
+	Mathematics. 34 (3): pp 451-454.
+
+	http://folk.uib.no/nmaoy/papers/luc.pdf
+
+    The improved gen_v1() function is capable of returning a value
+    for all valid values of h and n.  As a result, the trial tables
+    used by gen_v1() have been changed to a short list of values
+    to try, in order ot likelyhood of success, before doing an
+    exhaustive search for a v1 value to return.
+
+    Removed lucas_tbl.cal calc resource file.  This file was made
+    obsolete by the above rewrite of the lucas.cal resource file.
+    This file will be removed from the local cal directory and
+    from CALC_SHAREDIR during a 'make install', 'make clobber',
+    and 'make uninstall'.
+
+    Renamed gen_u0() to gen_u2() in lucas.cal.  Provided a gen_u0()
+    stub function that calls gen_u2() for backward compatibility.
+
+    The old gen_v1() method used by the Amdahl 6 group has been
+    renamed legacy_gen_v1() in lucas.cal.  This function is no
+    longer used by the lucas(h, n) function to test the primality of
+    h*2^n-1.  It is preserved in lucas.cal for historical purposes.
+
+    The 'make clobber' rule will attempt to remove all files that
+    start with libcalc and start with libcustcalc.
+
+    The 'man' command is now an alias for the 'help' command.
+
+    Fixed extra /'s that were put into CALCPATH because of ${T}.
+    Fixed extra /'s that were compiled into HELPDIR and CUSTOMHELPDIR.
+
+    The fix in 2.12.5.4 to to prepend ${T} in front of the CALCPATH
+    path components ${CALC_SHAREDIR} and ${CUSTOMDIR} broke the
+    calc rpm build process.  The check-buildroot tool discovered
+    that the BUILDROOT directory had been improperly put into various
+    paths and binaries.  This has been fixed in 2.12.5.5.
+
+    Fixed a crash that showed up on macOS (Darwin) that was reported
+    by Richard Outerbridge <outer at interlog dot com> and
+    fixed by Stuart Henderson <stu at spacehopper dot org>.
+    Thanks goes to both!
+
+
+The following are the changes from calc version 2.12.5.3 to 2.12.5.3:
+
+    Calc version 2.12.5.2 for macOS (Darwin) 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 macOS (Darwin) users would have been
+    to install cal under /opt/calc.  This release ONLY changes the
+    macOS (Darwin) install tree to /usr/local.
+
+    macOS (Darwin) 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 macOS (Darwin) 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 associated with shortened
    calc version numbers of less than 4 levels.

-    Under OS X (darwin), if /usr/include is missing, warnings
+    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.

@@ -42,13 +205,13 @@ The following are the changes from calc version 2.12.5.0 to 2.12.5.1:
 	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:
+	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
+	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:
+	Email Subject line:

 	    calc tester mailing list help

@@ -56,14 +219,14 @@ The following are the changes from calc version 2.12.5.0 to 2.12.5.1:
 	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:
+    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:
+	To be sure we see your Email reporting a calc bug, please use the
+	following phase in your Email Subject line:

 	    calc bug report

@@ -85,7 +248,7 @@ The following are the changes from calc version 2.12.5.0 to 2.12.5.1:

    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
+    arrays as well as other internal processes) uses the deprecated
    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.
@@ -121,7 +284,7 @@ The following are the changes from calc version 2.12.4.14 to 2.12.5.0:

    We made important fixes to the calc command line history:

-	Fixed a bug in the command line history where calc would somtimes
+	Fixed a bug in the command line history where calc would sometimes
 	crash.  There was code that used memcpy() instead of memmove()
 	that could corrupt the command line history when entering a
 	into into history that was similar to a previous entry.  Thanks
@@ -131,7 +294,7 @@ The following are the changes from calc version 2.12.4.14 to 2.12.5.0:
 	The calc command line history code, in general was not robust.
 	We made use a patch from Mathias Buhr <napcode at users dot sf
 	dot net>, that while it uses a bit more memory: is much more
-	flexible, readable and robust.  This patch replaced the improer
+	flexible, readable and robust.  This patch replaced the improper
 	use of memcpy() (see above) with better code.  Thanks!

    The alg_config.cal calc resource file has been reworked to produce
@@ -264,11 +427,11 @@ The following are the changes from calc version 2.12.4.6 to version 2.12.4.10:
    Set MACOSX_DEPLOYMENT_TARGET=10.8 as we upgraded all of
    our development Mac OS X to 10.8.

-    Libraries are chmodded as 0644 to allow for building rpms
+    Libraries are chmod-ed as 0644 to allow for building rpms
    without root.

    Silenced annoying warning about unused variable 'intp'
-    while compiline endian.c under some circumstances.
+    while compiling endian.c under some circumstances.

    Fixed typo in redeclaration warnings.  Thanks to
    Christoph Zurnieden <czurnieden at gmx dot de> for this report.
@@ -277,13 +440,13 @@ The following are the changes from calc version 2.12.4.6 to version 2.12.4.10:
    Christoph Zurnieden <czurnieden at gmx dot de> including:

    bernpoly.cal - Computes the nth Bernoulli polynomial at z for any n,z
-    brentsolve.cal - root-finder implementwed with the Brent-Dekker trick
+    brentsolve.cal - root-finder implemented with the Brent-Dekker trick
    factorial.cal - product of the positive integers
-    factorial2.cal - variety of integer functions quasi-related to factoral
+    factorial2.cal - variety of integer functions quasi-related to factorial
    lambertw.cal - Computes Lambert's W-function at "z" at branch "branch"
    lnseries.cal - Calculates a series of natural logarithms at 1,2,3,4...n
    specialfunctions.cal - Calculates the value of the beta function
-    statistics.cal - a wide vareity of stastical functions
+    statistics.cal - a wide variety of statistical functions
    toomcook.cal - Multiply by way of the Toom-Cook algorithm
    zeta2.cal - Calculate the value of the Hurwitz Zeta function

@@ -296,7 +459,7 @@ The following are the changes from calc version 2.12.4.6 to version 2.12.4.10:

    We replaced COPYING-LGPL with the version that is found at
    http://www.gnu.org/licenses/lgpl-2.1.txt because that version
-    contans some whitespace formatting cleanup.  Otherwise the
+    contains some whitespace formatting cleanup.  Otherwise the
    license is the same.

    We fixed a number of places where "the the" was used
@@ -322,7 +485,7 @@ The following are the changes from calc version 2.12.4.3 to 2.12.4.5:

    Added gvec.cal resource script.

-    Added calc-symlink make rule to setup symlinks from stardard locations
+    Added calc-symlink make rule to setup symlinks from standard locations
    into a tree specified by a non-empty ${T} makefile variable.  Added
    calc-unsymlink to remove any symlinks that may have been created by
    the calc-symlink rule.
@@ -342,7 +505,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:
    Fixed a documentation bug for the sgn() builtin.

    Added the 1<<8/2 evaluation example to "help unexpected".  That
-    expression evalutes to 128, not 16 as some C programmers might expect.
+    expression evaluates to 128, not 16 as some C programmers might expect.

    Fixed a bug in solve.cal where high was not returned in some situations.

@@ -354,7 +517,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:

    The Makefile used in the source rpm (calc-*.src.rpm) no longer uses
    the -Werror compile flag.  This is to help those distributions with
-    compilers that make produce (hopefully) complination warnings.
+    compilers that make produce (hopefully) compilation warnings.
    NOTE: For testing and calc build purposes will recommend and will
    continue to use the -Werror flag.

@@ -368,7 +531,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:

    one may build a calc binary that is easier to debug.

-    Fixed a bug where an certains typos (e.g., calling an unknown
+    Fixed a bug where an certain typos (e.g., calling an unknown
    function) would previously cause calc to exit.

    Updated the COPYING file to reflect the new filenames associated
@@ -389,7 +552,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:
    Added dms.cal and hms.cal resource files.  The dms.cal is a more
    functional version of deg.cal.  It is a superset except that increment
    and decrement is on the arc second level.  The hms.cal is for
-    24-hour cycle instread of the 360 degree cycle of dms.cal.
+    24-hour cycle instead of the 360 degree cycle of dms.cal.

    Changed deg.cal object name from dms to deg so that the more functional
    dms.cal can own the dms object name.
@@ -397,7 +560,7 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:
    Updated 'help obj' to reflect changes to 'show objfunctions' and
    resource file example list since 1999.

-    Fixed problem where CALC_BYTE_ORDER refering to CALC_BIG_ENDIAN
+    Fixed problem where CALC_BYTE_ORDER referring to CALC_BIG_ENDIAN
    and CALC_LITTLE_ENDIAN instead of BIG_ENDIAN and LITTLE_ENDIAN.


@@ -409,7 +572,7 @@ The following are the changes from calc version 2.12.3.0 to 2.12.3.3:

    Calc versions will always be of the form x.y.z.w even when the
    MINOR_PATCH (w) is 0.  Thus, 2.12.3.0 will be printed as 2.12.3.0
-    instread of just 2.12.3.
+    instead of just 2.12.3.

    Added MINGW32_NT-5.0 compile target based on a patch from
    Brian L. Angus (angus at eng dot utah dot edu).
@@ -423,7 +586,7 @@ The following are the changes from calc version 2.12.3.0 to 2.12.3.3:

    The ${CALC_INCDIR}/custom is no longer being removed at install time
    if it is empty.  Now when ${ALLOW_CUSTOM} make variable is empty,
-    an empty ${CALC_INCDIR}/custom may be left hehind.
+    an empty ${CALC_INCDIR}/custom may be left behind.

    Fixed a problem where a "make clobber" would remove custom/Makefile
    and fail to rebuilt it.
@@ -493,7 +656,7 @@ The following are the changes from calc version 2.12.1.1 to 2.12.2.2:
    Fixed the wording for the -i flag in the calc man page.

    Added some notes to the help/unexpected file regarding calc
-    and interactice shells.
+    and interactive shells.

    Fixed bug where a FILEPOS was copied FPOS_POS_BITS octets instead of
    FPOS_POS_LEN octets.
@@ -517,7 +680,7 @@ The following are the changes from calc version 2.12.1.1 to 2.12.2.2:
    operate over a half closed interval.  The help/rand and help/random
    refer to  the top of the interval as "beyond" instead of "max".

-    Releaseing source tar balls using bzip2 instead of with gzip.  So
+    Releasing source tar balls using bzip2 instead of with gzip.  So
    what was calc-something.tar.gz is now calc-something.tar.bz2.
    To "uncompress" use:

@@ -656,7 +819,7 @@ The following are the changes from calc version 2.12.1.10 to 2.12.2:

 	      	calc-contrib at asthe dot com

-	      EMail address an "ifeq ($(target),YOUR_TARGET_NAME)"
+	      Email address an "ifeq ($(target),YOUR_TARGET_NAME)"
 	      ... "endif" set of lines from the Makefile so that
 	      we can consider them for the next release.

@@ -789,7 +952,7 @@ The following are the changes from calc version 2.12.1.10 to 2.12.2:
 	2.5 ^ 2.718i            3.13145i ^ 0.30103i

    Fixed typos in the calc man page thanks to a Debian bug report
-    by A. Costa <agcosta at gis dot .net> that wsa kindly forwarded
+    by A. Costa <agcosta at gis dot .net> that was kindly forwarded
    to us by Martin Buck <m at rtin-buck dot de>.


@@ -1410,7 +1573,7 @@ The following are the changes from calc version 2.11.10 to 2.11.10:
    and ${L64_FORMAT}.  Removed longlong.c and longlong.h.  The use
    of HAVE_LONGLONG=0 was problematic.  The lack of complaints about
    the HAVE_LONGLONG=0 shows that the 'long long' type is wide spread
-    enough warrent not trying to support compilers without 'long long'.
+    enough to warrant not trying to support compilers without 'long long'.

    Removed the SVAL and SHVAL macros from zrand.c, zrand.h, and zmath.h
    as they were causing too many broken C pre-processors and C checkers
@@ -1424,7 +1587,7 @@ The following are the changes from calc version 2.11.10 to 2.11.10:
    could test calc.  Best wishes to the former BSDI folk and thanks
    for breaking important ground in the Open Source Movement!

-    Fixed several typos found in the documentation and buildin
+    Fixed several typos found in the documentation and builtin
    function output by C Smith <smichr at hotmail dot com>.

    Fixed -d so that:
@@ -1796,7 +1959,7 @@ The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
    version string.

    Added subject requirements for the calc-tester-request and
-    calc-bugs-mail EMail aliases.  See:
+    calc-bugs-mail Email aliases.  See:

    	http://www.isthe.com/chongo/tech/comp/calc/email.html

@@ -1824,7 +1987,7 @@ The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
    (kawamura at mlb.co.jp) for the bug report and patch!

    Fixed headers on fproduct.calc powerterm.calc 4dsphere.calc so
-    that they are correcly changed on installation.
+    that they are correctly changed on installation.

    Added ${GREP} Makefile variable.

@@ -2108,7 +2271,7 @@ The following are the changes from calc version 2.11.4t1 to 2.11.4t2:
    function.  It remains for backward compatibility.

    The Makefile now builds have_fpos_pos.h to determine if the
-    a non-scalar FILEPOS has a __pos stucture element.  If it does,
+    a non-scalar FILEPOS has a __pos structure element.  If it does,
    the FILEPOS_BITS is taken to be the size of just the __pos element.

    Misc fixes related to non-scalar (e.g., structure) FILEPOS.  Fixed
@@ -2373,8 +2536,8 @@ The following are the changes from calc version 2.11.2t0 to 2.11.2t1.0:
    Fixed a bug whereby help files are not displayed correctly on
    systems such as NetBSD 1.4.1.  Thanks to a fix from Jakob Naumann.

-    Changed EMail addresses to use asthe.com.  Changed URLs to use
-    www.isthe.com.  NOTE: The EMail address uses 'asthe' and the web
+    Changed Email addresses to use asthe.com.  Changed URLs to use
+    www.isthe.com.  NOTE: The Email address uses 'asthe' and the web
    site URL uses 'isthe'.

    Using calc-bugs at asthe dot com for calc bug reports,
@@ -2382,7 +2545,7 @@ The following are the changes from calc version 2.11.2t0 to 2.11.2t1.0:
    calc-tester-request at asthe dot com for requests to join calc-tester and
    calc-tester at asthe dot com for the calc tester mailing list.

-    Replaced explicit EMail addresses found this file with the <user at
+    Replaced explicit Email addresses found this file with the <user at
    site dot domain> notation to reduce the potential for those folks
    to be spammed.

@@ -2858,7 +3021,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
    by Prentice-Hall (UK) Ltd., 1990.)	The piforever() function prints
    digits of pi for as long as your memory and system uptime allows.  :-)

-    Fixed the URLs found thruout the source and documentation which did
+    Fixed the URLs found throughout the source and documentation which did
    not and in /, but should for performance and server load reasons.

    Cleaned up and improved handling of "mat" and "obj".  The comma in:
@@ -2937,7 +3100,7 @@ The following are the changes from calc version 2.11.0t8.9.1 to 2.11.0t9.4.5:
    and investigated by Michel van der List <vanderlistmj at sbphrd dot com>.

    Made an effort to ensure that the v_subtype of VALUES are initialized
-    to V_NOSUBTYPE thruout the source code.
+    to V_NOSUBTYPE through out the source code.

    Established a separate calc-bugs address from the calc-tester
    mailing list.  Using anti-spam address forms in order to try and
@@ -2970,7 +3133,7 @@ The following are the changes from calc version 2.11.0t8 to 2.11.0t8.9:
    If $CALCRC has more than one file as in file1:file2 and an error
    occurs in file1, then calc -c will not read file2.

-    Fixed some of the old EMail addresses found in calc documentation.
+    Fixed some of the old Email addresses found in calc documentation.

    Added HAVE_USTAT, HAVE_GETSID, HAVE_GETPGID, HAVE_GETTIME, HAVE_GETPRID
    and HAVE_URANDOM symbols to the Makefile.  These symbols, along with
@@ -3428,7 +3591,7 @@ The following are the changes from calc version 2.11.0t1 to 2.11.0t6.3:
    A patch from Ernest Bowen <ernie at turing dot une dot edu dot au> now
    defines special meaning to the first 2 bits of config("lib_debug"):

-	bit 0 set => messages printed when inputisterminal
+	bit 0 set => messages printed when input is from a terminal
 	bit 1 set => messages printed when reading from a file

    The lib/regress.cal regression suite does:
@@ -4377,7 +4540,7 @@ The following are the changes from calc version 2.10.3t5.28 to 2.10.3t5.33:
    long Mersenne factorizations.  The default reporting loop
    is now 10000 cycles.

-    SGI Mips r10k compile set is speced for IRIX6.5 with v7.2
+    SGI Mips r10k compile set is specified for IRIX6.5 with v7.2
    compilers.	A note for pre-IRIX6.5 and/or pre-v7.2 compilers
    is given in the compile set.

@@ -4638,7 +4801,7 @@ The following are the changes from calc version 2.10.3t5.1 to 2.10.3t5.10:
    surprises that C programmers may encounter.

    Updated the 'help', 'intro' and 'overview' to reflect the
-    full list of non-builtin function help files.  Reorered the
+    full list of non-builtin function help files.  Reordered the
    'full' help file.

    The blkalloc() builtin has been renamed blk().
@@ -5589,7 +5752,7 @@ The following are the changes from calc version 2.10.2t4 to 2.10.2t24:

     The regression test suite output has been changed so that it will
     output the same information regardless of CPU performance.	 In
-     particular, cpu times of certain tests are not printed.  This allows
+     particular, CPU times of certain tests are not printed.  This allows
     one to compare the regression output of two different systems easier.

     A matrix or object declaration is now considered an expression
@@ -5912,11 +6075,11 @@ The following are the changes from calc version 2.10.2t1 to 2.10.2t3:
 	    y = fgetstr(f);	/* returns "Curt" */
 	    z = fgetstr(f);	/* returns "Noll" */

-    The builtin fgetfield() returns the next field of non-whitepsace
+    The builtin fgetfield() returns the next field of non-whitespace
    characters.

    The builtins scan(), fscan(), strscan() read tokens (fields of
-    non-whitepsace characters) and evaluates them.  Thus:
+    non-whitespace characters) and evaluates them.  Thus:

 	global a,b,c;
 	strscan("2+3  4^2\n c=a+b", a, b, 0);
@@ -6195,7 +6358,7 @@ The following are the changes from calc version 2.10.1t11 to 2.10.1t19:
 	config("all", "newstd")

    Renamed config.h (configuration file built during the make) to conf.h.
-    Added a new config.h to contain info on thw V_CONFIG type.
+    Added a new config.h to contain info on the V_CONFIG type.

    Fixed some ANSI C compile warnings.

@@ -6760,7 +6923,7 @@ The following are the changes from calc version 2.9.3t8 to 2.9.3t9.2:
    the rand() builtin does not match the additive 55 / shuffle
    generators from the old cryrand.cal file.

-    Added Makfile support for building BSD/386 releases.
+    Added Makefile support for building BSD/386 releases.

    The cmp() builtin can now compare complex values.

@@ -6811,10 +6974,10 @@ The following are the changes from calc version 2.9.3t8 to 2.9.3t9.2:
    which is built from have_const.c will determine if we can or should
    use const.	See the Makefile for details.

-    Some systems do not have uid_t.  The file have_uid_t.h, which is
-    built from have_uid_t.c will determine if we can or should depend
-    on uid_t being typefed by the system include files.	 See the Makefile
-    for details.
+    Some systems do not have uid_t.  The file have_uid_t.h, which
+    is built from have_uid_t.c will determine if we can or should
+    depend on uid_t being typedefed by the system include files.
+    See the Makefile for details.

    Some systems do not have memcpy(), memset() and strchr().  The
    file have_newstr.h, which is built from have_newstr.c will
@@ -7120,7 +7283,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-2014  Landon Curt Noll
+## Copyright (C) 2001-2017  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
@@ -7136,10 +7299,6 @@ 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.49 $
-## @(#) $Id: CHANGES,v 30.49 2016/02/06 08:42:57 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $
-##
 ## Under source code control:	1993/06/02 18:12:57
 ## File existed as early as:	1989
 ##
--- a/4
+++ b/4
@@ -12,10 +12,6 @@ This file is Copyrighted
 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.

-    # @(#) $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 $
-
 -=-

 Calc is covered by the GNU Lesser General Public License
--- a/HOWTO.INSTALL
+++ b/HOWTO.INSTALL
@@ -185,8 +185,8 @@ Installing calc from the bzip2-ed tarball in 4 easy steps:

 	make install

-We suggest that you might want to read the README file and look at
-the calc help subsystem.  See the README file for details.
+We suggest that you might want to read the README.FIRST file and look at
+the calc help subsystem.  See also the README.md file.

 ## Copyright (C) 1999-2007  Landon Curt Noll
 ##
@@ -204,10 +204,6 @@ the calc help subsystem.  See the README file for details.
 ## 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.6 $
-## @(#) $Id: HOWTO.INSTALL,v 30.6 2007/10/16 12:22:22 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/HOWTO.INSTALL,v $
-##
 ## Under source code control:	1999/09/27 20:48:44
 ## File existed as early as:	1999
 ##
--- a/4
+++ b/4
@@ -638,10 +638,6 @@ need call libcalc_call_me_last() only once.
 ## 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: LIBRARY,v 30.1 2007/03/16 11:09:46 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/LIBRARY,v $
-##
 ## Under source code control:	1993/07/30 19:44:49
 ## File existed as early as:	1993
 ##
--- a/6280
+++ b/6280
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -23,7 +23,7 @@
 #	 READLINE_LIB= -lreadline
 #	 READLINE_EXTRAS= -lhistory -lncurses
 #
-# Copyright (C) 1999-2014  Landon Curt Noll
+# Copyright (C) 1999-2017  Landon Curt Noll
 #
 # Calc is open software; you can redistribute it and/or modify it under
 # the terms of version 2.1 of the GNU Lesser General Public License
@@ -39,9 +39,7 @@
 # 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.83 $$
-# @(#) $Id: Makefile.ship,v 30.83 2016/02/06 08:16:06 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
+MAKEFILE_REV= $$Revision: 30.88 $$
 #
 # Under source code control:	1990/02/15 01:48:41
 # File existed as early as:	before 1990
@@ -52,6 +50,21 @@ MAKEFILE_REV= $$Revision: 30.83 $$
 # calculator by David I. Bell with help/mods from others
 # Makefile by Landon Curt Noll

+#if 0	/* start of skip for non-Gnu makefiles */
+##############################################################################
+#-=-=-=-=-=-=-=-=- Identify the target machine, if possible -=-=-=-=-=-=-=-=-#
+##############################################################################
+
+# NOTE: You can force a target value by defining target as in:
+#
+#	make ...__optional_arguments_... target=value
+
+# Try uname -s if the target was not already set on the make command line
+#
+ifeq ($(target),)
+target=$(shell uname -s 2>/dev/null)
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 ##############################################################################
 #-=-=-=-=-=-=-=-=- You may want to change some values below -=-=-=-=-=-=-=-=-#
@@ -110,7 +123,7 @@ HAVE_VSPRINTF=
 # use BYTE_ORDER in <machine/endian.h> or it will attempt to run
 # the endian program.  If you get syntax errors when you compile,
 # try forcing the value to be -DBIG_ENDIAN and run the calc regression
-# tests. (see the README file)	If the calc regression tests fail, do
+# tests. (see the README.FIRST file) If the calc regression tests fail, do
 # a make clobber and try -DCALC_LITTLE_ENDIAN.   If that fails, ask a wizard
 # for help.
 #
@@ -771,7 +784,23 @@ ALLOW_CUSTOM= -DCUSTOM
 #
 # Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef RPM_TOP
+ifdef ALLOW_CUSTOM
 CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}:${CUSTOMCALDIR}
+else
+CALCPATH= .:./cal:~/.cal:${CALC_SHAREDIR}
+endif
+else
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
+CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}
+endif
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # If the $CALCRC environment variable is not defined, then the following
 # path will be searched for calc resource files.
@@ -961,7 +990,7 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.5.2
+VERSION= 2.12.6.2

 # Names of shared libraries with versions
 #
@@ -1026,7 +1055,15 @@ EXTRA_LDFLAGS=
 # COMMON_CFLAGS are the common ${CC} flags used for all programs, both
 #	    intermediate and final calc and calc related programs
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 COMMON_CFLAGS= -DCALC_SRC ${ALLOW_CUSTOM} ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+COMMON_CFLAGS= -DCALC_SRC -UCUSTOM ${CCWARN} ${CCMISC} ${EXTRA_CFLAGS}
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # COMMON_LDFLAGS are the common flags used for linking all programs, both
 #	     intermediate and final calc and calc related programs
@@ -1052,7 +1089,7 @@ COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 # LIBCALC_SHLIB are flags given to ${CC} to build libcalc shared libraries
 # LIBCUSTCALC_SHLIB are flags given to ${CC} to build libcustcalc shared lib
 #
-#	NOTE: The above 4 values are unused if BLD_TYPE= calc-static-only
+#	NOTE: The above 5 values are unused if BLD_TYPE= calc-static-only
 #
 # CC_STATIC are flags given to ${CC} to build .o files suitable for static libs
 # LD_STATIC are common flags given to ${CC} to link with static libraries
@@ -1095,6 +1132,390 @@ COMMON_LDFLAGS= ${EXTRA_LDFLAGS}
 #	set of lines so that we can consider them for the next release.  #
 ##########################################################################

+#if 0	/* start of skip for non-Gnu makefiles */
+################
+# Linux target #
+################
+
+ifeq ($(target),Linux)
+#
+BLD_TYPE= calc-dynamic-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LD_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
+##############################
+# Apple OS X / Darwin target #
+##############################
+
+ifeq ($(target),Darwin)
+#
+BLD_TYPE= calc-dynamic-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
+LD_SHARE= ${DARWIN_ARCH}
+#SET_INSTALL_NAME= no
+SET_INSTALL_NAME= yes
+ifeq ($(SET_INSTALL_NAME),yes)
+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+    -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION} ${DARWIN_ARCH}
+else
+LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+    ${DARWIN_ARCH}
+endif
+ifdef ALLOW_CUSTOM
+ifeq ($(SET_INSTALL_NAME),yes)
+LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+    -install_name ${LIBDIR}/libcustcalc${LIB_EXT_VERSION} ${DARWIN_ARCH}
+else
+LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib \
+    ${DARWIN_ARCH}
+endif
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LD_STATIC= ${DARWIN_ARCH}
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use clang's -fsanitize for calc testing,
+# which requires a common set of flags to be passed to
+# every compile and link, then call make with:
+#
+#   make .. COMMON_ADD='-fsanitize=undefined -fsanitize=address'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC= ${DARWIN_ARCH}
+#
+LCC= clang
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+# Darwin dynamic shared lib filenames
+LIB_EXT:= .dylib
+LIB_EXT_VERSION:= .${VERSION}${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
+# DARWIN_ARCH= -arch i386		# Intel binary
+# DARWIN_ARCH= -arch ppc		# PPC binary
+# 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
+
+##################
+# FreeBSD target #
+##################
+
+########################################################################
+# NOTE: You MUST either use gmake (GNU Make) or you must try your luck #
+#       with Makefile.simple and custom/Makefile.simple versions.      #
+#	See HOWTO.INSTALL for more information.                        #
+########################################################################
+
+ifeq ($(target),FreeBSD)
+#
+BLD_TYPE= calc-dynamic-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LD_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+MAKE= gmake
+#
+endif
+
+##################
+# OpenBSD target #
+##################
+
+########################################################################
+# NOTE: You MUST either use gmake (GNU Make) or you must try your luck #
+#       with Makefile.simple and custom/Makefile.simple versions.      #
+#	See HOWTO.INSTALL for more information.                        #
+########################################################################
+
+ifeq ($(target),OpenBSD)
+#
+BLD_TYPE= calc-dynamic-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LD_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+MAKE= gmake
+#
+endif
+
+################
+# SunOS target #
+################
+
+ifeq ($(target),SunOS)
+#
+BLD_TYPE= calc-dynamic-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+LD_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
+#################
+# Cygwin target #
+#################
+
+ifeq ($(target),Cygwin)
+#
+BLD_TYPE= calc-static-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+LD_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
+#######################################################
+# simple target - values used to form Makefile.simple #
+#######################################################
+
+# NOTE: This is not a real host target.  The simple target
+#	exists only to form the Makefile.simple file.
+
+ifeq ($(target),simple)
+#endif	/* end of skip for non-Gnu makefiles */
 #
 BLD_TYPE= calc-static-only
 #
@@ -1134,7 +1555,141 @@ CFLAGS= ${ICFLAGS} ${CCOPT}
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 #
-CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+
+###################################################
+# MINGW32_NT-5.0 target                           #
+###################################################
+
+
+ifeq ($(target),MINGW32_NT-5.0)
+
+EXT=.exe
+TERMCONTROL= -DUSE_WIN32
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
+CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR}
+endif
+CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
+#
+BLD_TYPE= calc-static-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC= -DSTATIC_ONLY
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+LD_STATIC=
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC= -DNOTCYGWIN
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
+###################################################
+# default target - when no specific target exists #
+###################################################
+
+# NOTE: This is the default generic host target.  Used when no other
+#	host target matches.
+
+ifeq ($(target),)
+#
+BLD_TYPE= calc-static-only
+#
+CC_SHARE= -fPIC
+DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+    "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ifdef ALLOW_CUSTOM
+LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+else
+LIBCUSTCALC_SHLIB=
+endif
+#
+CC_STATIC=
+LIBCALC_STATIC=
+LIBCUSTCALC_STATIC=
+LD_STATIC=
+#
+# If you want to add flags to all compiler and linker
+# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}),
+# set ${COMMON_ADD}.
+#
+# For example to use gcc's -Werror to force warnings
+# to become errors, call make with:
+#
+#   make .. COMMON_ADD='-Werror'
+#
+# This facility requires a Gnu Makefile, or a make command
+# that understands the += make operand.
+#
+#if 0	/* start of skip for non-Gnu makefiles */
+COMMON_CFLAGS+= ${COMMON_ADD}
+COMMON_LDFLAGS+= ${COMMON_ADD}
+#endif	/* end of skip for non-Gnu makefiles */
+#
+CCWARN= -Wall
+WNO_IMPLICT= -Wno-implicit
+WNO_ERROR_LONG_LONG= -Wno-error=long-long
+WNO_LONG_LONG= -Wno-long-long
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
+###########################################
+# Set the default compile flags for ${CC} #
+###########################################
+
+# Required flags to compile C files for calc
+#
+# ICFLAGS are given to ${CC} for intermediate programs used to help compile calc
+# CFLAGS are given to ${CC} for calc programs other than intermediate programs
+#
+# NOTE: This does not work for: make-XYZ-only and BLD_TYPE != make-XYZ-only
+#
+ifeq ($(BLD_TYPE),calc-static-only)
+ICFLAGS= ${COMMON_CFLAGS} ${CC_STATIC}
+else
+ICFLAGS= ${COMMON_CFLAGS} ${CC_SHARE}
+endif
+CFLAGS= ${ICFLAGS} ${CCOPT}
+
+# Required flags to link files for calc
+#
+# ILDFLAGS for ${CC} in linking intermediate programs used to help compile calc
+# LDFLAGS for ${CC} in linking calc programs other than intermediate programs
+#
+ILDFLAGS= ${COMMON_LDFLAGS}
+LDFLAGS= ${LD_DEBUG} ${ILDFLAGS}
+#endif	/* end of skip for non-Gnu makefiles */

 #######################################################################
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
@@ -1307,6 +1862,7 @@ CUSTOM_PASSDOWN=  \
    CHMOD=${CHMOD} \
    CMP=${CMP} \
    CO=${CO} \
+    COMMON_ADD="${COMMON_ADD}" \
    COMMON_CFLAGS="${COMMON_CFLAGS} -I.." \
    COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
    CP=${CP} \
@@ -1361,11 +1917,13 @@ HELP_PASSDOWN= \
    CHMOD=${CHMOD} \
    CMP=${CMP} \
    CO=${CO} \
+    COMMON_ADD="${COMMON_ADD}" \
    COMMON_CFLAGS="${COMMON_CFLAGS}" \
    COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
    CP=${CP} \
    EXT=${EXT} \
    FMT=${FMT} \
+    GREP=${GREP} \
    HELPDIR="${HELPDIR}" \
    ICFLAGS="${ICFLAGS}" \
    ILDFLAGS="${ILDFLAGS}" \
@@ -1459,9 +2017,9 @@ LICENSE= COPYING COPYING-LGPL

 # These files are found (but not built) in the distribution
 #
-DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README \
+DISTLIST= ${C_SRC} ${H_SRC} ${MAKE_FILE} BUGS CHANGES LIBRARY README.FIRST \
 	  README.WINDOWS calc.man HOWTO.INSTALL ${UTIL_MISC_SRC} ${LICENSE} \
-	  sample.README calc.spec.in rpm.mk
+	  sample.README calc.spec.in rpm.mk README.md

 # These files are used to make (but not build) a calc .a link library
 #
@@ -1474,16 +2032,40 @@ OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJ}

 # static library build
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 CALC_STATIC_LIBS= libcalc.a libcustcalc.a
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+CALC_STATIC_LIBS= libcalc.a
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # Libraries created and used to build calc
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION} libcustcalc${LIB_EXT_VERSION}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+CALC_DYNAMIC_LIBS= libcalc${LIB_EXT_VERSION}
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # Symlinks of dynamic shared libraries
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 SYM_DYNAMIC_LIBS= libcalc${LIB_EXT} \
 	libcustcalc${LIB_EXT_VERSION}  libcustcalc${LIB_EXT}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+SYM_DYNAMIC_LIBS= libcalc${LIB_EXT}
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # list of sample programs that need to be built to satisfy sample rule
 #
@@ -1514,7 +2096,15 @@ STATIC_FIRST_TARGETS= ${LICENSE} .static

 # early targets - things needed before the main build phase can begin
 #
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 EARLY_TARGETS= custom/Makefile hsrc .hsrc custom/.all
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+EARLY_TARGETS= hsrc .hsrc
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 # late targets - things needed after the main build phase is complete
 #
@@ -1679,7 +2269,7 @@ calc.1: calc.man ${MAKE_FILE}
 	        -e 's,$${CUSTOMINCDIR},${CUSTOMINCDIR},g' \
 	        -e 's,$${CUSTOMHELPDIR},${CUSTOMHELPDIR},g' \
 	        -e 's,$${CALCRC},${CALCRC},g' < calc.man > calc.1
-	${Q} echo calc.man formed
+	${Q} echo calc.1 formed

 calc.usage: calc.1 ${MAKE_FILE}
 	${RM} -f $@
@@ -1701,11 +2291,11 @@ calc.usage: calc.1 ${MAKE_FILE}
 sample: ${SAMPLE_TARGETS}

 sample_rand${EXT}: sample_rand.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
-	${CC} sample_rand.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+	${CC} sample_rand.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@

 sample_many${EXT}: sample_many.o ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
-	${CC} sample_many.o ${CLDFALGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+	${CC} sample_many.o ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
 	      ${READLINE_LIB} ${READLINE_EXTRAS} -o $@

 ###
@@ -1771,14 +2361,36 @@ conf.h: ${MAKE_FILE}
 	${Q} echo '' >> conf.h
 	${Q} echo '/* the location of the help directory */' >> conf.h
 	${Q} echo '#if !defined(HELPDIR)' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef RPM_TOP
 	${Q} echo '#define HELPDIR "${HELPDIR}"' >> conf.h
+else
+#endif	/* end of skip for non-Gnu makefiles */
+	${Q} echo '#define HELPDIR "${T}${HELPDIR}"' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 	${Q} echo '#endif /* HELPDIR */' >> conf.h
 	${Q} echo '' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 	${Q} echo '/* the location of the custom help directory */' >> conf.h
 	${Q} echo '#if !defined(CUSTOMHELPDIR)' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef RPM_TOP
 	${Q} echo '#define CUSTOMHELPDIR "${CUSTOMHELPDIR}"' >> conf.h
+else
+#endif	/* end of skip for non-Gnu makefiles */
+	${Q} echo '#define CUSTOMHELPDIR "${T}${CUSTOMHELPDIR}"' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 	${Q} echo '#endif /* CUSTOMHELPDIR */' >> conf.h
 	${Q} echo '' >> conf.h
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 	${Q} echo '/* the default pager to use */' >> conf.h
 	${Q} echo '#if !defined(DEFAULTCALCPAGER)' >> conf.h
 	${Q} echo '#define DEFAULTCALCPAGER "${CALCPAGER}"' >> conf.h
@@ -3110,18 +3722,21 @@ ${CSCRIPT_TARGETS}: cscript/Makefile
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 custom/.all: custom/Makefile
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
 	${RM} -f $@
-	cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} all
+	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} all
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

 custom/libcustcalc${LIB_EXT_VERSION}: custom/Makefile
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking all rule for custom =-=-=-=-='
-	cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} $@
+	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

@@ -3132,6 +3747,9 @@ libcustcalc${LIB_EXT_VERSION}: custom/libcustcalc${LIB_EXT_VERSION}
 libcustcalc${LIB_EXT}: libcustcalc${LIB_EXT_VERSION}
 	${Q} ${RM} -f $@
 	${LN} -s $? $@
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 ###
 #
@@ -3155,8 +3773,14 @@ libcalc.a: ${LIBOBJS} ${MAKE_FILE}
 	${RANLIB} libcalc.a
 	${CHMOD} 0644 libcalc.a

+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 custom/libcustcalc.a: custom/Makefile
-	cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} libcustcalc.a
+	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} libcustcalc.a
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */

 sample_rand-static${EXT}: sample_rand.o ${CALC_STATIC_LIBS} ${MAKE_FILE}
 	${CC} ${LDFLAGS} sample_rand.o ${LD_STATIC} \
@@ -3189,7 +3813,7 @@ depend: custom/Makefile hsrc
 	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} depend
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking depend rule for custom =-=-=-=-='
-	${Q} cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} depend
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} depend
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${Q} echo forming skel
 	${Q} ${RM} -rf skel
@@ -3305,7 +3929,7 @@ distlist: custom/Makefile ${DISTLIST}
 	done; \
 	(cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@); \
 	(cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@); \
-	(cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} $@); \
+	(cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@); \
 	(cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@) \
 	) | LANG=C ${SORT}

@@ -3314,7 +3938,7 @@ distdir: custom/Makefile
 	echo win32; \
 	(cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@); \
 	(cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@); \
-	(cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} $@); \
+	(cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@); \
 	(cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@) \
 	) | LANG=C ${SORT}

@@ -3326,7 +3950,7 @@ calcliblist: custom/Makefile
 	done; \
 	(cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} $@); \
 	(cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} $@); \
-	(cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} $@); \
+	(cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} $@); \
 	(cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} $@) \
 	) | LANG=C ${SORT}

@@ -3334,6 +3958,32 @@ calcliblistfmt:
 	${Q} ${MAKE} -f Makefile calcliblist | \
 	    ${FMT} -64 | ${SED} -e 's/^/	/'

+#if 0	/* start of skip for non-Gnu makefiles */
+custom/Makefile: ${MAKE_FILE} custom/Makefile.head custom/Makefile.tail
+	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	${Q} ${RM} -f $@
+	${Q} ${CAT} custom/Makefile.head > $@
+	${Q} ${SED} -n -e \
+	    "/^# start of host target cut/,/^# end of host target cut/p" \
+	    ${MAKE_FILE} >> $@
+	${Q} ${CAT} custom/Makefile.tail >> $@
+	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
+
+Makefile.simple: ${MAKE_FILE} custom/Makefile.simple
+	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	${Q} ${RM} -f $@
+	${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
+	    ${MAKE_FILE} | \
+	    ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/g' > $@
+	${Q} echo >> $@
+	${Q} echo 'Makefile.simple:' >> $@
+	${Q} echo '	$${Q} if [ ! -f Makefile.simple ]; then '"\\" >> $@
+	${Q} echo '		$${CP} -f $${MAKE_FILE} $$@; fi' >> $@
+	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
+
+custom/Makefile.simple: custom/Makefile
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} Makefile.simple
+#endif	/* end of skip for non-Gnu makefiles */

 ###
 #
@@ -3410,6 +4060,7 @@ env:
 	@echo 'CMP=${CMP}'; echo ''
 	@echo 'CO=${CO}'; echo ''
 	@echo 'COL=${COL}'; echo ''
+	@echo 'COMMON_ADD=${COMMON_ADD}'; echo ''
 	@echo 'COMMON_CFLAGS=${COMMON_CFLAGS}'; echo ''
 	@echo 'COMMON_LDFLAGS=${COMMON_LDFLAGS}'; echo ''
 	@echo 'CP=${CP}'; echo ''
@@ -3599,6 +4250,13 @@ gdb:
 #
 ###

+# NOTE: Only the 2 rpm rules should set ${RPM_TOP}!
+#
+# When making calc RPM, ${RPM_TOP} will be set to the tree
+# under which rpm files are built.  You should NOT set RPM_TOP
+# by yourself.  Only make rpm and make rpm-preclean should
+# set this value.
+
 rpm: clobber rpm-preclean rpm.mk calc.spec.in
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	${MAKE} -f rpm.mk all V=${V} RPM_TOP="${RPM_TOP}"
@@ -3729,7 +4387,7 @@ clean: custom/Makefile
 	cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} clean
 	${Q} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} clean
+	cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} clean
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
 	cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} clean
@@ -3754,15 +4412,15 @@ clobber: custom/Makefile clean
 	${RM} -f *.pure_hardlin
 	${RM} -f *.u
 	${RM} -f libcalc.a
+	${RM} -f libcustcalc.a
 	${RM} -f calc.1 calc.usage
 	${RM} -f calc.pixie calc.rf calc.Counts calc.cord
 	${RM} -rf gen_h skel Makefile.bak tmp.patch
 	${RM} -f calc.spec inst_files rpm.mk.patch tmp
 	${RM} -f libcalc${LIB_EXT_VERSION}
-	${RM} -f libcalc*${LIB_EXT}
+	${RM} -f libcalc*
 	${RM} -f libcustcalc${LIB_EXT_VERSION}
-	${RM} -f libcustcalc*${LIB_EXT}
-	${RM} -f libcustcalc.a
+	${RM} -f libcustcalc*
 	${RM} -f calc-static${EXT}
 	${RM} -f ${CALC_STATIC_LIBS}
 	${RM} -f all
@@ -3782,7 +4440,16 @@ clobber: custom/Makefile clean
 	${RM} -rf win32 build
 	${RM} -f no_implicit.arg
 	${RM} -f no_implicit.c no_implicit.o no_implicit${EXT}
+#if 0	/* start of skip for non-Gnu makefiles */
+	${RM} -f Makefile.simple
+	${RM} -f custom/Makefile
+	-${MAKE} -f ${MAKE_FILE} custom/Makefile
+#endif	/* end of skip for non-Gnu makefiles */
 	${RM} -f .static .dynamic calc-dynamic-only calc-static-only
+	-${Q} if [ -e .DS_Store ]; then \
+	    echo ${RM} -rf .DS_Store; \
+	    ${RM} -rf .DS_Store; \
+	fi
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

 # install everything
@@ -3847,6 +4514,9 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	else \
 	    ${TRUE}; \
 	fi
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 	-${Q} if [ ! -d ${T}${CUSTOMCALDIR} ]; then \
 	    echo ${MKDIR} -p ${T}${CUSTOMCALDIR}; \
 	    ${MKDIR} -p ${T}${CUSTOMCALDIR}; \
@@ -3871,6 +4541,9 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	else \
 	    ${TRUE}; \
 	fi
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 	-${Q} if [ ! -d ${T}${SCRIPTDIR} ]; then \
 	    echo ${MKDIR} -p ${T}${SCRIPTDIR}; \
 	    ${MKDIR} -p ${T}${SCRIPTDIR}; \
@@ -3932,9 +4605,15 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
 	${Q} cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+#if 0	/* start of skip for non-Gnu makefiles */
+ifdef ALLOW_CUSTOM
+#endif	/* end of skip for non-Gnu makefiles */
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	${Q} cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} install
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+#if 0	/* start of skip for non-Gnu makefiles */
+endif
+#endif	/* end of skip for non-Gnu makefiles */
 	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
 	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} install
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -4158,7 +4837,7 @@ uninstall: custom/Makefile
 	${Q} cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
-	${Q} cd custom; ${MAKE} -f Makefile.simple ${CUSTOM_PASSDOWN} uninstall
+	${Q} cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} uninstall
 	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
 	${Q} cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} uninstall
@@ -5565,7 +6244,3 @@ zrandom.o: value.h
 zrandom.o: zmath.h
 zrandom.o: zrandom.c
 zrandom.o: zrandom.h
-
-Makefile.simple:
-	${Q} if [ ! -f Makefile.simple ]; then \
-		${CP} -f ${MAKE_FILE} $@; fi
--- a/README.FIRST
+++ b/README.FIRST
@@ -130,7 +130,7 @@ The calc web site is located at:

 NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.

-## Copyright (C) 1999,2014  Landon Curt Noll
+## Copyright (C) 1999,2014,2017  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
@@ -146,10 +146,6 @@ NOTE: The EMail address uses 'asthe', while the web site uses 'isthe'.
 ## 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,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
 ## File existed as early as:	1995
 ##
--- a/README.WINDOWS
+++ b/README.WINDOWS
@@ -142,10 +142,6 @@ the above Makefile list, follow the recommendation in the Makefile.
 ## 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: README.WINDOWS,v 30.2 2009/03/14 02:29:31 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/README.WINDOWS,v $
-##
 ## Under source code control:	2001/02/25 14:00:05
 ## File existed as early as:	2001
 ##
--- a/README.md
+++ b/README.md
@@ -0,0 +1,260 @@
+# What is calc?
+
+Calc is an interactive calculator which provides for easy large
+Otherwise, it enters interactive mode.  In this mode, it accepts
+commands one at a time, processes them, and displays the answers.
+In the simplest case, commands are simply expressions which are
+evaluated.  For example, the following line can be input:
+
+```sh
+3 * (4 + 1)
+```
+
+and the calculator will print:
+
+```sh
+15
+```
+
+Calc as the usual collection of arithmetic operators +, -, /, * as
+well as ^ (exponentiation), % (modulus) and // (integer divide).
+For example:
+
+```sh
+3 * 19^43 - 1
+```
+
+will produce:
+
+```sh
+29075426613099201338473141505176993450849249622191102976
+```
+
+Notice that calc values can be very large.  For example:
+
+```sh
+2^23209-1
+```
+
+will print:
+
+```sh
+402874115778988778181873329071 ... many digits ... 3779264511
+```
+
+The special '.' symbol (called dot), represents the result of the
+last command expression, if any.  This is of great use when a series
+of partial results are calculated, or when the output mode is changed
+and the last result needs to be redisplayed.  For example, the above
+result can be modified by typing:
+
+```sh
+. % (2^127-1)
+```
+
+and the calculator will print:
+
+```sh
+47385033654019111249345128555354223304
+```
+
+For more complex calculations, variables can be used to save the
+intermediate results.  For example, the result of adding 7 to the
+previous result can be saved by typing:
+
+```sh
+curds = 15
+whey = 7 + 2*curds
+```
+
+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 'whey':
+
+```sh
+fact(whey)
+```
+
+and the calculator prints:
+
+```sh
+13763753091226345046315979581580902400000000
+```
+
+The calculator also knows about complex numbers, so that typing:
+
+```sh
+(2+3i) * (4-3i)
+cos(.)
+```
+
+will print:
+
+```sh
+17+6i
+-55.50474777265624667147+193.9265235748927986537i
+```
+
+The calculator can calculate transcendental functions, and accept and
+display numbers in real or exponential format. For example, typing:
+
+```sh
+config("display", 70),
+epsilon(1e-70),
+sin(1)
+```
+
+prints:
+
+```sh
+0.8414709848078965066525023216302989996225630607983710656727517099919104
+```
+
+Calc can output values in terms of fractions, octal or hexadecimal.
+For example:
+
+```sh
+config("mode", "fraction"),
+(17/19)^23
+print
+base(16),
+(19/17)^29
+print
+log(79.3i)
+```
+
+ will print:
+
+```sh
+19967568900859523802559065713/257829627945307727248226067259
+
+0x9201e65bdbb801eaf403f657efcf863/0x5cd2e2a01291ffd73bee6aa7dcf7d1
+
+0x17b5164ac24ee836bf/0xc7b7a8e3ef5fcf752+0x883eaf5adadd26be3/0xc7b7a8e3ef5fcf752i
+```
+
+All numbers are represented as fractions with arbitrarily large
+numerators and denominators which are always reduced to lowest terms.
+Real or exponential format numbers can be input and are converted
+to the equivalent fraction.  Hex, binary, or octal numbers can be
+input by using numbers with leading '0x', '0b' or '0' characters.
+Complex numbers can be input using a trailing 'i', as in '2+3i'.
+Strings and characters are input by using single or double quotes.
+
+Commands are statements in a C-like language, where each input
+line is treated as the body of a procedure.  Thus the command
+line can contain variable declarations, expressions, labels,
+conditional tests, and loops.  Assignments to any variable name
+will automatically define that name as a global variable.  The
+other important thing to know is that all non-assignment expressions
+which are evaluated are automatically printed.  Thus, you can evaluate
+an expression's value by simply typing it in.
+
+Many useful built-in mathematical functions are available.  Use the:
+
+```sh
+help builtin
+```
+
+command to list them.
+
+You can also define your own functions by using the 'define' keyword,
+followed by a function declaration very similar to C.
+
+```sh
+define f2(n)
+{
+	local ans;
+
+	ans = 1;
+	while (n > 1)
+		ans *= (n -= 2);
+	return ans;
+}
+```
+
+Thus the input:
+
+```sh
+f2(79)
+```
+
+will produce:
+
+```sh
+1009847364737869270905302433221592504062302663202724609375
+```
+
+Functions which only need to return a simple expression can be defined
+using an equals sign, as in the example:
+
+```sh
+define sc(a,b) = a^3 + b^3
+```
+
+Thus the input:
+
+```sh
+sc(31, 61)
+```
+
+will produce:
+
+```sh
+256772
+```
+
+Variables in functions can be defined as either 'global', 'local',
+or 'static'.  Global variables are common to all functions and the
+command line, whereas local variables are unique to each function
+level, and are destroyed when the function returns.  Static variables
+are scoped within single input files, or within functions, and are
+never destroyed.  Variables are not typed at definition time, but
+dynamically change as they are used.
+
+For more information about the calc language and features, try:
+
+```sh
+help overview
+```
+
+Calc has a help command that will produce information about
+every builtin function, command as well as a number of other
+aspects of calc usage.  Try the command:
+
+```sh
+help help
+```
+
+for and overview of the help system.  The command:
+
+```sh
+help builtin
+```
+
+provides information on built-in mathematical functions, whereas:
+
+```sh
+help asinh
+```
+
+will provides information a specific function.  The following
+help files:
+
+```sh
+help command
+help define
+help operator
+help statement
+help variable
+```
+
+provide a good overview of the calc language.  If you are familiar
+with C, you should also try:
+
+```sh
+help unexpected
+```
+
+It contains information about differences between C and calc
+that may surprize C programmers.
--- a/addop.c
+++ b/addop.c
@@ -19,10 +19,6 @@
 * 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: addop.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/addop.c,v $
- *
 * Under source code control:	1990/02/15 01:48:10
 * File existed as early as:	before 1990
 *
--- a/align32.c
+++ b/align32.c
@@ -17,10 +17,6 @@
 * 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: align32.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/align32.c,v $
- *
 * Under source code control:	1995/11/23 05:18:06
 * File existed as early as:	1995
 *
--- a/alloc.h
+++ b/alloc.h
@@ -17,10 +17,6 @@
 * 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: alloc.h,v 30.5 2014/08/24 21:56:51 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/alloc.h,v $
- *
 * Under source code control:	1990/02/15 01:48:29
 * File existed as early as:	before 1990
 *
--- a/assocfunc.c
+++ b/assocfunc.c
@@ -17,10 +17,6 @@
 * 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: 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
 * File existed as early as:	1993
 *
--- a/blkcpy.c
+++ b/blkcpy.c
@@ -19,10 +19,6 @@
 * 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: blkcpy.c,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/blkcpy.c,v $
- *
 * Under source code control:	1997/04/18 20:41:26
 * File existed as early as:	1997
 *
--- a/blkcpy.h
+++ b/blkcpy.h
@@ -19,10 +19,6 @@
 * 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: blkcpy.h,v 30.3 2014/08/24 21:56:51 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/blkcpy.h,v $
- *
 * Under source code control:	1997/04/18 20:41:25
 * File existed as early as:	1997
 *
--- a/block.c
+++ b/block.c
@@ -19,10 +19,6 @@
 * 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: block.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/block.c,v $
- *
 * Under source code control:	1997/02/27 00:29:40
 * File existed as early as:	1997
 *
--- a/block.h
+++ b/block.h
@@ -19,10 +19,6 @@
 * 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: block.h,v 30.3 2014/08/24 21:56:51 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/block.h,v $
- *
 * Under source code control:	1997/02/21 05:03:39
 * File existed as early as:	1997
 *
--- a/byteswap.c
+++ b/byteswap.c
@@ -17,10 +17,6 @@
 * 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: byteswap.c,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/byteswap.c,v $
- *
 * Under source code control:	1995/10/11 04:44:01
 * File existed as early as:	1995
 *
--- a/byteswap.h
+++ b/byteswap.h
@@ -17,10 +17,6 @@
 * 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: byteswap.h,v 30.3 2014/08/24 21:56:51 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/byteswap.h,v $
- *
 * Under source code control:	1995/10/11 04:44:01
 * File existed as early as:	1995
 *
--- a/cal/Makefile
+++ b/cal/Makefile
@@ -2,7 +2,7 @@
 #
 # cal - makefile for calc standard resource files
 #
-# Copyright (C) 1999-2006  Landon Curt Noll
+# Copyright (C) 1999-2006,2017  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
@@ -18,10 +18,6 @@
 # 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: Makefile,v 30.11 2014/09/02 07:14:49 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/cal/RCS/Makefile,v $
-#
 # Under source code control:	1991/07/21 05:00:54
 # File existed as early as:	1991
 #
@@ -199,7 +195,7 @@ CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
 	constants.cal deg.cal dms.cal dotest.cal ellip.cal factorial.cal \
 	factorial2.cal gvec.cal hello.cal hms.cal infinities.cal \
 	intfile.cal intnum.cal lambertw.cal linear.cal lnseries.cal \
-	lucas.cal lucas_chk.cal lucas_tbl.cal mersenne.cal mfactor.cal \
+	lucas.cal lucas_chk.cal mersenne.cal mfactor.cal \
 	mod.cal natnumset.cal pell.cal pi.cal pix.cal pollard.cal poly.cal \
 	prompt.cal psqrt.cal qtime.cal quat.cal randbitrun.cal randmprime.cal \
 	randombitrun.cal randomrun.cal randrun.cal regress.cal repeat.cal \
@@ -211,6 +207,10 @@ CALC_FILES= README alg_config.cal beer.cal bernoulli.cal \
 	test8400.cal test8500.cal test8600.cal test8900.cal toomcook.cal \
 	unitfrac.cal varargs.cal xx_print.cal zeta2.cal

+# These calc files are now obsolete and are removed by the install rule.
+#
+DEAD_CALC_FILES= lucas_tbl.cal
+
 # These files are found (but not built) in the distribution
 #
 DISTLIST= ${CALC_FILES} ${MAKE_FILE}
@@ -301,6 +301,23 @@ clean:

 clobber: clean
 	${RM} -f .all
+	-${Q} if [ -e .DS_Store ]; then \
+	    echo ${RM} -rf .DS_Store; \
+	    ${RM} -rf .DS_Store; \
+	fi
+	-${Q} for i in ${DEAD_CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -e "${T}${CALC_SHAREDIR}/$$i" ]; then \
+		echo "${RM} -f ${T}${CALC_SHAREDIR}/$$i"; \
+		${RM} -f ${T}${CALC_SHAREDIR}/$$i; \
+	    fi; \
+	    if [ -e "./$$i" ]; then \
+		echo "${RM} -f ./$$i"; \
+		${RM} -f ./$$i; \
+	    fi; \
+	done

 # install everything
 #
@@ -333,12 +350,38 @@ install: all
 		echo "installed ${T}${CALC_SHAREDIR}/$$i"; \
 	    fi; \
 	done
+	${Q} for i in ${DEAD_CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -e "${T}${CALC_SHAREDIR}/$$i" ]; then \
+		echo "${RM} -f ${T}${CALC_SHAREDIR}/$$i"; \
+		${RM} -f ${T}${CALC_SHAREDIR}/$$i; \
+	    fi; \
+	    if [ -e "./$$i" ]; then \
+		echo "${RM} -f ./$$i"; \
+		${RM} -f ./$$i; \
+	    fi; \
+	done

 # Try to remove everything that was installed
 #
 # NOTE: Keep the uninstall rule in reverse order to the install rule
 #
 uninstall:
+	- ${Q} for i in ${DEAD_CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -e "${T}${CALC_SHAREDIR}/$$i" ]; then \
+		echo "${RM} -f ${T}${CALC_SHAREDIR}/$$i"; \
+		${RM} -f ${T}${CALC_SHAREDIR}/$$i; \
+	    fi; \
+	    if [ -e "./$$i" ]; then \
+		echo "${RM} -f ./$$i"; \
+		${RM} -f ./$$i; \
+	    fi; \
+	done
 	-${Q} for i in ${CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
--- a/cal/README
+++ b/cal/README
@@ -14,9 +14,12 @@ For example:

    ; read lucas
    lucas(h,n) defined
+    gen_u2(h,n,v1) defined
    gen_u0(h,n,v1) defined
+    rodseth_xhn(x,h,n) defined
    gen_v1(h,n) defined
    ldebug(funct,str) defined
+    legacy_gen_v1(h,n) defined

 will cause calc to load and execute the 'lucas.cal' resource file.
 Executing the resource file will cause several functions to be defined.
@@ -792,7 +795,27 @@ lucas.cal

    lucas(h, n)

-    Perform a primality test of h*2^n-1, with 1<=h<2*n.
+    Perform a primality test of h*2^n-1.
+
+    gen_u2(h, n, v1)
+
+    Generate u(2) for h*2^n-1.  This function is used by lucas(h, n),
+    as the first term in the lucas sequence that is needed to
+    prove that h*2^n-1 is prime or not prime.
+
+    NOTE: Some call this term u(0).  The function gen_u0(h, n, v1)
+    	  simply calls gen_u2(h, n, v1) for such people.  :-)
+
+    gen_v1(h, v)
+
+    Generate v(1) for h*2^n-1.  This function is used by lucas(h, n),
+    via the gen_u2(h, n, v1), to supply the 3rd argument to gen_u2.
+
+    legacy_gen_v1(h, n)
+
+    Generate v(1) for h*2^n-1 using the legacy Amdahl 6 method.
+    This function sometimes returns -1 for a few cases when
+    h is a multiple of 3.  This function is NOT used by lucas(h, n).


 lucas_chk.cal
@@ -805,11 +828,6 @@ lucas_chk.cal
    Used by regress.cal during the 2100 test set.


-lucas_tbl.cal
-
-    Lucasian criteria for primality tables.
-
-
 mersenne.cal

    mersenne(p)
@@ -1798,7 +1816,7 @@ zeta2.cal
    for information on this special zeta function.


-## Copyright (C) 2000,2014  David I. Bell and Landon Curt Noll
+## Copyright (C) 2000,2014,2017  David I. Bell and Landon Curt Noll
 ##
 ## Primary author: Landon Curt Noll
 ##
@@ -1816,10 +1834,6 @@ 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.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
 ## File existed as early as:	before 1990
 ##
--- a/cal/alg_config.cal
+++ b/cal/alg_config.cal
@@ -17,10 +17,6 @@
 * 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: 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
 * File existed as early as:	2006
 *
--- a/cal/beer.cal
+++ b/cal/beer.cal
@@ -17,10 +17,6 @@
 * 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: beer.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/beer.cal,v $
- *
 * Under source code control:	1996/11/13 13:21:05
 * File existed as early as:	1996
 *
--- a/cal/bernoulli.cal
+++ b/cal/bernoulli.cal
@@ -17,10 +17,6 @@
 * 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: bernoulli.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/bernoulli.cal,v $
- *
 * Under source code control:	1991/09/30 11:18:41
 * File existed as early as:	1991
 *
--- a/cal/bernpoly.cal
+++ b/cal/bernpoly.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: bernpoly.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/bernpoly.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/bigprime.cal
+++ b/cal/bigprime.cal
@@ -17,10 +17,6 @@
 * 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: bigprime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/bigprime.cal,v $
- *
 * Under source code control:	1991/05/22 21:56:32
 * File existed as early as:	1991
 *
--- a/cal/bindings
+++ b/cal/bindings
@@ -16,10 +16,6 @@
 # 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: bindings,v 30.1 2007/03/16 11:09:54 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/cal/RCS/bindings,v $
-#
 # Under source code control:	1993/05/02 20:09:19
 # File existed as early as:	1993
 #
--- a/cal/brentsolve.cal
+++ b/cal/brentsolve.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: brentsolve.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/brentsolve.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/chi.cal
+++ b/cal/chi.cal
@@ -17,10 +17,6 @@
 * 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: chi.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/chi.cal,v $
- *
 * Under source code control:	2001/03/27 14:10:11
 * File existed as early as:	2001
 *
--- a/cal/chrem.cal
+++ b/cal/chrem.cal
@@ -19,10 +19,6 @@
 * 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: chrem.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/chrem.cal,v $
- *
 * Under source code control:	1992/09/26 01:00:47
 * File existed as early as:	1992
 *
--- a/cal/constants.cal
+++ b/cal/constants.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: constants.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/constants.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/deg.cal
+++ b/cal/deg.cal
@@ -17,10 +17,6 @@
 * 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: deg.cal,v 30.2 2010/09/02 06:01:14 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/deg.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
 *
--- a/cal/dms.cal
+++ b/cal/dms.cal
@@ -17,10 +17,6 @@
 * 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: dms.cal,v 30.2 2010/09/02 06:14:16 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/dms.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
 *
--- a/cal/dotest.cal
+++ b/cal/dotest.cal
@@ -16,10 +16,6 @@
 * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * @(#) $Revision: 30.2 $
- * @(#) $Id: dotest.cal,v 30.2 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/dotest.cal,v $
- *
 * This file is not covered under version 2.1 of the GNU LGPL.
 *
 * Under source dotest_code control:	2006/03/08 05:54:09
--- a/cal/ellip.cal
+++ b/cal/ellip.cal
@@ -17,10 +17,6 @@
 * 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: ellip.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/ellip.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
 *
--- a/cal/factorial.cal
+++ b/cal/factorial.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: factorial.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/factorial.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/factorial2.cal
+++ b/cal/factorial2.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: factorial2.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/factorial2.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/gvec.cal
+++ b/cal/gvec.cal
@@ -8,10 +8,6 @@
 * operation "function" must be first; calc doesn't care how many more
 * arguments there actually are.
 *
- * @(#) $Revision: 30.3 $
- * @(#) $Id: gvec.cal,v 30.3 2011/05/23 23:00:55 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/gvec.cal,v $
- *
 * Under source code control:   2011/03/31 17:54:55
 * File existed as early as:    2010
 *
--- a/cal/hello.cal
+++ b/cal/hello.cal
@@ -17,10 +17,6 @@
 * 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: hello.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/hello.cal,v $
- *
 * Under source code control:	1996/11/13 13:25:43
 * File existed as early as:	1996
 *
--- a/cal/hms.cal
+++ b/cal/hms.cal
@@ -17,10 +17,6 @@
 * 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: hms.cal,v 30.2 2010/09/02 06:14:16 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/hms.cal,v $
- *
 * Under source code control:	2010/09/01 17:14:55
 * File existed as early as:	2010
 *
--- a/cal/intfile.cal
+++ b/cal/intfile.cal
@@ -17,10 +17,6 @@
 * 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: intfile.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/intfile.cal,v $
- *
 * Under source code control:   2001/03/31 08:13:11
 * File existed as early as:    2001
 *
--- a/cal/lambertw.cal
+++ b/cal/lambertw.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: lambertw.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lambertw.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/linear.cal
+++ b/cal/linear.cal
@@ -17,10 +17,6 @@
 * 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: linear.cal,v 30.2 2007/03/17 05:57:42 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/linear.cal,v $
- *
 * Under source code control:	2005/12/12 06:41:50
 * File existed as early as:	2005
 *
--- a/cal/lnseries.cal
+++ b/cal/lnseries.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: lnseries.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lnseries.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/lucas.cal
+++ b/cal/lucas.cal
--- a/cal/lucas_chk.cal
+++ b/cal/lucas_chk.cal
@@ -17,10 +17,6 @@
 * 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: lucas_chk.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lucas_chk.cal,v $
- *
 * Under source code control:	1991/01/11 05:41:43
 * File existed as early as:	1991
 *
--- a/cal/lucas_tbl.cal
+++ b/cal/lucas_tbl.cal
@@ -1,165 +0,0 @@
-/*
- * lucas_tbl - lucasian criteria for primality tables
- *
- * Copyright (C) 1999  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
- * as published by the Free Software Foundation.
- *
- * Calc is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU Lesser General
- * Public License for more details.
- *
- * A copy of version 2.1 of the GNU Lesser General Public License is
- * distributed with calc under the filename COPYING-LGPL.  You should have
- * 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: lucas_tbl.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lucas_tbl.cal,v $
- *
- * Under source code control:	1991/01/26 02:43:43
- * File existed as early as:	1991
- *
- * chongo <was here> /\oo/\	http://www.isthe.com/chongo/
- * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
- */
-
-/*
- * Lucasian criteria for primality
- *
- * The following table is taken from:
- *
- *	"Lucasian Criteria for the Primality of N=h*2^n-1", by Hans Riesel,
- *	Mathematics of Computation, Vol 23 #108, p 872.
- *
- * The index of the *_val[] arrays correspond to the v(1) values found
- * in the table.  That is, for v(1) == x:
- *
- *	D == d_val[x]
- *	a == a_val[x]
- *	b == b_val[x]
- *	r == r_val[x]		(r == abs(a^2 - b^2*D))
- *
- *
- * Note that when *_val[i] is not a number, the related v(1) value
- * is not found in Table 1.
- */
-
-
-trymax = 100;
-mat d_val[trymax+1];
-mat a_val[trymax+1];
-mat b_val[trymax+1];
-mat r_val[trymax+1];
-/* v1= 0	    INVALID */
-/* v1= 1	    INVALID */
-/* v1= 2	    INVALID */
-d_val[ 3]=   5;	 a_val[ 3]= 1;	b_val[ 3]=1;  r_val[ 3]=4;
-d_val[ 4]=   3;	 a_val[ 4]= 1;	b_val[ 4]=1;  r_val[ 4]=2;
-d_val[ 5]=  21;	 a_val[ 5]= 3;	b_val[ 5]=1;  r_val[ 5]=12;
-d_val[ 6]=   2;	 a_val[ 6]= 1;	b_val[ 6]=1;  r_val[ 6]=1;
-/* v1= 7	    INVALID */
-d_val[ 8]=  15;	 a_val[ 8]= 3;	b_val[ 8]=1;  r_val[ 8]=6;
-d_val[ 9]=  77;	 a_val[ 9]= 7;	b_val[ 9]=1;  r_val[ 9]=28;
-d_val[10]=   6;	 a_val[10]= 2;	b_val[10]=1;  r_val[10]=2;
-d_val[11]=  13;	 a_val[11]= 3;	b_val[11]=1;  r_val[11]=4;
-d_val[12]=  35;	 a_val[12]= 5;	b_val[12]=1;  r_val[12]=10;
-d_val[13]= 165;	 a_val[13]=11;	b_val[13]=1;  r_val[13]=44;
-/* v1=14	    INVALID */
-d_val[15]= 221;	 a_val[15]=13;	b_val[15]=1;  r_val[15]=52;
-d_val[16]=   7;	 a_val[16]= 3;	b_val[16]=1;  r_val[16]=2;
-d_val[17]= 285;	 a_val[17]=15;	b_val[17]=1;  r_val[17]=60;
-/* v1=18	    INVALID */
-d_val[19]= 357;	 a_val[19]=17;	b_val[19]=1;  r_val[19]=68;
-d_val[20]=  11;	 a_val[20]= 3;	b_val[20]=1;  r_val[20]=2;
-d_val[21]= 437;	 a_val[21]=19;	b_val[21]=1;  r_val[21]=76;
-d_val[22]=  30;	 a_val[22]= 5;	b_val[22]=1;  r_val[22]=5;
-/* v1=23	    INVALID */
-d_val[24]= 143;	 a_val[24]=11;	b_val[24]=1;  r_val[24]=22;
-d_val[25]=  69;	 a_val[25]= 9;	b_val[25]=1;  r_val[25]=12;
-d_val[26]=  42;	 a_val[26]= 6;	b_val[26]=1;  r_val[26]=6;
-d_val[27]=  29;	 a_val[27]= 5;	b_val[27]=1;  r_val[27]=4;
-d_val[28]= 195;	 a_val[28]=13;	b_val[28]=1;  r_val[28]=26;
-d_val[29]=  93;	 a_val[29]= 9;	b_val[29]=1;  r_val[29]=12;
-d_val[30]=  14;	 a_val[30]= 4;	b_val[30]=1;  r_val[30]=2;
-d_val[31]= 957;	 a_val[31]=29;	b_val[31]=1;  r_val[31]=116;
-d_val[32]= 255;	 a_val[32]=15;	b_val[32]=1;  r_val[32]=30;
-d_val[33]=1085;	 a_val[33]=31;	b_val[33]=1;  r_val[33]=124;
-/* v1=34	    INVALID */
-d_val[35]=1221;	 a_val[35]=33;	b_val[35]=1;  r_val[35]=132;
-d_val[36]= 323;	 a_val[36]=17;	b_val[36]=1;  r_val[36]=34;
-d_val[37]=1365;	 a_val[37]=35;	b_val[37]=1;  r_val[37]=140;
-d_val[38]=  10;	 a_val[38]= 3;	b_val[38]=1;  r_val[38]=1;
-d_val[39]=1517;	 a_val[39]=37;	b_val[39]=1;  r_val[39]=148;
-d_val[40]= 399;	 a_val[40]=19;	b_val[40]=1;  r_val[40]=38;
-d_val[41]=1677;	 a_val[41]=39;	b_val[41]=1;  r_val[41]=156;
-d_val[42]= 110;	 a_val[42]=10;	b_val[42]=1;  r_val[42]=10;
-d_val[43]= 205;	 a_val[43]=15;	b_val[43]=1;  r_val[43]=20;
-d_val[44]= 483;	 a_val[44]=21;	b_val[44]=1;  r_val[44]=42;
-d_val[45]=2021;	 a_val[45]=43;	b_val[45]=1;  r_val[45]=172;
-d_val[46]=  33;	 a_val[46]= 6;	b_val[46]=1;  r_val[46]=3;
-/* v1=47	    INVALID */
-d_val[48]=  23;	 a_val[48]= 5;	b_val[48]=1;  r_val[48]=2;
-d_val[49]=2397;	 a_val[49]=47;	b_val[49]=1;  r_val[49]=188;
-d_val[50]=  39;	 a_val[50]= 6;	b_val[50]=1;  r_val[50]=3;
-d_val[51]=  53;	 a_val[51]= 7;	b_val[51]=1;  r_val[51]=4;
-/* v1=52	    INVALID */
-d_val[53]=2805;	 a_val[53]=51;	b_val[53]=1;  r_val[53]=204;
-d_val[54]= 182;	 a_val[54]=13;	b_val[54]=1;  r_val[54]=13;
-d_val[55]=3021;	 a_val[55]=53;	b_val[55]=1;  r_val[55]=212;
-d_val[56]=  87;	 a_val[56]= 9;	b_val[56]=1;  r_val[56]=6;
-d_val[57]=3245;	 a_val[57]=55;	b_val[57]=1;  r_val[57]=220;
-d_val[58]= 210;	 a_val[58]=14;	b_val[58]=1;  r_val[58]=14;
-d_val[59]=3477;	 a_val[59]=57;	b_val[59]=1;  r_val[59]=228;
-d_val[60]= 899;	 a_val[60]=29;	b_val[60]=1;  r_val[60]=58;
-d_val[61]= 413;	 a_val[61]=21;	b_val[61]=1;  r_val[61]=28;
-/* v1=62	    INVALID */
-d_val[63]=3965;	 a_val[63]=61;	b_val[63]=1;  r_val[63]=244;
-d_val[64]=1023;	 a_val[64]=31;	b_val[64]=1;  r_val[64]=62;
-d_val[65]= 469;	 a_val[65]=21;	b_val[65]=1;  r_val[65]=28;
-d_val[66]=  17;	 a_val[66]= 4;	b_val[66]=1;  r_val[66]=1;
-d_val[67]=4485;	 a_val[67]=65;	b_val[67]=1;  r_val[67]=260;
-d_val[68]=1155;	 a_val[68]=33;	b_val[68]=1;  r_val[68]=66;
-d_val[69]=4757;	 a_val[69]=67;	b_val[69]=1;  r_val[69]=268;
-d_val[70]=  34;	 a_val[70]= 6;	b_val[70]=1;  r_val[70]=2;
-d_val[71]=5037;	 a_val[71]=69;	b_val[71]=1;  r_val[71]=276;
-d_val[72]=1295;	 a_val[72]=35;	b_val[72]=1;  r_val[72]=70;
-d_val[73]= 213;	 a_val[73]=15;	b_val[73]=1;  r_val[73]=12;
-d_val[74]=  38;	 a_val[74]= 6;	b_val[74]=1;  r_val[74]=2;
-d_val[75]=5621;	 a_val[75]=73;	b_val[75]=1;  r_val[75]=292;
-d_val[76]=1443;	 a_val[76]=37;	b_val[76]=1;  r_val[76]=74;
-d_val[77]= 237;	 a_val[77]=15;	b_val[77]=1;  r_val[77]=12;
-d_val[78]=  95;	 a_val[78]=10;	b_val[78]=1;  r_val[78]=5;
-/* v1=79	    INVALID */
-d_val[80]=1599;	 a_val[80]=39;	b_val[80]=1;  r_val[80]=78;
-d_val[81]=6557;	 a_val[81]=79;	b_val[81]=1;  r_val[81]=316;
-d_val[82]= 105;	 a_val[82]=10;	b_val[82]=1;  r_val[82]=5;
-d_val[83]=  85;	 a_val[83]= 9;	b_val[83]=1;  r_val[83]=4;
-d_val[84]=1763;	 a_val[84]=41;	b_val[84]=1;  r_val[84]=82;
-d_val[85]=7221;	 a_val[85]=83;	b_val[85]=1;  r_val[85]=332;
-d_val[86]= 462;	 a_val[86]=21;	b_val[86]=1;  r_val[86]=21;
-d_val[87]=7565;	 a_val[87]=85;	b_val[87]=1;  r_val[87]=340;
-d_val[88]= 215;	 a_val[88]=15;	b_val[88]=1;  r_val[88]=10;
-d_val[89]=7917;	 a_val[89]=87;	b_val[89]=1;  r_val[89]=348;
-d_val[90]= 506;	 a_val[90]=22;	b_val[90]=1;  r_val[90]=22;
-d_val[91]=8277;	 a_val[91]=89;	b_val[91]=1;  r_val[91]=356;
-d_val[92]= 235;	 a_val[92]=15;	b_val[92]=1;  r_val[92]=10;
-d_val[93]=8645;	 a_val[93]=91;	b_val[93]=1;  r_val[93]=364;
-d_val[94]= 138;	 a_val[94]=12;	b_val[94]=1;  r_val[94]=6;
-d_val[95]=9021;	 a_val[95]=93;	b_val[95]=1;  r_val[95]=372;
-d_val[96]=  47;	 a_val[96]= 7;	b_val[96]=1;  r_val[96]=2;
-d_val[97]=1045;	 a_val[97]=33;	b_val[97]=1;  r_val[97]=44;
-/* v1=98	    INVALID */
-d_val[99]=9797;	 a_val[99]=97;	b_val[99]=1;  r_val[99]=388;
-d_val[100]=  51; a_val[100]= 7; b_val[100]=1; r_val[100]=2;
-
-if (config("resource_debug") & 3) {
-    print "d_val[100] defined";
-    print "a_val[100] defined";
-    print "b_val[100] defined";
-    print "r_val[100] defined";
-}
--- a/cal/mersenne.cal
+++ b/cal/mersenne.cal
@@ -19,10 +19,6 @@
 * 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: mersenne.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/mersenne.cal,v $
- *
 * Under source code control:	1991/05/22 21:56:36
 * File existed as early as:	1991
 *
--- a/cal/mfactor.cal
+++ b/cal/mfactor.cal
@@ -17,10 +17,6 @@
 * 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: mfactor.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/mfactor.cal,v $
- *
 * Under source code control:	1996/07/06 06:09:40
 * File existed as early as:	1996
 *
--- a/cal/mod.cal
+++ b/cal/mod.cal
@@ -17,10 +17,6 @@
 * 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: mod.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/mod.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:34
 * File existed as early as:	before 1990
 *
--- a/cal/natnumset.cal
+++ b/cal/natnumset.cal
@@ -17,10 +17,6 @@
 * 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: natnumset.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/natnumset.cal,v $
- *
 * Under source code control:	1997/09/07 23:53:51
 * File existed as early as:	1997
 *
--- a/cal/pell.cal
+++ b/cal/pell.cal
@@ -17,10 +17,6 @@
 * 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: pell.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/pell.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:34
 * File existed as early as:	before 1990
 *
--- a/cal/pi.cal
+++ b/cal/pi.cal
@@ -17,10 +17,6 @@
 * 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: pi.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/pi.cal,v $
- *
 * Under source code control:	1991/05/22 21:56:37
 * File existed as early as:	1991
 *
--- a/cal/pix.cal
+++ b/cal/pix.cal
@@ -17,10 +17,6 @@
 * 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: pix.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/pix.cal,v $
- *
 * Under source code control:	1996/07/09 03:14:14
 * File existed as early as:	1996
 *
--- a/cal/pollard.cal
+++ b/cal/pollard.cal
@@ -17,10 +17,6 @@
 * 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: pollard.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/pollard.cal,v $
- *
 * Under source code control:	1991/05/22 21:56:37
 * File existed as early as:	1991
 *
--- a/cal/poly.cal
+++ b/cal/poly.cal
@@ -17,10 +17,6 @@
 * 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: poly.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/poly.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
 *
--- a/cal/prompt.cal
+++ b/cal/prompt.cal
@@ -17,10 +17,6 @@
 * 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: prompt.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/prompt.cal,v $
- *
 * Under source code control:	1995/12/18 04:43:25
 * File existed as early as:	1995
 *
--- a/cal/psqrt.cal
+++ b/cal/psqrt.cal
@@ -17,10 +17,6 @@
 * 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: psqrt.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/psqrt.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
 *
--- a/cal/qtime.cal
+++ b/cal/qtime.cal
@@ -20,10 +20,6 @@
 * 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: qtime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/qtime.cal,v $
- *
 * Under source code control:	1999/10/13 04:10:33
 * File existed as early as:	1999
 *
--- a/cal/quat.cal
+++ b/cal/quat.cal
@@ -17,10 +17,6 @@
 * 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: quat.cal,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/quat.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
 *
--- a/cal/randbitrun.cal
+++ b/cal/randbitrun.cal
@@ -17,10 +17,6 @@
 * 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: randbitrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/randbitrun.cal,v $
- *
 * Under source code control:	1995/02/13 03:43:11
 * File existed as early as:	1995
 *
--- a/cal/randmprime.cal
+++ b/cal/randmprime.cal
@@ -17,10 +17,6 @@
 * 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: randmprime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/randmprime.cal,v $
- *
 * Under source code control:	1994/03/14 23:11:21
 * File existed as early as:	1994
 *
--- a/cal/randombitrun.cal
+++ b/cal/randombitrun.cal
@@ -17,10 +17,6 @@
 * 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: randombitrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/randombitrun.cal,v $
- *
 * Under source code control:	1995/02/13 03:43:11
 * File existed as early as:	1995
 *
--- a/cal/randomrun.cal
+++ b/cal/randomrun.cal
@@ -17,10 +17,6 @@
 * 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: randomrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/randomrun.cal,v $
- *
 * Under source code control:	1997/02/19 03:35:59
 * File existed as early as:	1997
 *
--- a/cal/randrun.cal
+++ b/cal/randrun.cal
@@ -17,10 +17,6 @@
 * 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: randrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/randrun.cal,v $
- *
 * Under source code control:	1995/02/12 20:00:06
 * File existed as early as:	1995
 *
--- a/cal/regress.cal
+++ b/cal/regress.cal
@@ -1,7 +1,7 @@
 /*
 * regress - calc regression and correctness test suite
 *
- * Copyright (C) 1999-2006  David I. Bell and Landon Curt Noll
+ * Copyright (C) 1999-2017  David I. Bell and 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,10 +17,6 @@
 * 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.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
 * File existed as early as:	before 1990
 *
@@ -8068,7 +8064,6 @@ return test_functions2();
 *	hello.cal	- designed to go into an infinite loop
 *	lucal.cal	- already read by this file
 *	lucas_chk.cal	- already read by this file
- *	lucas_tbl.cal	- duplicatres code already read by another file
 *	regress.cal	- this file
 *	surd.cal	- already read by this file
 *	test9999.cal	- files of this form are already read by this file
@@ -8141,8 +8136,6 @@ read -once intfile;
 print	'9830: read -once intfile';
 read -once lucas;
 print	'9831: read -once lucas';
-read -once lucas_tbl;
-print	'9832: read -once lucas_tbl';
 read -once natnumset;
 print	'9833: read -once natnumset';
 read -once repeat;
--- a/cal/repeat.cal
+++ b/cal/repeat.cal
@@ -17,10 +17,6 @@
 * 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: repeat.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/repeat.cal,v $
- *
 * Under source code control:	2003/01/05 00:00:01
 * File existed as early as:	2003
 *
--- a/cal/screen.cal
+++ b/cal/screen.cal
@@ -15,10 +15,6 @@
 * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR  IN
 * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
- * @(#) $Revision: 30.2 $
- * @(#) $Id: screen.cal,v 30.2 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/screen.cal,v $
- *
 * This file is not covered under version 2.1 of the GNU LGPL.
 *
 * Under source code control:	2006/03/08 05:54:09
--- a/cal/seedrandom.cal
+++ b/cal/seedrandom.cal
@@ -17,10 +17,6 @@
 * 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: seedrandom.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/seedrandom.cal,v $
- *
 * Under source code control:	1996/01/01 08:21:00
 * File existed as early as:	1996
 *
--- a/cal/set8700.cal
+++ b/cal/set8700.cal
@@ -17,10 +17,6 @@
 * 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: set8700.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/set8700.cal,v $
- *
 * Under source code control:	2006/05/20 14:10:11
 * File existed as early as:	2006
 *
--- a/cal/set8700.line
+++ b/cal/set8700.line
@@ -17,10 +17,6 @@
 ## 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: set8700.line,v 30.1 2007/03/16 11:09:54 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/cal/RCS/set8700.line,v $
-##
 ## Under source code control:	2006/05/20 14:10:11
 ## File existed as early as:	2006
 ##
--- a/cal/solve.cal
+++ b/cal/solve.cal
@@ -17,10 +17,6 @@
 * 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: solve.cal,v 30.3 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/solve.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:37
 * File existed as early as:	before 1990
 *
--- a/cal/specialfunctions.cal
+++ b/cal/specialfunctions.cal
@@ -17,10 +17,6 @@
 * 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.6 $
- * @(#) $Id: specialfunctions.cal,v 30.6 2013/09/01 17:48:27 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/specialfunctions.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/statistics.cal
+++ b/cal/statistics.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: statistics.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/statistics.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/sumsq.cal
+++ b/cal/sumsq.cal
@@ -17,10 +17,6 @@
 * 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: sumsq.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/sumsq.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:37
 * File existed as early as:	before 1990
 *
--- a/cal/sumtimes.cal
+++ b/cal/sumtimes.cal
@@ -17,10 +17,6 @@
 * 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: sumtimes.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/sumtimes.cal,v $
- *
 * Under source code control:	2006/06/22 17:29
 * File existed as early as:	2006
 *
--- a/cal/surd.cal
+++ b/cal/surd.cal
@@ -17,10 +17,6 @@
 * 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: surd.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/surd.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:38
 * File existed as early as:	before 1990
 *
--- a/cal/test1700.cal
+++ b/cal/test1700.cal
@@ -17,10 +17,6 @@
 * 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: test1700.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test1700.cal,v $
- *
 * Under source code control:	1994/03/14 23:12:51
 * File existed as early as:	1994
 *
--- a/cal/test2300.cal
+++ b/cal/test2300.cal
@@ -17,10 +17,6 @@
 * 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: test2300.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test2300.cal,v $
- *
 * Under source code control:	1995/07/09 06:12:13
 * File existed as early as:	1995
 *
--- a/cal/test2600.cal
+++ b/cal/test2600.cal
@@ -19,10 +19,6 @@
 * 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: test2600.cal,v 30.3 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test2600.cal,v $
- *
 * Under source code control:	1995/10/13 00:13:14
 * File existed as early as:	1995
 *
--- a/cal/test2700.cal
+++ b/cal/test2700.cal
@@ -19,10 +19,6 @@
 * 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: test2700.cal,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test2700.cal,v $
- *
 * Under source code control:	1995/11/01 22:52:25
 * File existed as early as:	1995
 *
--- a/cal/test3100.cal
+++ b/cal/test3100.cal
@@ -19,10 +19,6 @@
 * 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: test3100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test3100.cal,v $
- *
 * Under source code control:	1995/11/28 11:56:57
 * File existed as early as:	1995
 *
--- a/cal/test3300.cal
+++ b/cal/test3300.cal
@@ -19,10 +19,6 @@
 * 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: test3300.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test3300.cal,v $
- *
 * Under source code control:	1995/12/02 04:27:41
 * File existed as early as:	1995
 *
--- a/cal/test3400.cal
+++ b/cal/test3400.cal
@@ -19,10 +19,6 @@
 * 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: test3400.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test3400.cal,v $
- *
 * Under source code control:	1995/12/02 05:20:11
 * File existed as early as:	1995
 *
--- a/cal/test3500.cal
+++ b/cal/test3500.cal
@@ -19,10 +19,6 @@
 * 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: test3500.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test3500.cal,v $
- *
 * Under source code control:	1995/12/18 22:50:46
 * File existed as early as:	1995
 *
--- a/cal/test4000.cal
+++ b/cal/test4000.cal
@@ -19,10 +19,6 @@
 * 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: test4000.cal,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test4000.cal,v $
- *
 * Under source code control:	1996/03/13 02:38:45
 * File existed as early as:	1996
 *
--- a/cal/test4100.cal
+++ b/cal/test4100.cal
@@ -19,10 +19,6 @@
 * 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: test4100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test4100.cal,v $
- *
 * Under source code control:	1996/03/13 03:53:22
 * File existed as early as:	1996
 *
--- a/cal/test4600.cal
+++ b/cal/test4600.cal
@@ -19,10 +19,6 @@
 * 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: test4600.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test4600.cal,v $
- *
 * Under source code control:	1996/07/02 20:04:40
 * File existed as early as:	1996
 *
--- a/cal/test5100.cal
+++ b/cal/test5100.cal
@@ -19,10 +19,6 @@
 * 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: test5100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test5100.cal,v $
- *
 * Under source code control:	1996/12/02 23:57:10
 * File existed as early as:	1996
 *
--- a/cal/test5200.cal
+++ b/cal/test5200.cal
@@ -19,10 +19,6 @@
 * 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: test5200.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test5200.cal,v $
- *
 * Under source code control:	1997/02/07 02:48:10
 * File existed as early as:	1997
 *
--- a/cal/test8400.cal
+++ b/cal/test8400.cal
@@ -17,10 +17,6 @@
 * 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: test8400.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test8400.cal,v $
- *
 * Under source code control:	1999/10/31 01:00:03
 * File existed as early as:	1999
 *
--- a/cal/test8500.cal
+++ b/cal/test8500.cal
@@ -19,10 +19,6 @@
 * 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: test8500.cal,v 30.2 2013/08/11 08:41:38 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test8500.cal,v $
- *
 * Under source code control:	1999/11/12 20:59:59
 * File existed as early as:	1999
 *
--- a/cal/test8600.cal
+++ b/cal/test8600.cal
@@ -19,10 +19,6 @@
 * 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: test8600.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test8600.cal,v $
- *
 * Under source code control:	2000/12/04 19:57:02
 * File existed as early as:	2000
 *
--- a/cal/test8900.cal
+++ b/cal/test8900.cal
@@ -17,10 +17,6 @@
 * 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.6 $
- * @(#) $Id: test8900.cal,v 30.6 2013/09/01 22:16:21 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/test8900.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/toomcook.cal
+++ b/cal/toomcook.cal
@@ -17,10 +17,6 @@
 * 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.4 $
- * @(#) $Id: toomcook.cal,v 30.4 2013/08/18 20:01:53 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/toomcook.cal,v $
- *
 * Under source code control:	2013/08/11 01:31:28
 * File existed as early as:	2013
 */
--- a/cal/unitfrac.cal
+++ b/cal/unitfrac.cal
@@ -17,10 +17,6 @@
 * 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: unitfrac.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/unitfrac.cal,v $
- *
 * Under source code control:	1990/02/15 01:50:38
 * File existed as early as:	before 1990
 *
--- a/cal/varargs.cal
+++ b/cal/varargs.cal
@@ -17,10 +17,6 @@
 * 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: varargs.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/varargs.cal,v $
- *
 * Under source code control:	1991/05/22 21:56:34
 * File existed as early as:	1991
 *
--- a/cal/xx_print.cal
+++ b/cal/xx_print.cal
@@ -17,10 +17,6 @@
 * 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: xx_print.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/xx_print.cal,v $
- *
 * Under source code control:	1997/04/17 00:08:50
 * File existed as early as:	1997
 *
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Landon Curt Noll	ea533659ce	Release calc version 2.12.6.2	2017-09-06 17:42:41 -07:00
Landon Curt Noll	9e81971f25	Verify that h*2^n-1 is not a multiple of 3	2017-09-06 17:41:56 -07:00
Landon Curt Noll	cbbd866535	Fixed a misleading indent reported by Thomas Walter	2017-09-06 17:40:49 -07:00
Landon Curt Noll	bf23f82c29	Correct comments relating to v(1) search table	2017-06-18 08:11:43 -07:00
Landon Curt Noll	ec5c584785	Fixed typo in lucas.cal comment	2017-06-18 04:11:44 -07:00
Landon Curt Noll	6bbb8c0e42	Update v(1) stats with full 1000000 test sample	2017-06-18 03:50:28 -07:00
Landon Curt Noll	438554b0ed	Make a minor speedup to gen_v1(h,n) in lucas.cal	2017-06-14 16:50:58 -07:00
Landon Curt Noll	61ba4bc5c8	Improve lucas.cal v(1) search method & remarks	2017-06-14 16:30:42 -07:00
Landon Curt Noll	0145883396	Improved lucas.cal vt tables and arg checking	2017-06-09 15:44:48 -07:00
Landon Curt Noll	f91bfaab70	Prep for calc version 2.12.6.1	2017-06-05 21:05:25 -07:00
Landon Curt Noll	36ab4fdc1b	Fixed mal-formatted long lines in CHANGES	2017-06-05 20:01:49 -07:00
Landon Curt Noll	1cd89398ad	Fix multiple typos in the CHANGES file	2017-06-05 19:59:07 -07:00
Landon Curt Noll	bd3a381783	Warn about early GitHub history rebuild We part of our experimenting with GitHub, we reset the history of this repository. Anyone who was tracking the calc "pre-release" on GitHub prior to version 2.12.6.0 should do a: git reset --hard origin/master git cleanup -f Or you may just want to start over: rm -rf calc git clone https://github.com/lcn2/calc.git Sorry about that. The previous GitHub repository was an useful experiment. Based on what we learned, we decided to rebuild it.	2017-06-05 17:20:26 -07:00
Landon Curt Noll	618f42c960	Improve ptest and builtin help file content	2017-05-27 14:19:15 -07:00
Landon Curt Noll	1363b58060	Fixed reading from stdin with calc -p	2017-05-25 17:24:57 -07:00
Landon Curt Noll	2c659f40ff	Clarify unexpected parsing of if statements	2017-05-24 16:25:40 -07:00
Landon Curt Noll	4c243a69fe	Improve GitHub readme and fix typos	2017-05-24 16:23:02 -07:00
Landon Curt Noll	f80eee7a09	Setup for README.md and improved calc overview	2017-05-23 19:09:05 -07:00
Landon Curt Noll	a044b9325b	Added comments & common excluded to .gitignore	2017-05-23 18:54:22 -07:00
Landon Curt Noll	c028ea478f	Reduce max line length in lucas.cal comment	2017-05-23 18:47:23 -07:00
Landon Curt Noll	62bdba6d22	Undo always enabling clang sanitize We are not ready, just yet, to enable: -fsanitize=undefined -fsanitize=address Instead we need to test with: make clobber all check COMMON_ADD='-fsanitize=undefined -fsanitize=address' Once the regression test passes, we can consider how to use COMMON_ADD during development.	2017-05-23 02:18:51 -07:00
Landon Curt Noll	4d9511243c	Prepare for version 2.12.6.0	2017-05-23 02:16:52 -07:00
Landon Curt Noll	188fd372ea	Added COMMON_ADD Makefile facility Added the makefile variable ${COMMON_ADD} that will add flags to all compile and link commands. The ${COMMON_ADD} flags are appended to both ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}. This facility is available to nearly all platforms except those with very old make comamnds that do not understand the += operator. Example on masOS (Darwin), one may invoke clang's -fsanitize facility by: make clobber all COMMON_ADD='-fsanitize=undefined -fsanitize=address' Another example. To force C warnings to be treated as errors: make COMMON_ADD='-Werror'	2017-05-23 02:08:33 -07:00
Landon Curt Noll	44ffb0eec9	Clarify some comments about Ref 1 in lucas.cal	2017-05-23 01:47:10 -07:00
Landon Curt Noll	beb13bf89f	Ignore source tarball files that are built The source tarballs that are released are built from development trees. A number of files are created that are not in the development tee. Other files development files are replaced. We also ignore all binary files and library files that are built.	2017-05-23 01:39:43 -07:00
Landon Curt Noll	a31078bbec	Remove all RCS @(#) lines and RCS strings Some folks might think: “you still use RCS”?!? And we will say, hey, at least we switched from SCCS to RCS back in … I think it was around 1994 ... at least we are keeping up! :-) :-) :-) Logs say that SCCS version 18 became RCS version 19 on 1994 March 18. RCS served us well. But now it is time to move on. And so we are switching to git. Calc releases produce a lot of file changes. In the 125 releases of calc since 1996, when I started managing calc releases, there have been 15473 file mods!	2017-05-23 01:33:23 -07:00
Landon Curt Noll	7ae4f4009c	Convert tarball tree to development tree calc GitHub philosophy All of the previous commits in the master branch are the consists of compressed source tarballs. The 125 git tags represent calc releases from version 2.10.2t30 (Sat Jul 06 1996 04:17:00 GMT-0700) to version 2.12.5.6 (Sun May 21 2017 15:03:29 GMT-0700). At this point master branch will switch from those released tarballs to the development tree. While we will make an effort to verify that commits won't break calc: sometimes we will end up breaking calc. You should consider the top of the master branch as potentially unstable. When we are ready to release calc, we will tag the commit with the calc version and submit a release on GitHub. The GitHub release will contain the usual RPMs, SRPMs, a release README and a released source tarball.	2017-05-22 23:32:12 -07:00
Landon Curt Noll	40fc854006	Release calc version 2.12.5.6	2017-05-21 15:39:02 -07:00
Landon Curt Noll	8dd7a3cd2a	Release calc version 2.12.5.5	2017-05-21 15:39:01 -07:00
Landon Curt Noll	2726ae9d23	Release calc version 2.12.5.4	2017-05-21 15:39:01 -07:00
Landon Curt Noll	d25186fc52	Release calc version 2.12.5.3	2017-05-21 15:39:01 -07:00