Release calc version 2.12.4.6

BUGS

@@ -147,7 +147,7 @@ mis-features in calc:
 ##
 ## @(#) $Revision: 30.1 $
 ## @(#) $Id: BUGS,v 30.1 2007/03/16 11:09:46 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
+## @(#) $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

CHANGES

@@ -1,4 +1,96 @@
-The following are the changes from calc version 2.12.3.0 to date:
+The following are the changes from calc version 2.12.4.6 to date:
+
+    Updated RPM build process to remove use of deprecated flags.
+
+    Applied a number of fixes calc.spec file.
+
+    Changed rpm release to 2.1.
+
+
+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
+    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.
+
+    If is OK for the calc-symlink make rule to pre-remove a symlink.
+
+    Fixed bug was uncovered in calc that caused script failures when calc
+    is called within a while loop in BASH if the while loop is fed from
+    stdin due to calc's redirection/inheritance of stdin and no option
+    to change this behavior.  Thanks gores to David C. Rankin
+    <drankinatty at gmail dot com> for the bug fix and to David Haller
+    <dnh at opensuse dot org> for helping debug this problem.
+
+
+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.
+
+    Fixed a bug in solve.cal where high was not returned in some situations.
+
+    Fixed a bug reported by Paul & Karen Tomlinson (paulnkaz at pktomlinson
+    dot fsnet dot co dot uk) where calling log multiple times with different
+    values of epsilon resulted in an incorrect value.
+
+    Removed cvd rule from Makefiles.
+
+    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.
+    NOTE: For testing and calc build purposes will recommend and will
+    continue to use the -Werror flag.
+
+    Fixed a typo in the Makefile where the make variable ${SAMPLE_OBJ}
+    was misspelled as ${SAMPLE_OBJS}.
+
+    Added prep makefile rule to make is easier to compile calc without
+    an optimizer.  By doing:
+
+    	make clobber prep
+
+    one may build a calc binary that is easier to debug.
+
+    Fixed a bug where an certains typos (e.g., calling an unknown
+    function) would previously cause calc to exit.
+
+    Updated the COPYING file to reflect the new filenames associated
+    with the SHA1 hash function, and removed mention of files related
+    to the SHA (SHA0, not SHA1) and the MD5 hash functions (which is
+    no longer supported in calc).
+
+    Fixed a bug where a calling vsnprintf() twice created problems.
+    The thanks for this fix goes to Matthew Miller (mattdm at mattdm
+    dot org) for this patch.
+
+    Michael Penk (mpenk at wuska dot com) reported success in installs
+    under windoz via Cygwin by making a change to the Cygwin target.
+    These changes have been folded into the main calc Makefile.
+    The old recommendation of using 'make win32_hsrc' is no longer
+    required for Cygwin.  See the README.WINDOWS file for details.
+
+    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.
+
+    Changed deg.cal object name from dms to deg so that the more functional
+    dms.cal can own the dms object name.
+
+    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
+    and CALC_LITTLE_ENDIAN instead of BIG_ENDIAN and LITTLE_ENDIAN.
+
+
+The following are the changes from calc version 2.12.3.0 to 2.12.3.3:
 
     Fixed the Jacobi function where it returned 1 when it should have
     returned 0.  Thanks goes to Kevin Sopp (baraclese at googlemail dot com)
@@ -8,6 +100,23 @@ The following are the changes from calc version 2.12.3.0 to date:
     MINOR_PATCH (w) is 0.  Thus, 2.12.3.0 will be printed as 2.12.3.0
     instread 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).
+
+    Removed the use of rpm.release in the Makefile.
+
+    Mac OS Darwin targets no longer attempt to use ldconfig.  Under the
+    Darwin target, the LDCONFIG make variable is redefined to be
+    an empty value.  Thanks goes to Ralf Trinler (art at infra dot de)
+    for reporting this problem.
+
+    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.
+
+    Fixed a problem where a "make clobber" would remove custom/Makefile
+    and fail to rebuilt it.
+
 
 The following are the changes from calc version 2.12.2.3 to 2.12.2.4:
 
@@ -6717,9 +6826,9 @@ 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.13 $
+## @(#) $Revision: 30.24 $
-## @(#) $Id: CHANGES,v 30.13 2008/02/24 07:58:36 chongo Exp $
+## @(#) $Id: CHANGES,v 30.24 2013/05/05 08:31:08 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
+## @(#) $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

COPYING

@@ -6,15 +6,15 @@ This file is Copyrighted
 
     This file is covered under the following Copyright:
 
-	Copyright (C) 1999  Landon Curt Noll
+	Copyright (C) 1999-2008  Landon Curt Noll
 	All rights reserved.
 
 	Everyone is permitted to copy and distribute verbatim copies
 	of this license document, but changing it is not allowed.
 
-    # @(#) $Revision: 30.1 $
+    # @(#) $Revision: 30.2 $
-    # @(#) $Id: COPYING,v 30.1 2007/03/16 11:09:46 chongo Exp $
+    # @(#) $Id: COPYING,v 30.2 2008/10/24 10:46:52 chongo Exp $
-    # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $
+    # @(#) $Source: /usr/local/src/bin/calc/RCS/COPYING,v $
 
 =-=
 
@@ -168,9 +168,8 @@ Calc copyrights and exception files
 
     These files are not covered under one of the Copyrights listed above:
 
-	    shs1.c	    shs1.h	 shs.c		shs.h
+	    sha1.c		sha1.h		COPYING
-	    md5.c	    md5.h	 COPYING	COPYING-LGPL
+	    COPYING-LGPL	cal/qtime.cal	cal/screen.cal
-	    cal/qtime.cal   cal/screen.cal
 
     The file COPYING-LGPL, which contains a copy of the version 2.1
     GNU Lesser General Public License, is itself Copyrighted by the
@@ -182,11 +181,8 @@ Calc copyrights and exception files
     top of this file.  It is important to note that you may distribute
     verbatim copies of this file but you may not modify this file.
 
-    Some of these exception files are in the public domain.  The md5.c
+    Some of these exception files are in the public domain.  Other files
-    and md5.h files were "derived from the RSA Data Security, Inc. MD5
+    are under the LGPL but have different authors that those listed above.
-    Message-Digest Algorithm" and are under a copyright that allows these
-    two files to be freely used and distributed.  Other files are under
-    the LGPL but have different authors that those listed above.
 
     In all cases one may use and distribute these exception files freely.
     And because one may freely distribute the LGPL covered files, the

HOWTO.INSTALL

@@ -206,7 +206,7 @@ the calc help subsystem.  See the README file for details.
 ##
 ## @(#) $Revision: 30.6 $
 ## @(#) $Id: HOWTO.INSTALL,v 30.6 2007/10/16 12:22:22 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
+## @(#) $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

LIBRARY

@@ -640,7 +640,7 @@ need call libcalc_call_me_last() only once.
 ##
 ## @(#) $Revision: 30.1 $
 ## @(#) $Id: LIBRARY,v 30.1 2007/03/16 11:09:46 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/LIBRARY,v $
+## @(#) $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

Makefile

@@ -23,7 +23,7 @@
 #	 READLINE_LIB= -lreadline
 #	 READLINE_EXTRAS= -lhistory -lncurses
 #
-# Copyright (C) 1999-2007  Landon Curt Noll
+# Copyright (C) 1999-2008  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
@@ -39,9 +39,9 @@
 # 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.27 $$
+MAKEFILE_REV= $$Revision: 30.49 $$
-# @(#) $Id: Makefile.ship,v 30.27 2008/02/24 07:58:36 chongo Exp $
+# @(#) $Id: Makefile.ship,v 30.49 2013/03/25 21:31:55 chongo Exp chongo $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
 # File existed as early as:	before 1990
@@ -132,8 +132,8 @@ HAVE_VSPRINTF=
 # Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP.
 #
 CALC_BYTE_ORDER=
-#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN
+#CALC_BYTE_ORDER= -DBIG_ENDIAN
-#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN
+#CALC_BYTE_ORDER= -DLITTLE_ENDIAN
 
 # Determine the number of bits in a long
 #
@@ -598,6 +598,18 @@ INCDIR= /usr/include
 #	by default is empty.  If ${T} is non-empty, then installation
 #	locations will be relative to the ${T} directory.
 #
+# NOTE: If you change LIBDIR to a non-standard location, you will need
+#	to make changes to your execution environment so that executables
+#	will search LIBDIR when they are resolving dynamic shared libraries.
+#
+#	On OS X, this means you need to export $DYLD_LIBRARY_PATH
+#	to include the LIBDIR path in the value.
+#
+#	On Linux and BSD, this means you need to export $LD_LIBRARY_PATH
+#	to include the LIBDIR path in the value.
+#
+#	You might be better off not changing LIBDIR in the first place.
+#
 # For DJGPP, select:
 #
 #	BINDIR= /dev/env/DJDIR/bin
@@ -971,11 +983,12 @@ MKDIR_ARG= -p
 
 # Some out of date operating systems require / want an executable to
 # end with a certain file extension.  Some compile systems such as
-# Cygwin build calc as calc.exe.  The EXT variable is used to denote
+# windoz build calc as calc.exe.  The EXT variable is used to denote
-# the extension required by such.
+# the extension required by such.  Note that Cygwin requires EXT to be
+# the same as Linux/Un*x/GNU, even though it runs under windoz.
 #
-# EXT=				# normal Un*x / Linux / GNU/Linux systems
+# EXT=				# normal Un*x / Linux / GNU/Linux / Cygwin
-# EXT=.exe			# windoz / Cygwin
+# EXT=.exe			# windoz
 #
 # If in doubt, use EXT=
 #
@@ -984,8 +997,8 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.3.0
+VERSION= 2.12.4.6
-VERS= 2.12.3
+VERS= 2.12.4
 VER= 2.12
 VE= 2
 
@@ -1193,11 +1206,13 @@ LIB_EXT_VERSION:= .${VERSION}${LIB_EXT}
 LIB_EXT_VERS:= .${VERS}${LIB_EXT}
 LIB_EXT_VER:= .${VER}${LIB_EXT}
 LIB_EXT_VE:= .${VE}${LIB_EXT}
+# LDCONFIG not required on this platform, so we redefine it to an empty string
+LDCONFIG:=
 # DARWIN_ARCH= -arch i386 -arch ppc	# Universal binary
 # DARWIN_ARCH= -arch i386		# Intel binary
 # DARWIN_ARCH= -arch ppc		# PPC binary
 DARWIN_ARCH=				# native binary
-MACOSX_DEPLOYMENT_TARGET=10.4
+MACOSX_DEPLOYMENT_TARGET=10.8
 #
 endif
 
@@ -1320,6 +1335,40 @@ 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=
+#
+CCWARN= -Wall -W -Wno-comment
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC=
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
 #######################################################
 # simple target - values used to form Makefile.simple #
 #######################################################
