Release calc version 2.12.0.6

CHANGES

@@ -361,6 +361,12 @@ The following are the changes from calc version 2.12.0 to date:
     only for that call.  Now quomod() is in line with quo() and mod()
     in that the final augument is an optional rounding mode.
 
+    Added a "make uninstall" rule which will attempt to remove everything
+    that was installed by a "make install".
+
+    Changed the "Copyright" line in the rpm spec file to a "License" line
+    as per new rpm v4.4 syntax.
+
 
 The following are the changes from calc version 2.11.10.1 to 2.11.11:
 
@@ -6181,8 +6187,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.83 $
+## @(#) $Revision: 29.84 $
-## @(#) $Id: CHANGES,v 29.83 2006/06/25 22:58:54 chongo Exp $
+## @(#) $Id: CHANGES,v 29.84 2006/06/26 05:53:25 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57

Makefile

@@ -32,8 +32,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.75 $$
+MAKEFILE_REV= $$Revision: 29.76 $$
-# @(#) $Id: Makefile.ship,v 29.75 2006/05/19 13:54:05 chongo Exp $
+# @(#) $Id: Makefile.ship,v 29.76 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -3543,6 +3543,10 @@ clobber:
 	-rm -rf win32
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
 	-${Q}if [ ! -z "$T" ]; then \
