Release calc version 2.12.4.1

2025-08-16 01:03:29 +03:00 · 2013-05-19 15:45:58 -07:00
parent a1c96f95a6
commit c9fce6a5bb
547 changed files with 723 additions and 1142 deletions
--- a/2
+++ b/2
@@ -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/bin/calc/RCS/BUGS,v $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13
 ## File existed as early as:	1994
--- a/50
+++ b/50
@@ -1,40 +1,4 @@
-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 to calc.spec and rpm.mk file.
-    See calc.spec.in for details.  Changed rpm release to 2.1.
-
-    Set MACOSX_DEPLOYMENT_TARGET=10.8 as we upgraded all of
-    our development Mac OS X to 10.8.
-
-    Libraries are chmodded as 0644 to allow for building rpms
-    without root.
-
-    Silenced annoying warning about unused variable 'intp'
-    while compiline endian.c under some circumstances.
-
-
-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:
+The following are the changes from calc version 2.12.4.0 to date:

    Fixed a documentation bug for the sgn() builtin.

@@ -91,12 +55,6 @@ The following are the changes from calc version 2.12.4.0 to 2.12.4.2:
    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:

@@ -6834,9 +6792,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.26 $
-## @(#) $Id: CHANGES,v 30.26 2013/05/19 22:10:34 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/CHANGES,v $
+## @(#) $Revision: 30.19 $
+## @(#) $Id: CHANGES,v 30.19 2010/09/02 06:09:26 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
 ## File existed as early as:	1989
--- a/2
+++ b/2
@@ -14,7 +14,7 @@ This file is Copyrighted

    # @(#) $Revision: 30.2 $
    # @(#) $Id: COPYING,v 30.2 2008/10/24 10:46:52 chongo Exp $
-    # @(#) $Source: /usr/local/src/bin/calc/RCS/COPYING,v $
+    # @(#) $Source: /usr/local/src/cmd/calc/RCS/COPYING,v $

 =-=

--- a/HOWTO.INSTALL
+++ b/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/bin/calc/RCS/HOWTO.INSTALL,v $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/HOWTO.INSTALL,v $
 ##
 ## Under source code control:	1999/09/27 20:48:44
 ## File existed as early as:	1999
--- a/2
+++ b/2
@@ -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/bin/calc/RCS/LIBRARY,v $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/LIBRARY,v $
 ##
 ## Under source code control:	1993/07/30 19:44:49
 ## File existed as early as:	1993
--- a/102
+++ b/102
@@ -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.51 $$
-# @(#) $Id: Makefile.ship,v 30.51 2013/05/05 13:52:39 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
+MAKEFILE_REV= $$Revision: 30.44 $$
+# @(#) $Id: Makefile.ship,v 30.44 2010/09/02 06:07:07 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/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= -DBIG_ENDIAN
-#CALC_BYTE_ORDER= -DLITTLE_ENDIAN
+#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN
+#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN

 # Determine the number of bits in a long
 #
@@ -997,7 +997,7 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.8
+VERSION= 2.12.4.1
 VERS= 2.12.4
 VER= 2.12
 VE= 2
@@ -1212,7 +1212,7 @@ LDCONFIG:=
 # DARWIN_ARCH= -arch i386		# Intel binary
 # DARWIN_ARCH= -arch ppc		# PPC binary
 DARWIN_ARCH=				# native binary
-MACOSX_DEPLOYMENT_TARGET=10.8
+MACOSX_DEPLOYMENT_TARGET=10.4
 #
 endif

@@ -4116,14 +4116,9 @@ gdb:
 #
 ###

-rpm: clobber rpm-preclean rpm.mk calc.spec.in
+rpm: clobber rpm.mk calc.spec.in
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${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}"
+	${MAKE} -f rpm.mk V=${V}
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

 # rpm static rules