@@ -1368,6 +1417,52 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 #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;${CALC_SHAREDIR};${CUSTOMCALDIR}
+#if 0	/* start of skip for non-Gnu makefiles */
+else
+CALCPATH= .;./cal;~/.cal;${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 -W -Wno-comment
+CCWERR=
+CCOPT= ${DEBUG}
+CCMISC= -DNOTCYGWIN
+#
+LCC= gcc
+CC= ${PURIFY} ${LCC} ${CCWERR}
+#
+endif
+
 ###################################################
 # default target - when no specific target exists #
 ###################################################
@@ -1766,7 +1861,7 @@ CALCLIBLIST= ${LIBSRC} ${UTIL_C_SRC} ${LIB_H_SRC} ${MAKE_FILE} \
 
 # complete list of .o files
 #
-OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
+OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJ}
 
 # static library build
 #
@@ -1865,6 +1960,9 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 
 all: ${BLD_TYPE} CHANGES
 
+prep:
+	${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3'
+
 calc-dynamic-only: ${DYNAMIC_FIRST_TARGETS} ${EARLY_TARGETS} \
 		   ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} calc${EXT} \
 		   ${SAMPLE_TARGETS} ${LATE_TARGETS}
@@ -3956,12 +4054,11 @@ env:
 	@echo 'target=${target}'; echo ''
 	@echo '=-=-=-=-= ${MAKE_FILE} end of major make variable dump =-=-=-=-='
 
-mkdebug: env version.c rpm.release
+mkdebug: env version.c
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
 	-@./ver_calc${EXT}
-	-@./ver_calc${EXT} -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -3970,7 +4067,7 @@ mkdebug: env version.c rpm.release
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
-debug: env rpm.release
+debug: env
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ clobber
@@ -3978,7 +4075,6 @@ debug: env rpm.release
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
 	-@./ver_calc${EXT}
-	-@./ver_calc${EXT} -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Determining the binary version =-=-=-=-='
@@ -3997,9 +4093,6 @@ debug: env rpm.release
 # make run
 #	* only run calc interactively with the ${CALC_ENV} environment
 #
-# make cvd
-#	* run the SGI WorkShop debugger on calc with the ${CALC_ENV} environment
-#
 # make dbx
 #	* run the dbx debugger on calc with the ${CALC_ENV} environment
 #
@@ -4011,9 +4104,6 @@ debug: env rpm.release
 run:
 	${CALC_ENV} ./calc${EXT}
 
-cvd:
-	${CALC_ENV} cvd ./calc${EXT}
-
 dbx:
 	${CALC_ENV} dbx ./calc${EXT}
 
@@ -4026,9 +4116,14 @@ gdb:
 #
 ###
 
-rpm: clobber rpm.mk calc.spec.in
+rpm: clobber rpm-preclean rpm.mk calc.spec.in
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${MAKE} -f rpm.mk V=${V}
+	${MAKE} -f rpm.mk all V=${V} RPM_TOP="${RPM_TOP}"
+	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
+
+rpm-preclean:
+	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	${MAKE} -f rpm.mk $@ V=${V} RPM_TOP="${RPM_TOP}"
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
 # rpm static rules
@@ -4210,6 +4305,7 @@ clobber: custom/Makefile clean
 #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
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -4385,9 +4481,9 @@ endif
 	        else \
 		${RM} -f ${T}${LIBDIR}/libcalc.a.new; \
 		${CP} -f libcalc.a ${T}${LIBDIR}/libcalc.a.new; \
+		${CHMOD} 0644 ${T}${LIBDIR}/libcalc.a.new; \
 		${MV} -f ${T}${LIBDIR}/libcalc.a.new ${T}${LIBDIR}/libcalc.a; \
 		${RANLIB} ${T}${LIBDIR}/libcalc.a; \
-		${CHMOD} 0444 ${T}${LIBDIR}/libcalc.a; \
 		echo "installed ${T}${LIBDIR}/libcalc.a"; \
 	   fi; \
 	fi
@@ -4403,6 +4499,7 @@ endif
 	    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
 	    ${CP} -f libcalc${LIB_EXT_VERSION} \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
+	    ${CHMOD} 0644 ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
 	    ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
@@ -4421,6 +4518,7 @@ endif
 	    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
 	    ${CP} -f custom/libcustcalc${LIB_EXT_VERSION} \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
+	    ${CHMOD} 0644 ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
 	    ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