@@ -3744,6 +3748,96 @@ install: calc libcalc.a ${LIB_H_SRC} ${BUILD_H_SRC} calc.1
 	fi
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	${V} echo '=-=-=-=-= start of $@ rule =-=-=-=-='
+	-${Q}if [ -z "${CATDIR}" ]; then \
+	    true; \
+	else \
+	    if [ -f "$T${CATDIR}/calc.${CATEXT}" ]; then \
+		rm -f "$T${CATDIR}/calc.${CATEXT}"; \
+		if [ -f "$T${CATDIR}/calc.${CATEXT}" ]; then \
+		    echo "cannot uninstall $T${CATDIR}/calc.${CATEXT}"; \
+		else \
+		    echo "uninstalled $T${CATDIR}/calc.${CATEXT}"; \
+		fi; \
+	    fi; \
+	fi
+	-${Q}if [ -z "${MANDIR}" ]; then \
+	    true; \
+	else \
+	    if [ -f "$T${MANDIR}/calc.${MANEXT}" ]; then \
+		rm -f "$T${MANDIR}/calc.${MANEXT}"; \
+		if [ -f "$T${MANDIR}/calc.${MANEXT}" ]; then \
+		    echo "cannot uninstall $T${MANDIR}/calc.${MANEXT}"; \
+		else \
+		    echo "uninstalled $T${MANDIR}/calc.${MANEXT}"; \
+		fi; \
+	    fi; \
+	fi
+	-${Q}for i in ${BUILD_H_SRC} ${LIB_H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${CALC_INCDIR}/$$i" ]; then \
+		rm -f "$T${CALC_INCDIR}/$$i"; \
+		if [ -f "$T${CALC_INCDIR}/$$i" ]; then \
+		    echo "cannot uninstall $T${CALC_INCDIR}/$$i"; \
+		else \
+		    echo "uninstalled $T${CALC_INCDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}if [ -f "$T${LIBDIR}/libcalc.a" ]; then \
+	    rm -f "$T${LIBDIR}/libcalc.a"; \
+	    if [ -f "$T${LIBDIR}/libcalc.a" ]; then \
+		echo "cannot uninstall $T${LIBDIR}/libcalc.a"; \
+	    else \
+		echo "uninstalled $T${LIBDIR}/libcalc.a"; \
+	    fi; \
+	fi
+	${V} echo '=-=-=-=-= Invoking $@ rule for cscript =-=-=-=-='
+	${Q}cd cscript; ${MAKE} -f Makefile ${CSCRIPT_PASSDOWN} uninstall
+	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${V} echo '=-=-=-=-= Invoking $@ rule for sample =-=-=-=-='
+	${Q}cd sample; ${MAKE} -f Makefile ${SAMPLE_PASSDOWN} uninstall
+	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${V} echo '=-=-=-=-= Invoking $@ rule for custom =-=-=-=-='
+	${Q}cd custom; ${MAKE} -f Makefile ${CUSTOM_PASSDOWN} uninstall
+	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${V} echo '=-=-=-=-= Invoking $@ rule for cal =-=-=-=-='
+	${Q}cd cal; ${MAKE} -f Makefile ${CAL_PASSDOWN} uninstall
+	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	${V} echo '=-=-=-=-= Invoking $@ rule for help =-=-=-=-='
+	${Q}cd help; ${MAKE} -f Makefile ${HELP_PASSDOWN} uninstall
+	${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
+	-${Q}if [ -f "$T${BINDIR}/calc${EXT}" ]; then \
+	    rm -f "$T${BINDIR}/calc${EXT}"; \
+	    if [ -f "$T${BINDIR}/calc${EXT}" ]; then \
+		echo "cannot uninstall $T${BINDIR}/calc${EXT}"; \
+	    else \
+		echo "uninstalled $T${BINDIR}/calc${EXT}"; \
+	    fi; \
+	fi
+	-${Q}for i in ${CATDIR} ${MANDIR} ${SCRIPTDIR} \
+		    ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
+		    ${CALC_INCDIR} ${LIBDIR} ${INCDIR} ${BINDIR}; do \
+	    if [ -d "$T$$i" ]; then \
+		rmdir "$T$$i" 2>/dev/null; \
+		echo "cleaned up $T$$i"; \
+	    fi; \
+	done
+	-${Q}if [ ! -z "$T" ]; then \
+	    if [ -d "$T" ]; then \
+		rmdir "$T" 2>/dev/null; \
+		echo "cleaned up $T"; \
+	    fi; \
+	 fi
+	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
+
 # splint - A tool for statically checking C programs
 #
 splint: #hsrc

cal/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.20 $
+# @(#) $Revision: 29.21 $
-# @(#) $Id: Makefile,v 29.20 2006/06/23 00:34:55 chongo Exp $
+# @(#) $Id: Makefile,v 29.21 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cal/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/21 05:00:54
@@ -249,6 +249,10 @@ clean:
 clobber:
 	rm -f .all
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
 	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
 	    echo mkdir $T${CALC_SHAREDIR}; \
@@ -276,3 +280,28 @@ install: all
 		echo "installed $T${CALC_SHAREDIR}/$$i"; \
 	    fi; \
 	done
+
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q}for i in ${CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${CALC_SHAREDIR}/$$i" ]; then \
+	    	rm -f "$T${CALC_SHAREDIR}/$$i"; \
+		if [ -f "$T${CALC_SHAREDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${CALC_SHAREDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${CALC_SHAREDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${CALC_SHAREDIR}; do \
+	    if [ -d "$T$$i" ]; then \
+		rmdir "$T$$i" 2>/dev/null; \
+		echo "cleaned up $T$$i"; \
+	    fi; \
+	done

calc.spec.in

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.15 $
+# @(#) $Revision: 29.16 $
-# @(#) $Id: calc.spec.in,v 29.15 2006/05/21 06:26:00 chongo Exp $
+# @(#) $Id: calc.spec.in,v 29.16 2006/06/26 05:50:44 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.spec.in,v $
 #
 # Under source code control:	2003/02/16 20:21:39
@@ -38,7 +38,7 @@ Summary: Arbitrary precision calculator.
 Name: calc
 Version: <<<PROJECT_VERSION>>>
 Release: 0
-Copyright: LGPL
+License: LGPL
 Group: Applications/Engineering
 Source: %{name}-%{version}.tar.gz
 URL: http://www.isthe.com/chongo/tech/comp/calc/index.html
@@ -101,6 +101,8 @@ rm -rf %{buildroot}
 %attr(644, root, root) %{_libdir}/*.a
 
 %changelog
+* Sun Jun 25 2006 Landon Curt Noll http://www.isthe.com/chongo
+- Changed Copyright to License as per new rpm v4.4 syntax
 * Sun May 20 2006 Landon Curt Noll http://www.isthe.com/chongo
 - Release of calc-2.12.0
 - Added *.line set files to the list of packaged files

cscript/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.23 $
+# @(#) $Revision: 29.24 $
-# @(#) $Id: Makefile,v 29.23 2003/01/14 01:58:18 chongo Exp $
+# @(#) $Id: Makefile,v 29.24 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/cscript/RCS/Makefile,v $
 #
 # Under source code control:	1999/11/29 11:10:26
@@ -349,6 +349,10 @@ clean:
 clobber:
 	-rm -f ${TARGETS}
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
 	-${Q}if [ ! -d $T${BINDIR} ]; then \
 	    echo mkdir $T${BINDIR}; \
@@ -389,6 +393,31 @@ install: all
 	    fi; \
 	done
 
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q}for i in ${SCRIPT} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${SCRIPTDIR}/$$i" ]; then \
+	    	rm -f "$T${SCRIPTDIR}/$$i"; \
+		if [ -f "$T${SCRIPTDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${SCRIPTDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${SCRIPTDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${SCRIPTDIR} ${BINDIR}; do \
+	    if [ -d "$T$$i" ]; then \
+		rmdir "$T$$i" 2>/dev/null; \
+		echo "cleaned up $T$$i"; \
+	    fi; \
+	done
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 4dsphere: 4dsphere.calc

custom/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.24 $
+# @(#) $Revision: 29.25 $
-# @(#) $Id: Makefile,v 29.24 2004/07/29 08:38:18 chongo Exp $
+# @(#) $Id: Makefile,v 29.25 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -599,6 +599,10 @@ clobber:
 	-rm -f ${TARGETS}
 	rm -f .all Makefile.tmp Makefile.bak
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
 	-${Q}if [ ! -d $T${INCDIR} ]; then \
 	    echo mkdir $T${INCDIR}; \
@@ -688,7 +692,7 @@ install: all
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
 	    fi; \
-	    if ${CMP} -s tmp $T${CUSTOMINCDIR}/$$i; then \
+	    if ${CMP} -s "$$i" $T${CUSTOMINCDIR}/$$i; then \
 		true; \
 	    else \
 		rm -f $T${CUSTOMINCDIR}/$$i.new; \
@@ -698,7 +702,6 @@ install: all
 		echo "installed $T${CUSTOMINCDIR}/$$i"; \
 	    fi; \
 	done
-	-${Q}rm -f tmp
 	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
 	    if [ "$$i" = "/dev/null" ]; then \
 		continue; \
@@ -741,6 +744,66 @@ install: all
 	    fi; \
 	fi
 
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q}if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+	    rm -f "$T${CUSTOMCALDIR}/libcustcalc.a"; \
+	    if [ -f "$T${CUSTOMCALDIR}/libcustcalc.a" ]; then \
+		echo "cannot uninstall $T${CUSTOMCALDIR}/libcustcalc.a"; \
+	    else \
+		echo "uninstalled $T${CUSTOMCALDIR}/libcustcalc.a"; \
+	    fi; \
+	fi
+	-${Q}for i in ${CUSTOM_HELP} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${CUSTOMHELPDIR}/$$i" ]; then \
+	    	rm -f "$T${CUSTOMHELPDIR}/$$i"; \
+		if [ -f "$T${CUSTOMHELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${CUSTOMHELPDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${CUSTOMHELPDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${CUSTOM_CALC_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${CUSTOMCALDIR}/$$i" ]; then \
+	    	rm -f "$T${CUSTOMCALDIR}/$$i"; \
+		if [ -f "$T${CUSTOMCALDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${CUSTOMCALDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${CUSTOMCALDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${INSTALL_H_SRC} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${CUSTOMINCDIR}/$$i" ]; then \
+	    	rm -f "$T${CUSTOMINCDIR}/$$i"; \
+		if [ -f "$T${CUSTOMINCDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${CUSTOMINCDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${CUSTOMINCDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${CUSTOMINCDIR} ${CUSTOMHELPDIR} ${CUSTOMCALDIR} \
+		    ${HELPDIR} ${CALC_INCDIR} ${CALC_SHAREDIR} ${INCDIR}; do \
+	    if [ -d "$T$$i" ]; then \
+		rmdir "$T$$i" 2>/dev/null; \
+		echo "cleaned up $T$$i"; \
+	    fi; \
+	done
+
 ##
 #
 # make depend stuff

help/Makefile

@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.28 $
+# @(#) $Revision: 29.29 $
-# @(#) $Id: Makefile,v 29.28 2006/05/07 12:59:51 chongo Exp $
+# @(#) $Id: Makefile,v 29.29 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/help/RCS/Makefile,v $
 #
 # Under source code control:	1991/07/23 06:47:57
@@ -656,6 +656,10 @@ clobber:
 	rm -f COPYING COPYING-LGPL
 	rm -f ${SINGULAR_FILES} ${DETAIL_CLONE}
 
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
 install: all
 	-${Q}if [ ! -d $T${CALC_SHAREDIR} ]; then \
 	    echo mkdir $T${CALC_SHAREDIR}; \
@@ -705,3 +709,37 @@ install: all
 	    mv -f $T${HELPDIR}/obj.new $T${HELPDIR}/obj; \
 	    echo "installed $T${HELPDIR}/obj"; \
 	fi
+
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+uninstall:
+	-${Q}if [ -f "$T${HELPDIR}/obj" ]; then \
+	    rm -f "$T${HELPDIR}/obj"; \
+	    if [ -f "$T${HELPDIR}/obj" ]; then \
+		echo "cannot uninstall $T${HELPDIR}/obj"; \
+	    else \
+		echo "uninstalled $T${HELPDIR}/obj"; \
+	    fi; \
+	fi
+	-${Q}for i in ${SINGULAR_FILES} ${DETAIL_HELP} full builtin \
+	    ${BLT_HELP_FILES} ${STD_HELP_FILES} /dev/null; do \
+	    if [ "$$i" = "/dev/null" ]; then \
+		continue; \
+	    fi; \
+	    if [ -f "$T${HELPDIR}/$$i" ]; then \
+	    	rm -f "$T${HELPDIR}/$$i"; \
+		if [ -f "$T${HELPDIR}/$$i" ]; then \
+		   echo "cannot uninstall $T${HELPDIR}/$$i"; \
+		else \
+		   echo "uninstalled $T${HELPDIR}/$$i"; \
+		fi; \
+	    fi; \
+	done
+	-${Q}for i in ${HELPDIR} ${CALC_SHAREDIR}; do \
+	    if [ -d "$T$$i" ]; then \
+		rmdir "$T$$i" 2>/dev/null; \
+		echo "cleaned up $T$$i"; \
+	    fi; \
+	done

sample/Makefile

@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.17 $
+# @(#) $Revision: 29.18 $
-# @(#) $Id: Makefile,v 29.17 2003/01/14 02:00:23 chongo Exp $
+# @(#) $Id: Makefile,v 29.18 2006/06/26 05:46:06 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -558,11 +558,24 @@ clobber:
 	-rm -f ${TARGETS}
 	rm -f .all Makefile.tmp sample
 
-# for right now we will not install anything
+# install everything
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+# NOTE: for right now we will not install anything
 #
 install: all
 	@true
 
+# Try to remove everything that was installed
+#
+# NOTE: Keep the uninstall rule in reverse order to the install rule
+#
+# NOTE: nothing installed, nothing to uninstall
+#
+uninstall:
+	@true
+
 ##
 #
 # make depend stuff

version.c

@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.62 $
+ * @(#) $Revision: 29.63 $
- * @(#) $Id: version.c,v 29.62 2006/06/25 22:59:16 chongo Exp $
+ * @(#) $Id: version.c,v 29.63 2006/06/26 05:53:25 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -48,7 +48,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	0	/* patch level or 0 if no patch */
-#define MINOR_PATCH	5	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	6	/* test number or 0 if no minor patch */
 
 
 /*