@@ -4481,9 +4476,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
@@ -4499,7 +4494,6 @@ 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}"; \
@@ -4518,7 +4512,6 @@ 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}"; \
@@ -4818,81 +4811,6 @@ 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
--- a/Makefile.simple
+++ b/Makefile.simple
@@ -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.51 $$
-# @(#) $Id: Makefile.ship,v 30.51 2013/05/05 13:52:39 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/RCS/Makefile.ship,v $
+MAKEFILE_REV= $$Revision: 30.44 $$
+# @(#) $Id: Makefile.ship,v 30.44 2010/09/02 06:07:07 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/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= -DBIG_ENDIAN
-#CALC_BYTE_ORDER= -DLITTLE_ENDIAN
+#CALC_BYTE_ORDER= -DCALC_BIG_ENDIAN
+#CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN

 # Determine the number of bits in a long
 #
@@ -974,7 +974,7 @@ EXT=

 # The default calc versions
 #
-VERSION= 2.12.4.8
+VERSION= 2.12.4.1
 VERS= 2.12.4
 VER= 2.12
 VE= 2
@@ -3653,14 +3653,9 @@ gdb:
 #
 ###

-rpm: clobber rpm-preclean rpm.mk calc.spec.in
+rpm: clobber rpm.mk calc.spec.in
 	${V} echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
-	${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}"
+	${MAKE} -f rpm.mk V=${V}
 	${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='

 # rpm static rules
@@ -4001,9 +3996,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
@@ -4019,7 +4014,6 @@ 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}"; \
@@ -4038,7 +4032,6 @@ 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}"; \
@@ -4338,81 +4331,6 @@ 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
--- a/2
+++ b/2
@@ -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/bin/calc/RCS/README,v $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/README,v $
 ##
 ## Under source code control:	1995/10/25 05:27:59
 ## File existed as early as:	1995
--- a/README.WINDOWS
+++ b/README.WINDOWS
@@ -144,7 +144,7 @@ the above Makefile list, follow the recommendation in the Makefile.
 ##
 ## @(#) $Revision: 30.2 $
 ## @(#) $Id: README.WINDOWS,v 30.2 2009/03/14 02:29:31 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/RCS/README.WINDOWS,v $
+## @(#) $Source: /usr/local/src/cmd/calc/RCS/README.WINDOWS,v $
 ##
 ## Under source code control:	2001/02/25 14:00:05
 ## File existed as early as:	2001
--- a/addop.c
+++ b/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/bin/calc/RCS/addop.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/addop.c,v $
 *
 * Under source code control:	1990/02/15 01:48:10
 * File existed as early as:	before 1990
--- a/align32.c
+++ b/align32.c
@@ -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/bin/calc/RCS/align32.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/align32.c,v $
 *
 * Under source code control:	1995/11/23 05:18:06
 * File existed as early as:	1995