@@ -4437,9 +4535,11 @@ endif
 	    		${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
 	    if [ -z "${T}" -o "/" = "${T}" ]; then \
-		echo "running ${LDCONFIG}"; \
+		if [ ! -z "${LDCONFIG}" ]; then \
-		${LDCONFIG}; \
+		    echo "running ${LDCONFIG}"; \
-		echo "finished ${LDCONFIG}"; \
+		    ${LDCONFIG} -v; \
+		    echo "finished ${LDCONFIG}"; \
+		fi; \
 	    fi; \
 	fi
 	-${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
@@ -4512,8 +4612,6 @@ endif
 		fi; \
 	    fi; \
 	fi
-	${V} # NOTE: remove ${T}${CALC_INCDIR}/custom if it is empty
-	-${Q} ${RMDIR} ${T}${CALC_INCDIR}/custom 2>/dev/null
 	${V} # NOTE: misc install cleanup
 	${Q} ${RM} -f tmp
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -4642,9 +4740,11 @@ uninstall: custom/Makefile
 	    fi; \
 	fi
 	-${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \
-	    echo "running ${LDCONFIG}"; \
+	    if [ ! -z "${LDCONFIG}" ]; then \
-	    ${LDCONFIG}; \
+		echo "running ${LDCONFIG}"; \
-	    echo "finished ${LDCONFIG}"; \
+		${LDCONFIG} -v; \
+		echo "finished ${LDCONFIG}"; \
+	    fi; \
 	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcalc.a" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcalc.a"; \
@@ -4718,6 +4818,81 @@ strip:
 	done
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
+# calc-symlink - setup symlinks from stardard locations into the ${T} tree
+#
+calc-symlink:
+	${Q}if [ -z "${T}" ]; then \
+	    echo "cannot use $@ make rule when T make var is empty" 1>&2; \
+	    echo "aborting" 1>&2; \
+	    exit 1; \
+	fi
+	-${Q} for i in	${BINDIR}/calc${EXT} \
+			${BINDIR}/calc-static${EXT} \
+			${SCRIPTDIR} \
+			${LIBDIR}/libcalc${LIB_EXT_VERSION} \
+			${LIBDIR}/libcustcalc${LIB_EXT_VERSION} \
+			${MANDIR}/calc.${MANEXT} \
+			${CALC_SHAREDIR} \
+			${CALC_INCDIR} \
+			; do \
+	    if [ -e "${T}$$i" ]; then \
+		    if [ ! -L "$$i" -a "${T}$$i" -ef "$$i" ]; then \
+		    	echo "ERROR: ${T}$$i is the same as $$i" 1>&2; \
+		    else \
+			if [ -e "$$i" ]; then \
+			    echo ${RM} -f "$$i"; \
+			    ${RM} -f "$$i"; \
+			fi; \
+			echo ${LN} -s "${T}$$i" "$$i"; \
+			${LN} -s "${T}$$i" "$$i"; \
+	    	    fi; \
+	    else \
+	        echo "Warning: not found: ${T}$$i" 1>&2; \
+	    fi; \
+	done
+	-${Q} if [ -n "${CATDIR}" ]; then \
+	    if [ -e "${T}${CATDIR}/calc.${CATEXT}" ]; then \
+		if [ ! -L "${CATDIR}/calc.${CATEXT}" -a "${T}${CATDIR}/calc.${CATEXT}" -ef "${CATDIR}/calc.${CATEXT}" ]; then \
+		    	echo "ERROR: ${T}${CATDIR}/calc.${CATEXT} is the same as ${CATDIR}/calc.${CATEXT}" 1>&2; \
+		else \
+		    if [ -e "${CATDIR}/calc.${CATEXT}" ]; then \
+			echo ${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+			${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+		    fi; \
+		    echo ${LN} -s "${T}${CATDIR}/calc.${CATEXT}" "${CATDIR}/calc.${CATEXT}"; \
+		    ${LN} -s "${T}${CATDIR}/calc.${CATEXT}" "${CATDIR}/calc.${CATEXT}"; \
+		fi; \
+	    fi; \
+	fi
+
+# remove any symlinks that may have been created by calc-symlink
+#
+calc-unsymlink:
+	-${Q} for i in	${BINDIR}/calc${EXT} \
+			${BINDIR}/calc-static${EXT} \
+			${SCRIPTDIR} \
+			${LIBDIR}/libcalc${LIB_EXT_VERSION} \
+			${LIBDIR}/libcustcalc${LIB_EXT_VERSION} \
+			${MANDIR}/calc.${MANEXT} \
+			${CALC_SHAREDIR} \
+			${CALC_INCDIR} \
+			; do \
+	    if [ -L "$$i" ]; then \
+		echo ${RM} -f "$$i"; \
+		${RM} -f "$$i"; \
+	    else \
+	        echo "Warning: ignoring non-symlink: $$i" 1>&2; \
+	    fi; \
+	done
+	-${Q} if [ -n "${CATDIR}" ]; then \
+	    if [ -L "${CATDIR}/calc.${CATEXT}" ]; then \
+		echo ${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+		${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+	    else \
+	        echo "Warning: ignoring non-symlink: ${CATDIR}/calc.${CATEXT}" 1>&2; \
+	    fi; \
+	fi
+
 ###
 #
 # make depend stuff

Makefile.simple

@@ -23,7 +23,7 @@
 #	 READLINE_LIB= -lreadline
 #	 READLINE_EXTRAS= -lhistory -lncurses
 #
-# Copyright (C) 1999-2007  Landon Curt Noll
+# Copyright (C) 1999-2008  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
@@ -39,9 +39,9 @@
 # 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.27 $$
+MAKEFILE_REV= $$Revision: 30.49 $$
-# @(#) $Id: Makefile.ship,v 30.27 2008/02/24 07:58:36 chongo Exp $
+# @(#) $Id: Makefile.ship,v 30.49 2013/03/25 21:31:55 chongo Exp chongo $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
 # File existed as early as:	before 1990
@@ -117,8 +117,8 @@ HAVE_VSPRINTF=
 # Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP.
 #
 CALC_BYTE_ORDER=
-#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN
+#CALC_BYTE_ORDER= -DBIG_ENDIAN
-#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN
+#CALC_BYTE_ORDER= -DLITTLE_ENDIAN
 
 # Determine the number of bits in a long
 #
@@ -583,6 +583,18 @@ INCDIR= /usr/include
 #	by default is empty.  If ${T} is non-empty, then installation
 #	locations will be relative to the ${T} directory.
 #
+# NOTE: If you change LIBDIR to a non-standard location, you will need
+#	to make changes to your execution environment so that executables
+#	will search LIBDIR when they are resolving dynamic shared libraries.
+#
+#	On OS X, this means you need to export $DYLD_LIBRARY_PATH
+#	to include the LIBDIR path in the value.
+#
+#	On Linux and BSD, this means you need to export $LD_LIBRARY_PATH
+#	to include the LIBDIR path in the value.
+#
+#	You might be better off not changing LIBDIR in the first place.
+#
 # For DJGPP, select:
 #
 #	BINDIR= /dev/env/DJDIR/bin
@@ -948,11 +960,12 @@ MKDIR_ARG= -p
 
 # Some out of date operating systems require / want an executable to
 # end with a certain file extension.  Some compile systems such as
-# Cygwin build calc as calc.exe.  The EXT variable is used to denote
+# windoz build calc as calc.exe.  The EXT variable is used to denote
-# the extension required by such.
+# the extension required by such.  Note that Cygwin requires EXT to be
+# the same as Linux/Un*x/GNU, even though it runs under windoz.
 #
-# EXT=				# normal Un*x / Linux / GNU/Linux systems
+# EXT=				# normal Un*x / Linux / GNU/Linux / Cygwin
-# EXT=.exe			# windoz / Cygwin
+# EXT=.exe			# windoz
 #
 # If in doubt, use EXT=
 #
@@ -961,8 +974,8 @@ EXT=
 
 # The default calc versions
 #
-VERSION= 2.12.3.0
+VERSION= 2.12.4.6
-VERS= 2.12.3
+VERS= 2.12.4
 VER= 2.12
 VE= 2
 
@@ -1126,6 +1139,7 @@ CFLAGS= ${ICFLAGS} ${CCOPT}
 ILDFLAGS= ${COMMON_LDFLAGS} ${LD_STATIC}
 LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC}
 #
+CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
 
 #######################################################################
 #-=-=-=-=-=- end of target section - only make rules below -=-=-=-=-=-#
@@ -1461,7 +1475,7 @@ CALCLIBLIST= ${LIBSRC} ${UTIL_C_SRC} ${LIB_H_SRC} ${MAKE_FILE} \
 
 # complete list of .o files
 #
-OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJS}
+OBJS= ${LIBOBJS} ${CALCOBJS} ${UTIL_OBJS} ${SAMPLE_OBJ}
 
 # static library build
 #
@@ -1527,6 +1541,9 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
 
 all: ${BLD_TYPE} CHANGES
 
+prep:
+	${Q} ${MAKE} -f ${MAKE_FILE} all DEBUG='-g3'
+
 calc-dynamic-only: ${DYNAMIC_FIRST_TARGETS} ${EARLY_TARGETS} \
 		   ${CALC_DYNAMIC_LIBS} ${SYM_DYNAMIC_LIBS} calc${EXT} \
 		   ${SAMPLE_TARGETS} ${LATE_TARGETS}
@@ -3574,12 +3591,11 @@ env:
 	@echo 'target=${target}'; echo ''
 	@echo '=-=-=-=-= ${MAKE_FILE} end of major make variable dump =-=-=-=-='
 
-mkdebug: env version.c rpm.release
+mkdebug: env version.c
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
 	-@./ver_calc${EXT}
-	-@./ver_calc${EXT} -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
@@ -3588,7 +3604,7 @@ mkdebug: env version.c rpm.release
 	@echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
-debug: env rpm.release
+debug: env
 	@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ clobber
@@ -3596,7 +3612,6 @@ debug: env rpm.release
 	@echo '=-=-=-=-= Determining the source version =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ ver_calc${EXT}
 	-@./ver_calc${EXT}
-	-@./ver_calc${EXT} -r rpm.release
 	@echo '=-=-=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=-='
 	@${MAKE} -f Makefile Q= V=@ all
 	@echo '=-=-=-=-= Determining the binary version =-=-=-=-='
@@ -3615,9 +3630,6 @@ debug: env rpm.release
 # make run
 #	* only run calc interactively with the ${CALC_ENV} environment
 #
-# make cvd
-#	* run the SGI WorkShop debugger on calc with the ${CALC_ENV} environment
-#
 # make dbx
 #	* run the dbx debugger on calc with the ${CALC_ENV} environment
 #
@@ -3629,9 +3641,6 @@ debug: env rpm.release
 run:
 	${CALC_ENV} ./calc${EXT}
 
-cvd:
-	${CALC_ENV} cvd ./calc${EXT}
-
 dbx:
 	${CALC_ENV} dbx ./calc${EXT}
 
@@ -3644,9 +3653,14 @@ gdb:
 #
 ###
 
-rpm: clobber rpm.mk calc.spec.in
+rpm: clobber rpm-preclean rpm.mk calc.spec.in
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${MAKE} -f rpm.mk V=${V}
+	${MAKE} -f rpm.mk all V=${V} RPM_TOP="${RPM_TOP}"
+	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
+
+rpm-preclean:
+	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
+	${MAKE} -f rpm.mk $@ V=${V} RPM_TOP="${RPM_TOP}"
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
 # rpm static rules
@@ -3987,9 +4001,9 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	        else \
 		${RM} -f ${T}${LIBDIR}/libcalc.a.new; \
 		${CP} -f libcalc.a ${T}${LIBDIR}/libcalc.a.new; \
+		${CHMOD} 0644 ${T}${LIBDIR}/libcalc.a.new; \
 		${MV} -f ${T}${LIBDIR}/libcalc.a.new ${T}${LIBDIR}/libcalc.a; \
 		${RANLIB} ${T}${LIBDIR}/libcalc.a; \
-		${CHMOD} 0444 ${T}${LIBDIR}/libcalc.a; \
 		echo "installed ${T}${LIBDIR}/libcalc.a"; \
 	   fi; \
 	fi
@@ -4005,6 +4019,7 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	    ${RM} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
 	    ${CP} -f libcalc${LIB_EXT_VERSION} \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
+	    ${CHMOD} 0644 ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new; \
 	    ${MV} -f ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT_VERSION}"; \
@@ -4023,6 +4038,7 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	    ${RM} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
 	    ${CP} -f custom/libcustcalc${LIB_EXT_VERSION} \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
+	    ${CHMOD} 0644 ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new; \
 	    ${MV} -f ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}.new \
 	    	     ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}; \
 	    echo "installed ${T}${LIBDIR}/libcustcalc${LIB_EXT_VERSION}"; \
@@ -4039,9 +4055,11 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 	    		${T}${LIBDIR}/libcustcalc${LIB_EXT}; \
 	    echo "installed ${T}${LIBDIR}/libcalc${LIB_EXT}"; \
 	    if [ -z "${T}" -o "/" = "${T}" ]; then \
-		echo "running ${LDCONFIG}"; \
+		if [ ! -z "${LDCONFIG}" ]; then \
-		${LDCONFIG}; \
+		    echo "running ${LDCONFIG}"; \
-		echo "finished ${LDCONFIG}"; \
+		    ${LDCONFIG} -v; \
+		    echo "finished ${LDCONFIG}"; \
+		fi; \
 	    fi; \
 	fi
 	-${Q} for i in ${LIB_H_SRC} ${BUILD_H_SRC} /dev/null; do \
@@ -4114,8 +4132,6 @@ install: custom/Makefile ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all
 		fi; \
 	    fi; \
 	fi
-	${V} # NOTE: remove ${T}${CALC_INCDIR}/custom if it is empty
-	-${Q} ${RMDIR} ${T}${CALC_INCDIR}/custom 2>/dev/null
 	${V} # NOTE: misc install cleanup
 	${Q} ${RM} -f tmp
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -4244,9 +4260,11 @@ uninstall: custom/Makefile
 	    fi; \
 	fi
 	-${Q} if [ -z "${T}" -o "/" = "${T}" ]; then \
-	    echo "running ${LDCONFIG}"; \
+	    if [ ! -z "${LDCONFIG}" ]; then \
-	    ${LDCONFIG}; \
+		echo "running ${LDCONFIG}"; \
-	    echo "finished ${LDCONFIG}"; \
+		${LDCONFIG} -v; \
+		echo "finished ${LDCONFIG}"; \
+	    fi; \
 	fi
 	-${Q} if [ -f "${T}${LIBDIR}/libcalc.a" ]; then \
 	    ${RM} -f "${T}${LIBDIR}/libcalc.a"; \
@@ -4320,6 +4338,81 @@ strip:
 	done
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
 
+# calc-symlink - setup symlinks from stardard locations into the ${T} tree
+#
+calc-symlink:
+	${Q}if [ -z "${T}" ]; then \
+	    echo "cannot use $@ make rule when T make var is empty" 1>&2; \
+	    echo "aborting" 1>&2; \
+	    exit 1; \
+	fi
+	-${Q} for i in	${BINDIR}/calc${EXT} \
+			${BINDIR}/calc-static${EXT} \
+			${SCRIPTDIR} \
+			${LIBDIR}/libcalc${LIB_EXT_VERSION} \
+			${LIBDIR}/libcustcalc${LIB_EXT_VERSION} \
+			${MANDIR}/calc.${MANEXT} \
+			${CALC_SHAREDIR} \
+			${CALC_INCDIR} \
+			; do \
+	    if [ -e "${T}$$i" ]; then \
+		    if [ ! -L "$$i" -a "${T}$$i" -ef "$$i" ]; then \
+		    	echo "ERROR: ${T}$$i is the same as $$i" 1>&2; \
+		    else \
+			if [ -e "$$i" ]; then \
+			    echo ${RM} -f "$$i"; \
+			    ${RM} -f "$$i"; \
+			fi; \
+			echo ${LN} -s "${T}$$i" "$$i"; \
+			${LN} -s "${T}$$i" "$$i"; \
+	    	    fi; \
+	    else \
+	        echo "Warning: not found: ${T}$$i" 1>&2; \
+	    fi; \
+	done
+	-${Q} if [ -n "${CATDIR}" ]; then \
+	    if [ -e "${T}${CATDIR}/calc.${CATEXT}" ]; then \
+		if [ ! -L "${CATDIR}/calc.${CATEXT}" -a "${T}${CATDIR}/calc.${CATEXT}" -ef "${CATDIR}/calc.${CATEXT}" ]; then \
+		    	echo "ERROR: ${T}${CATDIR}/calc.${CATEXT} is the same as ${CATDIR}/calc.${CATEXT}" 1>&2; \
+		else \
+		    if [ -e "${CATDIR}/calc.${CATEXT}" ]; then \
+			echo ${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+			${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+		    fi; \
+		    echo ${LN} -s "${T}${CATDIR}/calc.${CATEXT}" "${CATDIR}/calc.${CATEXT}"; \
+		    ${LN} -s "${T}${CATDIR}/calc.${CATEXT}" "${CATDIR}/calc.${CATEXT}"; \
+		fi; \
+	    fi; \
+	fi
+
+# remove any symlinks that may have been created by calc-symlink
+#
+calc-unsymlink:
+	-${Q} for i in	${BINDIR}/calc${EXT} \
+			${BINDIR}/calc-static${EXT} \
+			${SCRIPTDIR} \
+			${LIBDIR}/libcalc${LIB_EXT_VERSION} \
+			${LIBDIR}/libcustcalc${LIB_EXT_VERSION} \
+			${MANDIR}/calc.${MANEXT} \
+			${CALC_SHAREDIR} \
+			${CALC_INCDIR} \
+			; do \
+	    if [ -L "$$i" ]; then \
+		echo ${RM} -f "$$i"; \
+		${RM} -f "$$i"; \
+	    else \
+	        echo "Warning: ignoring non-symlink: $$i" 1>&2; \
+	    fi; \
+	done
+	-${Q} if [ -n "${CATDIR}" ]; then \
+	    if [ -L "${CATDIR}/calc.${CATEXT}" ]; then \
+		echo ${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+		${RM} -f "${CATDIR}/calc.${CATEXT}"; \
+	    else \
+	        echo "Warning: ignoring non-symlink: ${CATDIR}/calc.${CATEXT}" 1>&2; \
+	    fi; \
+	fi
+
 ###
 #
 # make depend stuff

README

@@ -136,7 +136,7 @@ The calc web site is located at:
 ##
 ## @(#) $Revision: 30.1 $
 ## @(#) $Id: README,v 30.1 2007/03/16 11:09:46 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/README,v $
+## @(#) $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

README.WINDOWS

@@ -10,6 +10,63 @@ NOTE: The main developers do not have access to a Windoz based platform.
       Of course you are welcome to send us any patches that fix your
       Windoz build environment.
 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= compiling with Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+An effort is being made to allow windows users to compile calc using the
+Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
+and Un*x tools for Windows.
+
+The major porting work for Cygwin was performed by Thomas Jones-Low
+(tjoneslo at softstart dot com).
+
+In March 2009, Michael Penk (mpenk at wuska dot com) reported success in
+installs under Cygwin:
+
+    On my fairly complete Cygwin installs, everything compiles,
+    checks, and installs correctly.  My Cygwin is configured
+    in a very standard way (out of the box, using all of Cygwin's
+    defaults).  The install worked on 5 different machines with
+    Cygwin on them: one XP home, one XP professional, and three
+    Vista professionals.
+
+Using the calc Makefile, he did the following:
+
+    make all target=Cygwin
+    make check
+    make install
+
+He also reports:
+
+    Of course, one should be logged in as an Administrator when
+    one builds and installs calc.
+
+He was compiling calc 2.12.4.0 with Cygwin version 1.5.25-15.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+=-= If all else fails, for Cygwin =-=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+Much earlier (2001?) Thomas Jones-Low (tjoneslo at softstart dot com)
+recommended that you generate by hand all of the header files that
+by the Makefile.  This has been done for you via the makefile rule:
+
+	make win32_hsrc
+
+which uses the Makefile variables in win32.mkdef to form these header
+files under win32 directory.
+
+You will find generated versions of these files located in the win32
+sub-directory.  These files may be appropriate for your Cygwin building
+needs.
+
+In particular:
+
+	Just copy the win32/*.[ch] files up into the top level calc
+	source directory, edit them (if needed) and build using the
+	Cygwin GCC compiler and Cygwin build environment.
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 =-= compiling under DJGPP =-=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -68,52 +125,8 @@ Look for Makefile comments of the form:
 Follow those recommendations.  In cases where they conflict with
 the above Makefile list, follow the recommendation in the Makefile.
 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-=-= compiling with Cygwin =-=
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-An effort is being made to allow windows users to compile calc using the
+## Copyright (C) 2002-2009  Landon Curt Noll and Thomas Jones-Low
-Cygwin project (http://sources.redhat.com/cygwin/) with the GCC compiler
-and Un*x tools for Windows.
-
-The major porting work was performed by Thomas Jones-Low
-(tjoneslo at softstart dot com).  He said:
-
-    I had previous stated to this group that I have successfully managed
-    to port a version of Calc to Windows, and promised some point to
-    post what was required, so here it is.
-
-    One obvious manner of doing this port is to get the latest version
-    of the Cygwin project (http://sources.redhat.com/cygwin/) with the
-    GCC compiler and Un*x tools for Windows and recompile.
-
-    I built my working version using Calc ... I am using Visual C++
-    version 7.0, which is an older version of the Microsoft development
-    tools. The make file provided with Calc is not compatible with
-    NMAKE, so I used the Visual Studio tools to generate another one
-    (not included). Calc is built in two parts, calc.dll, which is the
-    library, and calc.exe which is the command line interface.
-
-He recommended that you generate by hand all of the header files that
-by the Makefile.  This has been done for you via the makefile rule:
-
-	make win32_hsrc
-
-which uses the Makefile variables in win32.mkdef to form these header
-files under win32 directory.
-
-You will find generated versions of these files located in the win32
-sub-directory.  These files may be appropriate for your Cygwin building
-needs.
-
-In particular:
-
-	Just copy the win32/*.[ch] files up into the top level calc
-	source directory, edit them (if needed) and build using the
-	Cygwin GCC compiler and Cygwin build environment.
-
-
-## Copyright (C) 2002-2007  Landon Curt Noll and Thomas Jones-Low
 ##
 ## 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
@@ -129,9 +142,9 @@ In particular:
 ## 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 $
+## @(#) $Revision: 30.2 $
-## @(#) $Id: README.WINDOWS,v 30.1 2007/03/16 11:09:46 chongo Exp $
+## @(#) $Id: README.WINDOWS,v 30.2 2009/03/14 02:29:31 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
+## @(#) $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

addop.c

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: addop.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
+ * @(#) $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

align32.c

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: align32.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/align32.c,v $
+ * @(#) $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

alloc.h

@@ -17,9 +17,9 @@
  * 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 $
+ * @(#) $Revision: 30.2 $
- * @(#) $Id: alloc.h,v 30.1 2007/03/16 11:09:46 chongo Exp $
+ * @(#) $Id: alloc.h,v 30.2 2008/04/15 21:17:57 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
+ * @(#) $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
@@ -46,6 +46,9 @@
 # include <string.h>
 
 #else
+#if defined(_WIN32) && defined(NOTCYGWIN)
+#include <stdio.h>
+#endif
 
 # if defined(HAVE_NEWSTR)
 E_FUNC void *memcpy();

assocfunc.c

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: assocfunc.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/assocfunc.c,v $
+ * @(#) $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

blkcpy.c

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: blkcpy.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
+ * @(#) $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

blkcpy.h

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: blkcpy.h,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.h,v $
+ * @(#) $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

block.c

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: block.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.c,v $
+ * @(#) $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

block.h

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: block.h,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.h,v $
+ * @(#) $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

byteswap.c

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: byteswap.c,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.c,v $
+ * @(#) $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

byteswap.h

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: byteswap.h,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
+ * @(#) $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

cal/Makefile

@@ -18,9 +18,9 @@
 # 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 $
+# @(#) $Revision: 30.5 $
-# @(#) $Id: Makefile,v 30.3 2007/09/21 01:27:27 chongo Exp $
+# @(#) $Id: Makefile,v 30.5 2011/05/23 22:50:18 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
+# @(#) $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
@@ -193,7 +193,8 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.cal \
 	beer.cal hello.cal test5100.cal test5200.cal randombitrun.cal \
 	randomrun.cal repeat.cal xx_print.cal natnumset.cal qtime.cal \
 	test8400.cal test8500.cal test8600.cal chi.cal intfile.cal screen.cal \
-	dotest.cal set8700.cal set8700.line alg_config.cal sumtimes.cal
+	dotest.cal set8700.cal set8700.line alg_config.cal sumtimes.cal \
+	dms.cal hms.cal gvec.cal
 
 # These files are found (but not built) in the distribution
 #

cal/README

@@ -226,14 +226,37 @@ chrem.cal
 
 deg.cal
 
+    deg(deg, min, sec)
+    deg_add(a, b)
+    deg_neg(a)
+    deg_sub(a, b)
+    deg_mul(a, b)
+    deg_print(a)
+
+    Calculate in degrees, minutes, and seconds.  For a more functional
+    version see dms.cal.
+
+
+dms.cal
+
     dms(deg, min, sec)
     dms_add(a, b)
     dms_neg(a)
     dms_sub(a, b)
     dms_mul(a, b)
     dms_print(a)
+    dms_abs(a)
+    dms_norm(a)
+    dms_test(a)
+    dms_int(a)
+    dms_frac(a)
+    dms_rel(a,b)
+    dms_cmp(a,b)
+    dms_inc(a)
+    dms_dec(a)
 
-    Calculate in degrees, minutes, and seconds.
+    Calculate in degrees, minutes, and seconds.  Unlike deg.cal, increments
+    are on the arc second level.  See also hms.cal.
 
 
 dotest.cal
@@ -275,6 +298,13 @@ ellip.cal
     Attempt to factor using the elliptic functions: y^2 = x^3 + a*x + b.
 
 
+gvec.cal
+
+    gvec(function, vector)
+
+    Vectorize any single-input function or trailing operator.
+
+
 hello.cal
 
     Calc's contribution to the Hello World! page:
@@ -285,6 +315,27 @@ hello.cal
      NOTE: This resource produces a lot of output.  :-)
 
 
+hms.cal
+
+    hms(hour, min, sec)
+    hms_add(a, b)
+    hms_neg(a)
+    hms_sub(a, b)
+    hms_mul(a, b)
+    hms_print(a)
+    hms_abs(a)
+    hms_norm(a)
+    hms_test(a)
+    hms_int(a)
+    hms_frac(a)
+    hms_rel(a,b)
+    hms_cmp(a,b)
+    hms_inc(a)
+    hms_dec(a)
+
+    Calculate in hours, minutes, and seconds.  See also dmscal.
+
+
 intfile.cal
 
     file2be(filename)
@@ -1014,9 +1065,9 @@ xx_print.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.1 $
+## @(#) $Revision: 30.3 $
-## @(#) $Id: README,v 30.1 2007/03/16 11:09:54 chongo Exp $
+## @(#) $Id: README,v 30.3 2011/05/23 22:50:32 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
+## @(#) $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

cal/alg_config.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: alg_config.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/alg_config.cal,v $
+ * @(#) $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

cal/beer.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: beer.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/beer.cal,v $
+ * @(#) $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

cal/bernoulli.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: bernoulli.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bernoulli.cal,v $
+ * @(#) $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

cal/bigprime.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: bigprime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bigprime.cal,v $
+ * @(#) $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

cal/bindings

@@ -18,7 +18,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: bindings,v 30.1 2007/03/16 11:09:54 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bindings,v $
+# @(#) $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

cal/chi.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: chi.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chi.cal,v $
+ * @(#) $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

cal/chrem.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: chrem.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chrem.cal,v $
+ * @(#) $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

cal/deg.cal

@@ -17,9 +17,9 @@
  * 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 $
+ * @(#) $Revision: 30.2 $
- * @(#) $Id: deg.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
+ * @(#) $Id: deg.cal,v 30.2 2010/09/02 06:01:14 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/deg.cal,v $
+ * @(#) $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
@@ -28,9 +28,9 @@
  */
 
 
-obj dms {deg, min, sec};
+obj deg {deg, min, sec};
 
-define dms(deg, min, sec)
+define deg(deg, min, sec)
 {
 	local ans;
 
@@ -38,18 +38,18 @@ define dms(deg, min, sec)
 		sec = 0;
 	if (isnull(min))
 		min = 0;
-	obj dms ans;
+	obj deg ans;
 	ans.deg = deg;
 	ans.min = min;
 	ans.sec = sec;
-	fixdms(ans);
+	fixdeg(ans);
 	return ans;
 }
 
 
-define dms_add(a, b)
+define deg_add(a, b)
 {
-	local obj dms	ans;
+	local obj deg	ans;
 
 	ans.deg = 0;
 	ans.min = 0;
@@ -66,14 +66,14 @@ define dms_add(a, b)
 		ans.sec += b.sec;
 	} else
 		ans.deg += b;
-	fixdms(ans);
+	fixdeg(ans);
 	return ans;
 }
 
 
-define dms_neg(a)
+define deg_neg(a)
 {
-	local obj dms	ans;
+	local obj deg	ans;
 
 	ans.deg = -a.deg;
 	ans.min = -a.min;
@@ -82,15 +82,15 @@ define dms_neg(a)
 }
 
 
-define dms_sub(a, b)
+define deg_sub(a, b)
 {
 	return a - b;
 }
 
 
-define dms_mul(a, b)
+define deg_mul(a, b)
 {
-	local obj dms	ans;
+	local obj deg	ans;
 
 	if (istype(a, ans) && istype(b, ans))
 		quit "Cannot multiply degrees together";
@@ -103,24 +103,24 @@ define dms_mul(a, b)
 		ans.min = b.min * a;
 		ans.sec = b.sec * a;
 	}
-	fixdms(ans);
+	fixdeg(ans);
 	return ans;
 }
 
 
-define dms_print(a)
+define deg_print(a)
 {
 	print a.deg : 'd' : a.min : 'm' : a.sec : 's' :;
 }
 
 
-define dms_abs(a)
+define deg_abs(a)
 {
 	return a.deg + a.min / 60 + a.sec / 3600;
 }
 
 
-define fixdms(a)
+define fixdeg(a)
 {
 	a.min += frac(a.deg) * 60;
 	a.deg = int(a.deg);
@@ -134,5 +134,5 @@ define fixdms(a)
 }
 
 if (config("resource_debug") & 3) {
-    print "obj dms {deg, min, sec} defined";
+    print "obj deg {deg, min, sec} defined";
 }

cal/dms.cal

@@ -0,0 +1,384 @@
+/*
+ * dms - calculate in degrees, minutes, and seconds (based on deg)
+ *
+ * Copyright (C) 1999,2010  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
+ * 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.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
+ *
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+obj dms {deg, min, sec};
+
+define dms(deg, min, sec)
+{
+    local obj dms ans;		/* return value */
+
+    /* default missing args to 0 */
+    if (isnull(sec)) {
+	sec = 0;
+    }
+    if (isnull(min)) {
+	min = 0;
+    }
+
+    /* load object */
+    ans.deg = deg;
+    ans.min = min;
+    ans.sec = sec;
+
+    /* return properly formed object */
+    ans = fixdms(ans);
+    return ans;
+}
+
+
+define dms_add(a, b)
+{
+    local obj dms ans;		/* return value */
+
+    /* initalize value to 1st arg */
+    if (istype(a, ans)) {
+	/* 1st arg is dms object, load it */
+	ans.deg = a.deg;
+	ans.min = a.min;
+	ans.sec = a.sec;
+    } else {
+	/* 1st arg is not dms, assume scalar degrees */
+	ans.deg = a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* add value of 2nd arg */
+    if (istype(b, ans)) {
+	/* 2nd arg is dms object, add it */
+	ans.deg += b.deg;
+	ans.min += b.min;
+	ans.sec += b.sec;
+    } else {
+	/* 2nd arg is not dms, add scalar degrees */
+	ans.deg += b;
+    }
+
+    /* return normalized result */
+    ans = fixdms(ans);
+    return ans;
+}
+
+
+define dms_neg(a)
+{
+    local obj dms ans;		/* return value */
+
+    /* negate argument */
+    if (istype(a, ans)) {
+	/* 1st arg is dms object, load it */
+	ans.deg = -a.deg;
+	ans.min = -a.min;
+	ans.sec = -a.sec;
+    } else {
+	/* 2nd arg is not dms, negate scalar degrees */
+	ans.deg = -a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* return normalized result */
+    ans = fixdms(ans);
+    return ans;
+}
+
+
+define dms_sub(a, b)
+{
+    local obj dms ans;		/* return value */
+
+    /* initalize value to 1st arg */
+    if (istype(a, ans)) {
+	/* 1st arg is dms object, load it */
+	ans.deg = a.deg;
+	ans.min = a.min;
+	ans.sec = a.sec;
+    } else {
+	/* 1st arg is not dms, assume scalar degrees */
+	ans.deg = a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* subtract value of 2nd arg */
+    if (istype(b, ans)) {
+	/* 2nd arg is dms object, subtract it */
+	ans.deg -= b.deg;
+	ans.min -= b.min;
+	ans.sec -= b.sec;
+    } else {
+	/* 2nd arg is not dms, subtract scalar degrees */
+	ans.deg -= b;
+    }
+
+    /* return normalized result */
+    ans = fixdms(ans);
+    return ans;
+}
+
+
+define dms_mul(a, b)
+{
+    local obj dms ans;		/* return value */
+
+    /* dms object multiplication */
+    if (istype(a, ans) && istype(b, ans)) {
+	ans.deg = dms_abs(a) * dms_abs(b);
+	ans.min = 0;
+	ans.sec = 0;
+
+    /* scalar multiplication */
+    } else if (istype(a, ans)) {
+	ans.deg = a.deg * b;
+	ans.min = a.min * b;
+	ans.sec = a.sec * b;
+    } else {
+	ans.deg = b.deg * a;
+	ans.min = b.min * a;
+	ans.sec = b.sec * a;
+    }
+
+    /* return normalized result */
+    ans = fixdms(ans);
+    return ans;
+}
+
+
+define dms_print(a)
+{
+    local obj dms ans;		/* temp object for dms type testing */
+
+    /* firewall - arg must be a dms object */
+    if (! istype(a, ans)) {
+	quit "dms_print called with non dms object";
+    }
+
+    /* print in dms form */
+    print a.deg : 'd' : a.min : 'm' : a.sec : 's' :;
+}
+
+
+define dms_abs(a)
+{
+    local obj dms ans;		/* temp object for dms type testing */
+    local deg;			/* return scalar value */
+
+    /* firewall - just absolute value non dms objects */
+    if (! istype(a, ans)) {
+    	return abs(a);
+    }
+
+    /* compute degrees */
+    deg = a.deg + a.min / 60 + a.sec / 3600;
+
+    /* return degrees */
+    return deg;
+}
+
+
+define dms_norm(a)
+{
+    local obj dms ans;		/* temp object for dms type testing */
+    local deg;			/* degrees */
+
+    /* firewall - arg must be a dms object */
+    if (! istype(a, ans)) {
+	quit "dms_norm called with non dms object";
+    }
+
+    /* square degrees (norm is the square of absolute value */
+    deg = dms_abs(a);
+
+    /* return degrees */
+    return deg*deg;
+}
+
+
+define dms_test(a)
+{
+    local obj dms ans;		/* temp value */
+
+    /* firewall - arg must be a dms object */
+    if (! istype(a, ans)) {
+	quit "dms_test called with non dms object";
+    }
+
+    /* return false of non-zero */
+    ans = fixdms(a);
+    if (ans.deg == 0 && ans.min == 0 && ans.sec == 0) {
+	/* false */
+	return 0;
+    }
+    /* true */
+    return 1;
+}
+
+
+define dms_int(a)
+{
+    local obj dms ans;		/* return value */
+
+    /* firewall - arg must be a dms object */
+    if (! istype(a, ans)) {
+	quit "dms_int called with non dms object";
+    }
+
+    /* normalize the argument */
+    ans = fixdms(a);
+
+    /* truncate to the nearest second */
+    ans.sec = int(ans.sec);
+
+    /* return value to the nearest second */
+    return ans;
+}
+
+
+define dms_frac(a)
+{
+    local obj dms ans;		/* return value */
+
+    /* firewall - arg must be a dms object */
+    if (! istype(a, ans)) {
+	quit "dms_frac called with non dms object";
+    }
+
+    /* normalize the argument */
+    ans = fixdms(a);
+
+    /* remove all but fractional seconds */
+    ans.deg = 0;
+    ans.min = 0;
+    ans.sec = frac(ans.sec);
+
+    /* return value to the second fraction */
+    return ans;
+}
+
+
+define dms_rel(a,b)
+{
+    local abs_a, abs_b;		/* scalars of the arguments */
+
+    /* compute scalars of the arguments */
+    abs_a = dms_abs(a);
+    abs_b = dms_abs(b);
+
+    /* return the comparison */
+    return cmp(abs_a, abs_b);
+}
+
+
+define dms_cmp(a,b)
+{
+    local abs_a, abs_b;		/* scalars of the arguments */
+
+    /* compute scalars of the arguments */
+    abs_a = dms_abs(a);
+    abs_b = dms_abs(b);
+
+    /* return the equality comparison */
+    return (abs_a == abs_b);
+}
+
+
+define dms_inc(a)
+{
+    local obj dms ans;		/* return value */
+
+    /* increment a dms object */
+    if (istype(a, ans)) {
+	ans = a;
+	++ans.sec;
+
+	/* return normalized result */
+	ans = fixdms(ans);
+	return ans;
+    }
+
+    /* increment a scalar */
+    return a+1;
+}
+
+
+define dms_dec(a)
+{
+    local obj dms ans;		/* return value */
+
+    /* decrement a dms object */
+    if (istype(a, ans)) {
+	ans = a;
+	--ans.sec;
+
+	/* return normalized result */
+	ans = fixdms(ans);
+	return ans;
+    }
+
+    /* decrement a scalar */
+    return a-1;
+}
+
+
+define fixdms(a)
+{
+    local obj dms ans;		/* temp value */
+
+    /* firewall */
+    if (! istype(a, ans)) {
+	quit "attempt to fix a non dms object";
+    }
+
+    /* force minutes to be intergral */
+    a.min += frac(a.deg) * 60;
+    a.deg = int(a.deg);
+
+    /* force degrees to be intergral */
+    a.sec += frac(a.min) * 60;
+    a.min = int(a.min);
+
+    /* carry excess seconds into minutes */
+    a.min += a.sec // 60;
+    a.sec %= 60;
+
+    /* carry excess minutes into degrees */
+    a.deg += a.min // 60;
+    a.min %= 60;
+
+    /* round degrees :-) */
+    a.deg %= 360;
+
+    /* return normalized result */
+    return a;
+}
+
+if (config("resource_debug") & 3) {
+    print "obj dms {deg, min, sec} defined";
+}

cal/dotest.cal

@@ -18,7 +18,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: dotest.cal,v 30.2 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/dotest.cal,v $
+ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/dotest.cal,v $
  *
  * This file is not covered under version 2.1 of the GNU LGPL.
  *

cal/ellip.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: ellip.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/ellip.cal,v $
+ * @(#) $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

cal/gvec.cal

@@ -0,0 +1,107 @@
+/*
+ * gvec - vectorize any single-input function or trailing operator
+ *
+ * This version accepts arbitrary number of arguments, but of course
+ * they must all be same length vectors.
+ *
+ * The gvec function is for use in either a two-arg function or a two-arg
+ * 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
+ *
+ * By Carl Witthoft carl at witthoft dot com
+ */
+
+define gvec(function, vector)
+{
+    local xlen,y,foo;
+    local precx = 1e-50;	/* default for now */
+    local argc = param(0)-1;
+    local old_tilde;		/* previous config("tilde") */
+
+    /*
+     * parse args
+     */
+    local plist = mat[argc];
+    if (config("resource_debug") & 8) {
+	print "plist=", plist;
+	print "argc=", argc;
+    }
+    for(local i = 0; i< argc; i++) {
+	local ii = i + 2;
+	if (config("resource_debug") & 8) {
+	    print "ii=", ii;
+	    print "param(" : ii : "}=", param(ii);
+	    print "size(param(" : ii : ")=", size(param(ii));
+	}
+	plist[i] = size(param(ii));
+    }
+    local slist=sort(plist);
+    if (config("resource_debug") & 8) {
+	print "plist=", plist;
+    }
+    local argm = argc-1;
+    if (config("resource_debug") & 8) {
+	print "argm=", argm;
+    }
+    if (slist[0] != slist[argm]) {
+	quit "lengths don't match";
+    }
+    xlen = size(vector);
+    y = mat[xlen];
+
+    /*
+     * We can't do str(vector[j]) outside loop, eval() petulantly refuses to
+     * look at local variables.
+     *
+     * Also we need to config("tilde",0) to turn off lead tilde
+     * (so str(vector[j]) looks like a number.
+     */
+    old_tilde = config("tilde",0);
+
+    /*
+     * Ok, now check to see if "function" is a function.  If not, it's an
+     * operation and it's up to user to make it valid
+     */
+    if (isdefined(function)) {
+
+	/* yep, it's a function, either builtin or user-defined */
+	for (local j=0; j<xlen; j++) {
+
+	    /* build the function call */
+	    foo = strcat(function, "(");
+	    for (local jj = 0; jj<argc; jj++) {
+		foo = strcat(foo , str(param(jj+2)[j]), ",");
+	    }
+	    foo = strcat(foo, str(precx), ")");
+	    if (config("resource_debug") & 8) {
+		print "foo=", foo;
+	    }
+	    y[j] = eval(foo);
+	}
+
+    /*
+     * it is an operator --  multi-argument operator makes no sense
+     */
+    } else {
+	if (argc > 1) {
+	    quit "Error: operator can accept only one argument";
+	}
+	for (j=0; j<xlen; j++) {
+	    foo = strcat(str(vector[j]), function);
+	    y[j] = eval(foo);
+	}
+    }
+
+    /* restore tilde mode if needed */
+    config("tilde", old_tilde);
+
+    /* return result */
+    return y;
+}

cal/hello.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: hello.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/hello.cal,v $
+ * @(#) $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

cal/hms.cal

@@ -0,0 +1,384 @@
+/*
+ * hms - calculate in hours, minutes, and seconds
+ *
+ * Copyright (C) 2010  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.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
+ *
+ * Share and enjoy!  :-)	http://www.isthe.com/chongo/tech/comp/calc/
+ */
+
+
+obj hms {hour, min, sec};
+
+define hms(hour, min, sec)
+{
+    local obj hms ans;		/* return value */
+
+    /* default missing args to 0 */
+    if (isnull(sec)) {
+	sec = 0;
+    }
+    if (isnull(min)) {
+	min = 0;
+    }
+
+    /* load object */
+    ans.hour = hour;
+    ans.min = min;
+    ans.sec = sec;
+
+    /* return properly formed object */
+    ans = fixhms(ans);
+    return ans;
+}
+
+
+define hms_add(a, b)
+{
+    local obj hms ans;		/* return value */
+
+    /* initalize value to 1st arg */
+    if (istype(a, ans)) {
+	/* 1st arg is hms object, load it */
+	ans.hour = a.hour;
+	ans.min = a.min;
+	ans.sec = a.sec;
+    } else {
+	/* 1st arg is not hms, assume scalar hours */
+	ans.hour = a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* add value of 2nd arg */
+    if (istype(b, ans)) {
+	/* 2nd arg is hms object, add it */
+	ans.hour += b.hour;
+	ans.min += b.min;
+	ans.sec += b.sec;
+    } else {
+	/* 2nd arg is not hms, add scalar hours */
+	ans.hour += b;
+    }
+
+    /* return normalized result */
+    ans = fixhms(ans);
+    return ans;
+}
+
+
+define hms_neg(a)
+{
+    local obj hms ans;		/* return value */
+
+    /* negate argument */
+    if (istype(a, ans)) {
+	/* 1st arg is hms object, load it */
+	ans.hour = -a.hour;
+	ans.min = -a.min;
+	ans.sec = -a.sec;
+    } else {
+	/* 2nd arg is not hms, negate scalar hours */
+	ans.hour = -a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* return normalized result */
+    ans = fixhms(ans);
+    return ans;
+}
+
+
+define hms_sub(a, b)
+{
+    local obj hms ans;		/* return value */
+
+    /* initalize value to 1st arg */
+    if (istype(a, ans)) {
+	/* 1st arg is hms object, load it */
+	ans.hour = a.hour;
+	ans.min = a.min;
+	ans.sec = a.sec;
+    } else {
+	/* 1st arg is not hms, assume scalar hours */
+	ans.hour = a;
+	ans.min = 0;
+	ans.sec = 0;
+    }
+
+    /* subtract value of 2nd arg */
+    if (istype(b, ans)) {
+	/* 2nd arg is hms object, subtract it */
+	ans.hour -= b.hour;
+	ans.min -= b.min;
+	ans.sec -= b.sec;
+    } else {
+	/* 2nd arg is not hms, subtract scalar hours */
+	ans.hour -= b;
+    }
+
+    /* return normalized result */
+    ans = fixhms(ans);
+    return ans;
+}
+
+
+define hms_mul(a, b)
+{
+    local obj hms ans;		/* return value */
+
+    /* hms object multiplication */
+    if (istype(a, ans) && istype(b, ans)) {
+	ans.hour = hms_abs(a) * hms_abs(b);
+	ans.min = 0;
+	ans.sec = 0;
+
+    /* scalar multiplication */
+    } else if (istype(a, ans)) {
+	ans.hour = a.hour * b;
+	ans.min = a.min * b;
+	ans.sec = a.sec * b;
+    } else {
+	ans.hour = b.hour * a;
+	ans.min = b.min * a;
+	ans.sec = b.sec * a;
+    }
+
+    /* return normalized result */
+    ans = fixhms(ans);
+    return ans;
+}
+
+
+define hms_print(a)
+{
+    local obj hms ans;		/* temp object for hms type testing */
+
+    /* firewall - arg must be a hms object */
+    if (! istype(a, ans)) {
+	quit "hms_print called with non hms object";
+    }
+
+    /* print in hms form */
+    print a.hour : ':' : a.min : ':' : a.sec :;
+}
+
+
+define hms_abs(a)
+{
+    local obj hms ans;		/* temp object for hms type testing */
+    local hour;			/* return scalar value */
+
+    /* firewall - just absolute value non hms objects */
+    if (! istype(a, ans)) {
+    	return abs(a);
+    }
+
+    /* compute hours */
+    hour = a.hour + a.min / 60 + a.sec / 3600;
+
+    /* return hours */
+    return hour;
+}
+
+
+define hms_norm(a)
+{
+    local obj hms ans;		/* temp object for hms type testing */
+    local hour;			/* hours */
+
+    /* firewall - arg must be a hms object */
+    if (! istype(a, ans)) {
+	quit "hms_norm called with non hms object";
+    }
+
+    /* square hours (norm is the square of absolute value */
+    hour = hms_abs(a);
+
+    /* return hours */
+    return hour*hour;
+}
+
+
+define hms_test(a)
+{
+    local obj hms ans;		/* temp value */
+
+    /* firewall - arg must be a hms object */
+    if (! istype(a, ans)) {
+	quit "hms_test called with non hms object";
+    }
+
+    /* return false of non-zero */
+    ans = fixhms(a);
+    if (ans.hour == 0 && ans.min == 0 && ans.sec == 0) {
+	/* false */
+	return 0;
+    }
+    /* true */
+    return 1;
+}
+
+
+define hms_int(a)
+{
+    local obj hms ans;		/* return value */
+
+    /* firewall - arg must be a hms object */
+    if (! istype(a, ans)) {
+	quit "hms_int called with non hms object";
+    }
+
+    /* normalize the argument */
+    ans = fixhms(a);
+
+    /* truncate to the nearest second */
+    ans.sec = int(ans.sec);
+
+    /* return value to the nearest second */
+    return ans;
+}
+
+
+define hms_frac(a)
+{
+    local obj hms ans;		/* return value */
+
+    /* firewall - arg must be a hms object */
+    if (! istype(a, ans)) {
+	quit "hms_frac called with non hms object";
+    }
+
+    /* normalize the argument */
+    ans = fixhms(a);
+
+    /* remove all but fractional seconds */
+    ans.hour = 0;
+    ans.min = 0;
+    ans.sec = frac(ans.sec);
+
+    /* return value to the second fraction */
+    return ans;
+}
+
+
+define hms_rel(a,b)
+{
+    local abs_a, abs_b;		/* scalars of the arguments */
+
+    /* compute scalars of the arguments */
+    abs_a = hms_abs(a);
+    abs_b = hms_abs(b);
+
+    /* return the comparison */
+    return cmp(abs_a, abs_b);
+}
+
+
+define hms_cmp(a,b)
+{
+    local abs_a, abs_b;		/* scalars of the arguments */
+
+    /* compute scalars of the arguments */
+    abs_a = hms_abs(a);
+    abs_b = hms_abs(b);
+
+    /* return the equality comparison */
+    return (abs_a == abs_b);
+}
+
+
+define hms_inc(a)
+{
+    local obj hms ans;		/* return value */
+
+    /* increment a hms object */
+    if (istype(a, ans)) {
+	ans = a;
+	++ans.sec;
+
+	/* return normalized result */
+	ans = fixhms(ans);
+	return ans;
+    }
+
+    /* increment a scalar */
+    return a+1;
+}
+
+
+define hms_dec(a)
+{
+    local obj hms ans;		/* return value */
+
+    /* decrement a hms object */
+    if (istype(a, ans)) {
+	ans = a;
+	--ans.sec;
+
+	/* return normalized result */
+	ans = fixhms(ans);
+	return ans;
+    }
+
+    /* decrement a scalar */
+    return a-1;
+}
+
+
+define fixhms(a)
+{
+    local obj hms ans;		/* temp value */
+
+    /* firewall */
+    if (! istype(a, ans)) {
+	quit "attempt to fix a non hms object";
+    }
+
+    /* force minutes to be intergral */
+    a.min += frac(a.hour) * 60;
+    a.hour = int(a.hour);
+
+    /* force hours to be intergral */
+    a.sec += frac(a.min) * 60;
+    a.min = int(a.min);
+
+    /* carry excess seconds into minutes */
+    a.min += a.sec // 60;
+    a.sec %= 60;
+
+    /* carry excess minutes into hours */
+    a.hour += a.min // 60;
+    a.min %= 60;
+
+    /* round hours by day */
+    a.hour %= 24;
+
+    /* return normalized result */
+    return a;
+}
+
+if (config("resource_debug") & 3) {
+    print "obj hms {hour, min, sec} defined";
+}

cal/intfile.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: intfile.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/intfile.cal,v $
+ * @(#) $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

cal/linear.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: linear.cal,v 30.2 2007/03/17 05:57:42 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/linear.cal,v $
+ * @(#) $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

cal/lucas.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: lucas.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas.cal,v $
+ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/lucas.cal,v $
  *
  * Under source code control:	1990/05/03 16:49:51
  * File existed as early as:	1990

cal/lucas_chk.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: lucas_chk.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_chk.cal,v $
+ * @(#) $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

cal/lucas_tbl.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: lucas_tbl.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_tbl.cal,v $
+ * @(#) $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

cal/mersenne.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: mersenne.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mersenne.cal,v $
+ * @(#) $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

cal/mfactor.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: mfactor.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mfactor.cal,v $
+ * @(#) $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

cal/mod.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: mod.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mod.cal,v $
+ * @(#) $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

cal/natnumset.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: natnumset.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/natnumset.cal,v $
+ * @(#) $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

cal/pell.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: pell.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pell.cal,v $
+ * @(#) $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

cal/pi.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: pi.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pi.cal,v $
+ * @(#) $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

cal/pix.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: pix.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pix.cal,v $
+ * @(#) $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

cal/pollard.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: pollard.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pollard.cal,v $
+ * @(#) $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

cal/poly.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: poly.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/poly.cal,v $
+ * @(#) $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

cal/prompt.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: prompt.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/prompt.cal,v $
+ * @(#) $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

cal/psqrt.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: psqrt.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/psqrt.cal,v $
+ * @(#) $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

cal/qtime.cal

@@ -22,7 +22,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: qtime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/qtime.cal,v $
+ * @(#) $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

cal/quat.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: quat.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/quat.cal,v $
+ * @(#) $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

cal/randbitrun.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: randbitrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randbitrun.cal,v $
+ * @(#) $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

cal/randmprime.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: randmprime.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randmprime.cal,v $
+ * @(#) $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

cal/randombitrun.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: randombitrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randombitrun.cal,v $
+ * @(#) $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

cal/randomrun.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: randomrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randomrun.cal,v $
+ * @(#) $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

cal/randrun.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: randrun.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randrun.cal,v $
+ * @(#) $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

cal/regress.cal

@@ -17,9 +17,9 @@
  * 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 $
+ * @(#) $Revision: 30.6 $
- * @(#) $Id: regress.cal,v 30.4 2008/02/24 07:41:49 chongo Exp $
+ * @(#) $Id: regress.cal,v 30.6 2010/09/02 06:09:06 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $
+ * @(#) $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
@@ -2738,11 +2738,24 @@ define test_2600()
 	vrfy(log(1e127) == 127,
 			    strcat(str(tnum++), ': log(1e127)) == 127'));
 	vrfy(round(log(17^47),10) == 57.8310993048,
-			    strcat(str(tnum++),
+	    strcat(str(tnum++),
-			    	   ': round(log(17^47),10) == 57.8310993048'));
+		   ': round(log(17^47),10) == 57.8310993048'));
 	vrfy(round(log(127),10) == 2.103803721,
-			    strcat(str(tnum++),
+	    strcat(str(tnum++),
-			    	   ': round(log(127),10) == 2.103803721'));
+		   ': round(log(127),10) == 2.103803721'));
+	vrfy(round(log(0.25,0.00001),5) == -0.60206,
+	    strcat(str(tnum++),
+		   ': round(log(0.25,0.00001),5) == -0.60206'));
+	vrfy(round(log(0.25,1e-10),10) == -0.6020599913,
+	    strcat(str(tnum++),
+		   ': round(log(0.25,1e-10),10) == -0.6020599913'));
+	vrfy(round( log(1.2+1.2i,1e-5),5) == 0.2297+0.34109i,
+	    strcat(str(tnum++),
+		   ': round(log(1.2+1.2i,1e-5),5) == 0.2297+0.34109i'));
+	vrfy(round( log(1.2+1.2i,1e-10),10) == 0.2296962439+0.3410940885i,
+	    strcat(str(tnum++),
+		   ': round(log(1.2+1.2i,1e-10),10) == ',
+		   '0.2296962439+0.3410940885i'));
         epsilon(i),;
 	print tnum++: ': epsilon(i),;';
 
@@ -7999,7 +8012,11 @@ print	'9838: skipping read -once hello.cal because it is an infinite loop';
 print	'9839: skipping read -once xx_print.cal because it is a printing demo';
 read -once sumtimes;
 print	'9840: read -once sumtimes';
-print	'9841: Ending read of selected calc resource files';
+read -once dms;
+print	'9841: read -once dms';
+read -once hms;
+print	'9842: read -once hms';
+print	'9843: Ending read of selected calc resource files';
 
 
 /*

cal/repeat.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: repeat.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/repeat.cal,v $
+ * @(#) $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

cal/screen.cal

@@ -17,7 +17,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: screen.cal,v 30.2 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/screen.cal,v $
+ * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/screen.cal,v $
  *
  * This file is not covered under version 2.1 of the GNU LGPL.
  *

cal/seedrandom.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: seedrandom.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/seedrandom.cal,v $
+ * @(#) $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

cal/set8700.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: set8700.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.cal,v $
+ * @(#) $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

cal/set8700.line

@@ -19,7 +19,7 @@
 ##
 ## @(#) $Revision: 30.1 $
 ## @(#) $Id: set8700.line,v 30.1 2007/03/16 11:09:54 chongo Exp $
-## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.line,v $
+## @(#) $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

cal/solve.cal

@@ -17,9 +17,9 @@
  * 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 $
+ * @(#) $Revision: 30.2 $
- * @(#) $Id: solve.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
+ * @(#) $Id: solve.cal,v 30.2 2008/05/10 13:30:00 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/solve.cal,v $
+ * @(#) $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
@@ -47,7 +47,7 @@ define solve(low, high, epsilon)
 	if (abs(flow) < epsilon)
 		return low;
 	fhigh = f(high);
-	if (abs(flow) < epsilon)
+	if (abs(fhigh) < epsilon)
 		return high;
 	if (sgn(flow) == sgn(fhigh))
 		quit "Non-opposite signs";

cal/sumsq.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: sumsq.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumsq.cal,v $
+ * @(#) $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

cal/sumtimes.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: sumtimes.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumtimes.cal,v $
+ * @(#) $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

cal/surd.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: surd.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/surd.cal,v $
+ * @(#) $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

cal/test1700.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test1700.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test1700.cal,v $
+ * @(#) $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

cal/test2300.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test2300.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2300.cal,v $
+ * @(#) $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

cal/test2600.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: test2600.cal,v 30.2 2007/07/11 22:57:23 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2600.cal,v $
+ * @(#) $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

cal/test2700.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test2700.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2700.cal,v $
+ * @(#) $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

cal/test3100.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test3100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3100.cal,v $
+ * @(#) $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

cal/test3300.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test3300.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3300.cal,v $
+ * @(#) $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

cal/test3400.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test3400.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3400.cal,v $
+ * @(#) $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

cal/test3500.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test3500.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3500.cal,v $
+ * @(#) $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

cal/test4000.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test4000.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4000.cal,v $
+ * @(#) $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

cal/test4100.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test4100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4100.cal,v $
+ * @(#) $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

cal/test4600.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test4600.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4600.cal,v $
+ * @(#) $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

cal/test5100.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test5100.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5100.cal,v $
+ * @(#) $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

cal/test5200.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test5200.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5200.cal,v $
+ * @(#) $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

cal/test8400.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test8400.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8400.cal,v $
+ * @(#) $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

cal/test8500.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test8500.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8500.cal,v $
+ * @(#) $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

cal/test8600.cal

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: test8600.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8600.cal,v $
+ * @(#) $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

cal/unitfrac.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: unitfrac.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/unitfrac.cal,v $
+ * @(#) $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

cal/varargs.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: varargs.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/varargs.cal,v $
+ * @(#) $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

cal/xx_print.cal

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: xx_print.cal,v 30.1 2007/03/16 11:09:54 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/xx_print.cal,v $
+ * @(#) $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

calc.c

@@ -1,7 +1,7 @@
 /*
  * calc - arbitrary precision calculator
  *
- * Copyright (C) 1999-2007  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2013  David I. Bell, Landon Curt Noll and Ernest Bowen
  *
  * Primary author:  David I. Bell
  *
@@ -19,9 +19,9 @@
  * 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 $
+ * @(#) $Revision: 30.6 $
- * @(#) $Id: calc.c,v 30.3 2007/07/15 02:03:42 chongo Exp $
+ * @(#) $Id: calc.c,v 30.6 2013/03/25 21:39:57 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.c,v $
+ * @(#) $Source: /usr/local/src/bin/calc/RCS/calc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:11
  * File existed as early as:	before 1990
@@ -42,6 +42,7 @@
 
 #if defined(_WIN32)
 # include <io.h>
+# if !defined(NOTCYGWIN)
 /*
  * getopt.h file is from the Cygwin GNU library
  *
@@ -49,6 +50,7 @@
  *	http://sources.redhat.com/cygwin/
  */
 # include "../getopt/getopt.h"
+# endif
 # define strdup _strdup
 # define isatty _isatty
 #endif /* Windoz */
@@ -485,6 +487,9 @@ main(int argc, char **argv)
 	if (havecommands) {
 		cmdbuf[cmdlen++] = '\n';
 		cmdbuf[cmdlen] = '\0';
+		if (fclose(stdin)) {
+			perror("main(): fclose(stdin) failed:");
+		}
 	}
 
 	argc_value = argc - maxindex;

calc.h

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: calc.h,v 30.2 2007/07/10 17:44:52 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
+ * @(#) $Source: /usr/local/src/bin/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
  * File existed as early as:	before 1990

calc.man

@@ -17,7 +17,7 @@
 .\"
 .\" @(#) $Revision: 30.3 $
 .\" @(#) $Id: calc.man,v 30.3 2007/09/08 02:53:09 chongo Exp $
-.\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
+.\" @(#) $Source: /usr/local/src/bin/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
 .\" File existed as early as:	    1991

calc.spec.in

@@ -2,7 +2,7 @@
 #
 # calc.spec.in - template specfile for calc
 #
-# Copyright (C) 2003-2007  Petteri Kettunen and Landon Curt Noll
+# Copyright (C) 2003-2013  Petteri Kettunen 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
@@ -18,9 +18,9 @@
 # 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 $
+# @(#) $Revision: 30.8 $
-# @(#) $Id: calc.spec.in,v 30.6 2007/10/16 12:22:22 chongo Exp $
+# @(#) $Id: calc.spec.in,v 30.8 2013/05/01 16:23:39 chongo Exp chongo $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calc.spec.in,v $
 #
 # Under source code control:	2003/02/16 20:21:39
 # File existed as early as:	2003
@@ -37,14 +37,16 @@
 Summary: Arbitrary precision calculator.
 Name: calc
 Version: <<<PROJECT_VERSION>>>
-Release: 1.1
+Release: 2.1
 License: LGPL
 Group: Applications/Engineering
-Source: %{name}-%{version}.tar.bz2
+Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
 URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
-Requires: ncurses >= 5.2-26, readline >= 4.2, less >= 358
+Vendor: Landon Noll and Associates
-BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
+Packager: Landon Noll and Associates (http://www.isthe.com/chongo/index.html)
-BuildRoot: %{_tmppath}/%{name}-root
+Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358
+BuildRequires: ncurses-devel >= 5.5-24, readline-devel >= 5.1-3
+BuildRoot: %{_tmppath}/build-root
 
 %description
 Calc is arbitrary precision C-like arithmetic system that is a
@@ -58,8 +60,8 @@ For the latest calc release, see the calc project home page:
 
 %package devel
 Summary: Development files and documentation for calc.
-Group: Development/Libraries
+Group: Applications/Engineering
-PreReq: %{name} = %{version}-%{release}
+Requires: calc = %{version}-%{release}
 
 %description devel
 This package contains the header files and static libraries for developing
@@ -70,46 +72,46 @@ For the latest calc release, see the project home page:
     http://www.isthe.com/chongo/tech/comp/calc/index.html
 
 %prep
-%setup -q
+%setup -T -b 0
 
 %build
 echo '-=- calc.spec beginning make clobber -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ clobber
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ clobber
 echo '-=- calc.spec ending make clobber -=-'
 echo '-=- calc.spec beginning make calc-static-only -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-static-only BLD_TYPE=calc-static-only
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-static-only BLD_TYPE=calc-static-only
 echo '-=- calc.spec ending make calc-static-only -=-'
 echo '-=- calc.spec beginning make rpm-hide-static -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-hide-static
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-hide-static
 echo '-=- calc.spec ending make rpm-hide-static -=-'
 echo '-=- calc.spec beginning make clobber (again) -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ clobber
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ clobber
 echo '-=- calc.spec ending make clobber (again) -=-'
 echo '-=- calc.spec beginning make calc-dynamic-only -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only BLD_TYPE=calc-dynamic-only LD_SHARE=
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ calc-dynamic-only BLD_TYPE=calc-dynamic-only LD_SHARE=
 echo '-=- calc.spec ending make calc-dynamic-only -=-'
 echo '-=- calc.spec beginning make chk -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ chk
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ chk
 echo '-=- calc.spec ending make chk -=-'
 echo '-=- calc.spec beginning make rpm-unhide-static -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-unhide-static
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-unhide-static
 echo '-=- calc.spec ending make rpm-unhide-static -=-'
 echo '-=- calc.spec beginning make rpm-clean-static -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-clean-static
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-clean-static
 echo '-=- calc.spec ending make rpm-clean-static -=-'
 echo '-=- calc.spec beginning make rpm-chk-static -=-'
-make %{?_smp_mflags} T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-chk-static
+make %{?_smp_mflags} T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ rpm-chk-static
 echo '-=- calc.spec ending make rpm-chk-static -=-'
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
 echo '-=- calc.spec beginning make install -=-'
-make T=%{buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ install
+rm -rf %{_buildroot}
+mkdir -p %{_buildroot}
+make T=%{_buildroot} BINDIR=%{_bindir} LIBDIR=%{_libdir} CALC_SHAREDIR=%{_datadir}/%{name} CALC_INCDIR=%{_includedir}/calc MANDIR=%{_mandir}/man1 EXT= V=@ install
 echo '-=- calc.spec ending make install -=-'
 
 %clean
-rm -rf %{buildroot}
+rm -rf %{_buildroot}
 
 %files
 %defattr(-, root, root)
@@ -124,8 +126,10 @@ rm -rf %{buildroot}
 %attr(644, root, root) %{_datadir}/%{name}/help/*
 %attr(644, root, root) %{_datadir}/%{name}/*.cal
 %attr(644, root, root) %{_datadir}/%{name}/*.line
-%attr(644, root, root) %{_libdir}/libcalc.so.%{version}
+%attr(644, root, root) %{_libdir}/libcalc.so
-%attr(644, root, root) %{_libdir}/libcustcalc.so.%{version}
+%attr(644, root, root) %{_libdir}/libcalc.so.*
+%attr(644, root, root) %{_libdir}/libcustcalc.so
+%attr(644, root, root) %{_libdir}/libcustcalc.so.*
 
 %files devel
 %defattr(-, root, root)
@@ -136,6 +140,15 @@ rm -rf %{buildroot}
 %attr(644, root, root) %{_libdir}/libcustcalc.a
 
 %changelog
+* Sat May 05 2013 Landon Curt Noll http://www.isthe.com/chongo
+- Source: is a URL as per rpm requirements
+- Release: 2.1
+- Requires: ncurses >= 5.5-24, readline >= 5.1-3, less >= 358
+- BuildRequires: ncurses-devel >= 5.5-24, readline-devel >= 5.1-3
+- Fixed permissions so that rpm build services can modify libraries
+- Added missing files to files section
+* Mon Mar 25 2013 Landon Curt Noll http://www.isthe.com/chongo
+- Removed deprecated PreReq for calc-devel, using Requires
 * Sun Sep 01 2007 Landon Curt Noll http://www.isthe.com/chongo
 - Release of calc-2.12.2
 - Calc builds with shared libraries

calcerr.tbl

@@ -19,7 +19,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: calcerr.tbl,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr.tbl,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calcerr.tbl,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996

calcerr_c.awk

@@ -20,7 +20,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: calcerr_c.awk,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_c.awk,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calcerr_c.awk,v $
 #
 # Under source code control:	1996/05/24 03:15:35
 # File existed as early as:	1996

calcerr_c.sed

@@ -20,7 +20,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: calcerr_c.sed,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_c.sed,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calcerr_c.sed,v $
 #
 # Under source code control:	1996/05/24 03:15:35
 # File existed as early as:	1996

calcerr_h.awk

@@ -20,7 +20,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: calcerr_h.awk,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_h.awk,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calcerr_h.awk,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996

calcerr_h.sed

@@ -20,7 +20,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: calcerr_h.sed,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_h.sed,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/calcerr_h.sed,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996

check.awk

@@ -20,7 +20,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: check.awk,v 30.1 2007/03/16 11:09:46 chongo Exp $
-# @(#) $Source: /usr/local/src/cmd/calc/RCS/check.awk,v $
+# @(#) $Source: /usr/local/src/bin/calc/RCS/check.awk,v $
 #
 # Under source code control:	1996/05/25 22:07:58
 # File existed as early as:	1996

cmath.h

@@ -19,7 +19,7 @@
  *
  * @(#) $Revision: 30.1 $
  * @(#) $Id: cmath.h,v 30.1 2007/03/16 11:09:46 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
+ * @(#) $Source: /usr/local/src/bin/calc/RCS/cmath.h,v $
  *
  * Under source code control:	1993/07/30 19:42:45
  * File existed as early as:	1993

codegen.c

@@ -21,7 +21,7 @@
  *
  * @(#) $Revision: 30.2 $
  * @(#) $Id: codegen.c,v 30.2 2007/07/05 13:30:38 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/codegen.c,v $
+ * @(#) $Source: /usr/local/src/bin/calc/RCS/codegen.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
  * File existed as early as:	before 1990

comfunc.c

@@ -19,9 +19,9 @@
  * 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 $
+ * @(#) $Revision: 30.3 $
- * @(#) $Id: comfunc.c,v 30.2 2007/07/11 23:05:49 chongo Exp $
+ * @(#) $Id: comfunc.c,v 30.3 2008/10/24 07:09:41 chongo Exp $
- * @(#) $Source: /usr/local/src/cmd/calc/RCS/comfunc.c,v $
+ * @(#) $Source: /usr/local/src/bin/calc/RCS/comfunc.c,v $
  *
  * Under source code control:	1990/02/15 01:48:13
  * File existed as early as:	before 1990
@@ -556,7 +556,7 @@ c_log(COMPLEX *c, NUMBER *epsilon)
 	if (cln_10_epsilon == NULL) {
 		/* first time call */
 		cln_10_epsilon = qcopy(epsilon);
-	} else if (qcmp(cln_10_epsilon, epsilon) == FALSE) {
+	} else if (qcmp(cln_10_epsilon, epsilon) == TRUE) {
 		/* replaced cacheed value with epsilon arg */
 		qfree(cln_10_epsilon);
 		cln_10_epsilon = qcopy(epsilon);