--- a/alloc.h
+++ b/alloc.h
@@ -19,7 +19,7 @@
 *
 * @(#) $Revision: 30.2 $
 * @(#) $Id: alloc.h,v 30.2 2008/04/15 21:17:57 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/alloc.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
 *
 * Under source code control:	1990/02/15 01:48:29
 * File existed as early as:	before 1990
--- a/assocfunc.c
+++ b/assocfunc.c
@@ -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/bin/calc/RCS/assocfunc.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/assocfunc.c,v $
 *
 * Under source code control:	1993/07/20 23:04:27
 * File existed as early as:	1993
--- a/blkcpy.c
+++ b/blkcpy.c
@@ -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/bin/calc/RCS/blkcpy.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.c,v $
 *
 * Under source code control:	1997/04/18 20:41:26
 * File existed as early as:	1997
--- a/blkcpy.h
+++ b/blkcpy.h
@@ -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/bin/calc/RCS/blkcpy.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/blkcpy.h,v $
 *
 * Under source code control:	1997/04/18 20:41:25
 * File existed as early as:	1997
--- a/block.c
+++ b/block.c
@@ -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/bin/calc/RCS/block.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.c,v $
 *
 * Under source code control:	1997/02/27 00:29:40
 * File existed as early as:	1997
--- a/block.h
+++ b/block.h
@@ -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/bin/calc/RCS/block.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/block.h,v $
 *
 * Under source code control:	1997/02/21 05:03:39
 * File existed as early as:	1997
--- a/byteswap.c
+++ b/byteswap.c
@@ -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/bin/calc/RCS/byteswap.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.c,v $
 *
 * Under source code control:	1995/10/11 04:44:01
 * File existed as early as:	1995
--- a/byteswap.h
+++ b/byteswap.h
@@ -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/bin/calc/RCS/byteswap.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/byteswap.h,v $
 *
 * Under source code control:	1995/10/11 04:44:01
 * File existed as early as:	1995
--- a/cal/Makefile
+++ b/cal/Makefile
@@ -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.5 $
-# @(#) $Id: Makefile,v 30.5 2011/05/23 22:50:18 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/cal/RCS/Makefile,v $
+# @(#) $Revision: 30.4 $
+# @(#) $Id: Makefile,v 30.4 2010/09/02 06:01:39 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
 # File existed as early as:	1991
@@ -194,7 +194,7 @@ CALC_FILES= README bigprime.cal deg.cal ellip.cal lucas.cal lucas_chk.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 \
-	dms.cal hms.cal gvec.cal
+	dms.cal hms.cal

 # These files are found (but not built) in the distribution
 #
--- a/cal/README
+++ b/cal/README
@@ -298,13 +298,6 @@ 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:
@@ -1065,9 +1058,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.3 $
-## @(#) $Id: README,v 30.3 2011/05/23 22:50:32 chongo Exp $
-## @(#) $Source: /usr/local/src/bin/calc/cal/RCS/README,v $
+## @(#) $Revision: 30.2 $
+## @(#) $Id: README,v 30.2 2010/09/02 06:01:39 chongo Exp $
+## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/README,v $
 ##
 ## Under source code control:	1990/02/15 01:50:32
 ## File existed as early as:	before 1990
--- a/cal/alg_config.cal
+++ b/cal/alg_config.cal
@@ -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/bin/calc/cal/RCS/alg_config.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/alg_config.cal,v $
 *
 * Under source code control:	2006/06/07 14:10:11
 * File existed as early as:	2006
--- a/cal/beer.cal
+++ b/cal/beer.cal
@@ -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/bin/calc/cal/RCS/beer.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/beer.cal,v $
 *
 * Under source code control:	1996/11/13 13:21:05
 * File existed as early as:	1996
--- a/cal/bernoulli.cal
+++ b/cal/bernoulli.cal
@@ -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/bin/calc/cal/RCS/bernoulli.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bernoulli.cal,v $
 *
 * Under source code control:	1991/09/30 11:18:41
 * File existed as early as:	1991
--- a/cal/bigprime.cal
+++ b/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/bin/calc/cal/RCS/bigprime.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bigprime.cal,v $
 *
 * Under source code control:	1991/05/22 21:56:32
 * File existed as early as:	1991
--- a/cal/bindings
+++ b/cal/bindings
@@ -18,7 +18,7 @@
 #
 # @(#) $Revision: 30.1 $
 # @(#) $Id: bindings,v 30.1 2007/03/16 11:09:54 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/cal/RCS/bindings,v $
+# @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/bindings,v $
 #
 # Under source code control:	1993/05/02 20:09:19
 # File existed as early as:	1993
--- a/cal/chi.cal
+++ b/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/bin/calc/cal/RCS/chi.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chi.cal,v $
 *
 * Under source code control:	2001/03/27 14:10:11
 * File existed as early as:	2001
--- a/cal/chrem.cal
+++ b/cal/chrem.cal
@@ -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/bin/calc/cal/RCS/chrem.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/chrem.cal,v $
 *
 * Under source code control:	1992/09/26 01:00:47
 * File existed as early as:	1992
--- a/cal/deg.cal
+++ b/cal/deg.cal
@@ -19,7 +19,7 @@
 *
 * @(#) $Revision: 30.2 $
 * @(#) $Id: deg.cal,v 30.2 2010/09/02 06:01:14 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/deg.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/deg.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
--- a/cal/dms.cal
+++ b/cal/dms.cal
@@ -19,7 +19,7 @@
 *
 * @(#) $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 $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/dms.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
--- a/cal/dotest.cal
+++ b/cal/dotest.cal
@@ -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/bin/calc/cal/RCS/dotest.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/dotest.cal,v $
 *
 * This file is not covered under version 2.1 of the GNU LGPL.
 *
--- a/cal/ellip.cal
+++ b/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/bin/calc/cal/RCS/ellip.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/ellip.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:33
 * File existed as early as:	before 1990
--- a/cal/gvec.cal
+++ b/cal/gvec.cal
@@ -1,107 +0,0 @@
-/*
- * 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;
-}
--- a/cal/hello.cal
+++ b/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/bin/calc/cal/RCS/hello.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/hello.cal,v $
 *
 * Under source code control:	1996/11/13 13:25:43
 * File existed as early as:	1996
--- a/cal/hms.cal
+++ b/cal/hms.cal
@@ -19,7 +19,7 @@
 *
 * @(#) $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 $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/hms.cal,v $
 *
 * Under source code control:	2010/09/01 17:14:55
 * File existed as early as:	2010
--- a/cal/intfile.cal
+++ b/cal/intfile.cal
@@ -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/bin/calc/cal/RCS/intfile.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/intfile.cal,v $
 *
 * Under source code control:   2001/03/31 08:13:11
 * File existed as early as:    2001
--- a/cal/linear.cal
+++ b/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/bin/calc/cal/RCS/linear.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/linear.cal,v $
 *
 * Under source code control:	2005/12/12 06:41:50
 * File existed as early as:	2005
--- a/cal/lucas.cal
+++ b/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/bin/calc/cal/RCS/lucas.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas.cal,v $
 *
 * Under source code control:	1990/05/03 16:49:51
 * File existed as early as:	1990
--- a/cal/lucas_chk.cal
+++ b/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/bin/calc/cal/RCS/lucas_chk.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_chk.cal,v $
 *
 * Under source code control:	1991/01/11 05:41:43
 * File existed as early as:	1991
--- a/cal/lucas_tbl.cal
+++ b/cal/lucas_tbl.cal
@@ -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/bin/calc/cal/RCS/lucas_tbl.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/lucas_tbl.cal,v $
 *
 * Under source code control:	1991/01/26 02:43:43
 * File existed as early as:	1991
--- a/cal/mersenne.cal
+++ b/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/bin/calc/cal/RCS/mersenne.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mersenne.cal,v $
 *
 * Under source code control:	1991/05/22 21:56:36
 * File existed as early as:	1991
--- a/cal/mfactor.cal
+++ b/cal/mfactor.cal
@@ -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/bin/calc/cal/RCS/mfactor.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mfactor.cal,v $
 *
 * Under source code control:	1996/07/06 06:09:40
 * File existed as early as:	1996
--- a/cal/mod.cal
+++ b/cal/mod.cal
@@ -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/bin/calc/cal/RCS/mod.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/mod.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:34
 * File existed as early as:	before 1990
--- a/cal/natnumset.cal
+++ b/cal/natnumset.cal
@@ -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/bin/calc/cal/RCS/natnumset.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/natnumset.cal,v $
 *
 * Under source code control:	1997/09/07 23:53:51
 * File existed as early as:	1997
--- a/cal/pell.cal
+++ b/cal/pell.cal
@@ -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/bin/calc/cal/RCS/pell.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pell.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:34
 * File existed as early as:	before 1990
--- a/cal/pi.cal
+++ b/cal/pi.cal
@@ -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/bin/calc/cal/RCS/pi.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pi.cal,v $
 *
 * Under source code control:	1991/05/22 21:56:37
 * File existed as early as:	1991
--- a/cal/pix.cal
+++ b/cal/pix.cal
@@ -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/bin/calc/cal/RCS/pix.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pix.cal,v $
 *
 * Under source code control:	1996/07/09 03:14:14
 * File existed as early as:	1996
--- a/cal/pollard.cal
+++ b/cal/pollard.cal
@@ -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/bin/calc/cal/RCS/pollard.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/pollard.cal,v $
 *
 * Under source code control:	1991/05/22 21:56:37
 * File existed as early as:	1991
--- a/cal/poly.cal
+++ b/cal/poly.cal
@@ -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/bin/calc/cal/RCS/poly.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/poly.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
--- a/cal/prompt.cal
+++ b/cal/prompt.cal
@@ -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/bin/calc/cal/RCS/prompt.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/prompt.cal,v $
 *
 * Under source code control:	1995/12/18 04:43:25
 * File existed as early as:	1995
--- a/cal/psqrt.cal
+++ b/cal/psqrt.cal
@@ -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/bin/calc/cal/RCS/psqrt.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/psqrt.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
--- a/cal/qtime.cal
+++ b/cal/qtime.cal
@@ -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/bin/calc/cal/RCS/qtime.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/qtime.cal,v $
 *
 * Under source code control:	1999/10/13 04:10:33
 * File existed as early as:	1999
--- a/cal/quat.cal
+++ b/cal/quat.cal
@@ -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/bin/calc/cal/RCS/quat.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/quat.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:35
 * File existed as early as:	before 1990
--- a/cal/randbitrun.cal
+++ b/cal/randbitrun.cal
@@ -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/bin/calc/cal/RCS/randbitrun.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randbitrun.cal,v $
 *
 * Under source code control:	1995/02/13 03:43:11
 * File existed as early as:	1995
--- a/cal/randmprime.cal
+++ b/cal/randmprime.cal
@@ -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/bin/calc/cal/RCS/randmprime.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randmprime.cal,v $
 *
 * Under source code control:	1994/03/14 23:11:21
 * File existed as early as:	1994
--- a/cal/randombitrun.cal
+++ b/cal/randombitrun.cal
@@ -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/bin/calc/cal/RCS/randombitrun.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randombitrun.cal,v $
 *
 * Under source code control:	1995/02/13 03:43:11
 * File existed as early as:	1995
--- a/cal/randomrun.cal
+++ b/cal/randomrun.cal
@@ -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/bin/calc/cal/RCS/randomrun.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randomrun.cal,v $
 *
 * Under source code control:	1997/02/19 03:35:59
 * File existed as early as:	1997
--- a/cal/randrun.cal
+++ b/cal/randrun.cal
@@ -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/bin/calc/cal/RCS/randrun.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/randrun.cal,v $
 *
 * Under source code control:	1995/02/12 20:00:06
 * File existed as early as:	1995
--- a/cal/regress.cal
+++ b/cal/regress.cal
@@ -19,7 +19,7 @@
 *
 * @(#) $Revision: 30.6 $
 * @(#) $Id: regress.cal,v 30.6 2010/09/02 06:09:06 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/regress.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/regress.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:36
 * File existed as early as:	before 1990
--- a/cal/repeat.cal
+++ b/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/bin/calc/cal/RCS/repeat.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/repeat.cal,v $
 *
 * Under source code control:	2003/01/05 00:00:01
 * File existed as early as:	2003
--- a/cal/screen.cal
+++ b/cal/screen.cal
@@ -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/bin/calc/cal/RCS/screen.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/screen.cal,v $
 *
 * This file is not covered under version 2.1 of the GNU LGPL.
 *
--- a/cal/seedrandom.cal
+++ b/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/bin/calc/cal/RCS/seedrandom.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/seedrandom.cal,v $
 *
 * Under source code control:	1996/01/01 08:21:00
 * File existed as early as:	1996
--- a/cal/set8700.cal
+++ b/cal/set8700.cal
@@ -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/bin/calc/cal/RCS/set8700.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.cal,v $
 *
 * Under source code control:	2006/05/20 14:10:11
 * File existed as early as:	2006
--- a/cal/set8700.line
+++ b/cal/set8700.line
@@ -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/bin/calc/cal/RCS/set8700.line,v $
+## @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/set8700.line,v $
 ##
 ## Under source code control:	2006/05/20 14:10:11
 ## File existed as early as:	2006
--- a/cal/solve.cal
+++ b/cal/solve.cal
@@ -19,7 +19,7 @@
 *
 * @(#) $Revision: 30.2 $
 * @(#) $Id: solve.cal,v 30.2 2008/05/10 13:30:00 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/cal/RCS/solve.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/solve.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:37
 * File existed as early as:	before 1990
--- a/cal/sumsq.cal
+++ b/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/bin/calc/cal/RCS/sumsq.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumsq.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:37
 * File existed as early as:	before 1990
--- a/cal/sumtimes.cal
+++ b/cal/sumtimes.cal
@@ -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/bin/calc/cal/RCS/sumtimes.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/sumtimes.cal,v $
 *
 * Under source code control:	2006/06/22 17:29
 * File existed as early as:	2006
--- a/cal/surd.cal
+++ b/cal/surd.cal
@@ -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/bin/calc/cal/RCS/surd.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/surd.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:38
 * File existed as early as:	before 1990
--- a/cal/test1700.cal
+++ b/cal/test1700.cal
@@ -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/bin/calc/cal/RCS/test1700.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test1700.cal,v $
 *
 * Under source code control:	1994/03/14 23:12:51
 * File existed as early as:	1994
--- a/cal/test2300.cal
+++ b/cal/test2300.cal
@@ -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/bin/calc/cal/RCS/test2300.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2300.cal,v $
 *
 * Under source code control:	1995/07/09 06:12:13
 * File existed as early as:	1995
--- a/cal/test2600.cal
+++ b/cal/test2600.cal
@@ -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/bin/calc/cal/RCS/test2600.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2600.cal,v $
 *
 * Under source code control:	1995/10/13 00:13:14
 * File existed as early as:	1995
--- a/cal/test2700.cal
+++ b/cal/test2700.cal
@@ -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/bin/calc/cal/RCS/test2700.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test2700.cal,v $
 *
 * Under source code control:	1995/11/01 22:52:25
 * File existed as early as:	1995
--- a/cal/test3100.cal
+++ b/cal/test3100.cal
@@ -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/bin/calc/cal/RCS/test3100.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3100.cal,v $
 *
 * Under source code control:	1995/11/28 11:56:57
 * File existed as early as:	1995
--- a/cal/test3300.cal
+++ b/cal/test3300.cal
@@ -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/bin/calc/cal/RCS/test3300.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3300.cal,v $
 *
 * Under source code control:	1995/12/02 04:27:41
 * File existed as early as:	1995
--- a/cal/test3400.cal
+++ b/cal/test3400.cal
@@ -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/bin/calc/cal/RCS/test3400.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3400.cal,v $
 *
 * Under source code control:	1995/12/02 05:20:11
 * File existed as early as:	1995
--- a/cal/test3500.cal
+++ b/cal/test3500.cal
@@ -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/bin/calc/cal/RCS/test3500.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test3500.cal,v $
 *
 * Under source code control:	1995/12/18 22:50:46
 * File existed as early as:	1995
--- a/cal/test4000.cal
+++ b/cal/test4000.cal
@@ -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/bin/calc/cal/RCS/test4000.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4000.cal,v $
 *
 * Under source code control:	1996/03/13 02:38:45
 * File existed as early as:	1996
--- a/cal/test4100.cal
+++ b/cal/test4100.cal
@@ -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/bin/calc/cal/RCS/test4100.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4100.cal,v $
 *
 * Under source code control:	1996/03/13 03:53:22
 * File existed as early as:	1996
--- a/cal/test4600.cal
+++ b/cal/test4600.cal
@@ -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/bin/calc/cal/RCS/test4600.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test4600.cal,v $
 *
 * Under source code control:	1996/07/02 20:04:40
 * File existed as early as:	1996
--- a/cal/test5100.cal
+++ b/cal/test5100.cal
@@ -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/bin/calc/cal/RCS/test5100.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5100.cal,v $
 *
 * Under source code control:	1996/12/02 23:57:10
 * File existed as early as:	1996
--- a/cal/test5200.cal
+++ b/cal/test5200.cal
@@ -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/bin/calc/cal/RCS/test5200.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test5200.cal,v $
 *
 * Under source code control:	1997/02/07 02:48:10
 * File existed as early as:	1997
--- a/cal/test8400.cal
+++ b/cal/test8400.cal
@@ -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/bin/calc/cal/RCS/test8400.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8400.cal,v $
 *
 * Under source code control:	1999/10/31 01:00:03
 * File existed as early as:	1999
--- a/cal/test8500.cal
+++ b/cal/test8500.cal
@@ -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/bin/calc/cal/RCS/test8500.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8500.cal,v $
 *
 * Under source code control:	1999/11/12 20:59:59
 * File existed as early as:	1999
--- a/cal/test8600.cal
+++ b/cal/test8600.cal
@@ -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/bin/calc/cal/RCS/test8600.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/test8600.cal,v $
 *
 * Under source code control:	2000/12/04 19:57:02
 * File existed as early as:	2000
--- a/cal/unitfrac.cal
+++ b/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/bin/calc/cal/RCS/unitfrac.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/unitfrac.cal,v $
 *
 * Under source code control:	1990/02/15 01:50:38
 * File existed as early as:	before 1990
--- a/cal/varargs.cal
+++ b/cal/varargs.cal
@@ -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/bin/calc/cal/RCS/varargs.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/varargs.cal,v $
 *
 * Under source code control:	1991/05/22 21:56:34
 * File existed as early as:	1991
--- a/cal/xx_print.cal
+++ b/cal/xx_print.cal
@@ -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/bin/calc/cal/RCS/xx_print.cal,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/xx_print.cal,v $
 *
 * Under source code control:	1997/04/17 00:08:50
 * File existed as early as:	1997
--- a/calc.c
+++ b/calc.c
@@ -1,7 +1,7 @@
 /*
 * calc - arbitrary precision calculator
 *
- * Copyright (C) 1999-2013  David I. Bell, Landon Curt Noll and Ernest Bowen
+ * Copyright (C) 1999-2007  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.6 $
- * @(#) $Id: calc.c,v 30.6 2013/03/25 21:39:57 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/calc.c,v $
+ * @(#) $Revision: 30.4 $
+ * @(#) $Id: calc.c,v 30.4 2008/04/15 21:17:57 chongo Exp $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.c,v $
 *
 * Under source code control:	1990/02/15 01:48:11
 * File existed as early as:	before 1990
@@ -487,9 +487,6 @@ 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;
--- a/calc.h
+++ b/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/bin/calc/RCS/calc.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
 *
 * Under source code control:	1990/02/15 01:48:31
 * File existed as early as:	before 1990
--- a/calc.man
+++ b/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/bin/calc/RCS/calc.man,v $
+.\" @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.man,v $
 .\"
 .\" Under source code control:	    1991/07/23 05:48:26
 .\" File existed as early as:	    1991
--- a/calc.spec.in
+++ b/calc.spec.in
@@ -2,7 +2,7 @@
 #
 # calc.spec.in - template specfile for calc
 #
-# Copyright (C) 2003-2013  Petteri Kettunen and Landon Curt Noll
+# Copyright (C) 2003-2007  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.10 $
-# @(#) $Id: calc.spec.in,v 30.10 2013/05/05 11:57:44 chongo Exp $
-# @(#) $Source: /usr/local/src/bin/calc/RCS/calc.spec.in,v $
+# @(#) $Revision: 30.6 $
+# @(#) $Id: calc.spec.in,v 30.6 2007/10/16 12:22:22 chongo Exp $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
 #
 # Under source code control:	2003/02/16 20:21:39
 # File existed as early as:	2003
@@ -37,16 +37,14 @@
 Summary: Arbitrary precision calculator.
 Name: calc
 Version: <<<PROJECT_VERSION>>>
-Release: 10
+Release: 1.1
 License: LGPL
 Group: Applications/Engineering
-Source: http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
 URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
-Vendor: Landon Noll and Associates
-Packager: Landon Noll and Associates (http://www.isthe.com/chongo/index.html)
-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
+Requires: ncurses >= 5.2-26, readline >= 4.2, less >= 358
+BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
+BuildRoot: %{_tmppath}/%{name}-root

 %description
 Calc is arbitrary precision C-like arithmetic system that is a
@@ -60,8 +58,8 @@ For the latest calc release, see the calc project home page:

 %package devel
 Summary: Development files and documentation for calc.
-Group: Applications/Engineering
-Requires: calc = %{version}-%{release}
+Group: Development/Libraries
+PreReq: %{name} = %{version}-%{release}

 %description devel
 This package contains the header files and static libraries for developing
@@ -72,46 +70,46 @@ For the latest calc release, see the project home page:
    http://www.isthe.com/chongo/tech/comp/calc/index.html

 %prep
-%setup -T -b 0
+%setup -q

 %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 -=-'
-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
+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)
@@ -126,10 +124,8 @@ 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
-%attr(644, root, root) %{_libdir}/libcalc.so.*
-%attr(644, root, root) %{_libdir}/libcustcalc.so
-%attr(644, root, root) %{_libdir}/libcustcalc.so.*
+%attr(644, root, root) %{_libdir}/libcalc.so.%{version}
+%attr(644, root, root) %{_libdir}/libcustcalc.so.%{version}

 %files devel
 %defattr(-, root, root)
@@ -140,49 +136,28 @@ rm -rf %{_buildroot}
 %attr(644, root, root) %{_libdir}/libcustcalc.a

 %changelog
-* Sat May 05 2013 Landon Curt Noll http://www.isthe.com/chongo
- Release: 10
- Major bug rpm build process bug fix
- Source: is a URL as per rpm requirements
- 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
- Fixed use of %{_buildroot}
- 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
- Release: 9 (was 1.1)
- Removed deprecated PreReq for calc-devel, using Requires
 * Sun Sep 01 2007 Landon Curt Noll http://www.isthe.com/chongo
- Release: 8
 - Release of calc-2.12.2
 - Calc builds with shared libraries
 * Sun Jun 25 2006 Landon Curt Noll http://www.isthe.com/chongo
- Release: 7
 - Changed Copyright to License as per new rpm v4.4 syntax
 * Sun May 20 2006 Landon Curt Noll http://www.isthe.com/chongo
- Release: 6
 - Release of calc-2.12.0
 - Added *.line set files to the list of packaged files
 * Sun Dec 11 2005 Landon Curt Noll http://www.isthe.com/chongo
- Release: 5
 - Release of calc-2.11.11
 - Fixed description in spec file
 * Wed Feb 26 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 4
 - Release of calc-2.11.7-2
 - Fixed attributes on include and lib calc-devel files
 - Added BUGS to calc-devel as well as calc
 * Tue Feb 25 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 3
 - Release of calc-2.11.7-1
 - Require ncurses, readline and less to install.
 - Require ncurses-devel and readline-devel to build.
 * Tue Feb 18 2003 Landon Curt Noll http://www.isthe.com/chongo
- Release: 2
 - Misc changes to fit local directory setup
 * Sun Feb 16 2003 Petteri Kettunen <petterik@users.sourceforge.net>
- Release: 1
 - initial RPM build

 #****
--- a/calcerr.tbl
+++ b/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/bin/calc/RCS/calcerr.tbl,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr.tbl,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996
--- a/calcerr_c.awk
+++ b/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/bin/calc/RCS/calcerr_c.awk,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_c.awk,v $
 #
 # Under source code control:	1996/05/24 03:15:35
 # File existed as early as:	1996
--- a/calcerr_c.sed
+++ b/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/bin/calc/RCS/calcerr_c.sed,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_c.sed,v $
 #
 # Under source code control:	1996/05/24 03:15:35
 # File existed as early as:	1996
--- a/calcerr_h.awk
+++ b/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/bin/calc/RCS/calcerr_h.awk,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_h.awk,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996
--- a/calcerr_h.sed
+++ b/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/bin/calc/RCS/calcerr_h.sed,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/calcerr_h.sed,v $
 #
 # Under source code control:	1996/05/23 17:38:44
 # File existed as early as:	1996
--- a/check.awk
+++ b/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/bin/calc/RCS/check.awk,v $
+# @(#) $Source: /usr/local/src/cmd/calc/RCS/check.awk,v $
 #
 # Under source code control:	1996/05/25 22:07:58
 # File existed as early as:	1996
--- a/cmath.h
+++ b/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/bin/calc/RCS/cmath.h,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/cmath.h,v $
 *
 * Under source code control:	1993/07/30 19:42:45
 * File existed as early as:	1993
--- a/codegen.c
+++ b/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/bin/calc/RCS/codegen.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/codegen.c,v $
 *
 * Under source code control:	1990/02/15 01:48:13
 * File existed as early as:	before 1990
--- a/comfunc.c
+++ b/comfunc.c
@@ -21,7 +21,7 @@
 *
 * @(#) $Revision: 30.3 $
 * @(#) $Id: comfunc.c,v 30.3 2008/10/24 07:09:41 chongo Exp $
- * @(#) $Source: /usr/local/src/bin/calc/RCS/comfunc.c,v $
+ * @(#) $Source: /usr/local/src/cmd/calc/RCS/comfunc.c,v $
 *
 * Under source code control:	1990/02/15 01:48:13
 * File existed as early as:	before 1990
--- a/Show More
+++ b/Show More