update to 2.12.0.6

too many changes and additions to list here, see the CHANGELOG file

4 files changed, 33 insertions, 34 deletions

diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index f85b8218c10..e65c21dd766 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/03/04 21:30:03 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/04 16:19:28 drochner Exp $
 #
 
-DISTNAME=	calc-2.11.10.1
+DISTNAME=	calc-2.12.0.6
 PKGNAME=	capc-${DISTNAME:S/t/./}
-PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.isthe.com/chongo/src/calc/ \
 		http://prdownloads.sourceforge.net/calc/
diff --git a/math/capc-calc/PLIST b/math/capc-calc/PLIST
index e50862c0999..b50840b6bd3 100644
--- a/math/capc-calc/PLIST
+++ b/math/capc-calc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/21 00:10:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/07/04 16:19:28 drochner Exp $
 bin/calc
 bin/cscript/4dsphere
 bin/cscript/fproduct
@@ -72,6 +72,7 @@ include/calc/zrandom.h
 lib/libcalc.a
 man/man1/calc.1
 share/calc/README
+share/calc/alg_config.cal
 share/calc/beer.cal
 share/calc/bernoulli.cal
 share/calc/bigprime.cal
@@ -90,6 +91,7 @@ share/calc/custom/libcustcalc.a
 share/calc/custom/pmodm127.cal
 share/calc/custom/pzasusb8.cal
 share/calc/deg.cal
+share/calc/dotest.cal
 share/calc/ellip.cal
 share/calc/hello.cal
 share/calc/help/COPYING
@@ -203,6 +205,7 @@ share/calc/help/files
 share/calc/help/floor
 share/calc/help/fopen
 share/calc/help/forall
+share/calc/help/fpathopen
 share/calc/help/fprintf
 share/calc/help/fputc
 share/calc/help/fputs
@@ -284,6 +287,7 @@ share/calc/help/lfactor
 share/calc/help/libcalc
 share/calc/help/list
 share/calc/help/ln
+share/calc/help/log
 share/calc/help/lowbit
 share/calc/help/ltol
 share/calc/help/makelist
@@ -388,14 +392,19 @@ share/calc/help/ssq
 share/calc/help/statement
 share/calc/help/str
 share/calc/help/strcat
+share/calc/help/strcmp
+share/calc/help/strcpy
 share/calc/help/strerror
 share/calc/help/strlen
+share/calc/help/strncmp
+share/calc/help/strncpy
 share/calc/help/strpos
 share/calc/help/strprintf
 share/calc/help/strscan
 share/calc/help/strscanf
 share/calc/help/substr
 share/calc/help/sum
+share/calc/sumtimes.cal
 share/calc/help/swap
 share/calc/help/system
 share/calc/help/tail
@@ -414,6 +423,7 @@ share/calc/help/version
 share/calc/help/wishlist
 share/calc/help/xor
 share/calc/intfile.cal
+share/calc/linear.cal
 share/calc/lucas.cal
 share/calc/lucas_chk.cal
 share/calc/lucas_tbl.cal
@@ -437,7 +447,10 @@ share/calc/randomrun.cal
 share/calc/randrun.cal
 share/calc/regress.cal
 share/calc/repeat.cal
+share/calc/screen.cal
 share/calc/seedrandom.cal
+share/calc/set8700.cal
+share/calc/set8700.line
 share/calc/solve.cal
 share/calc/sumsq.cal
 share/calc/surd.cal
diff --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo
index 4c72134d340..e33c9eee1a7 100644
--- a/math/capc-calc/distinfo
+++ b/math/capc-calc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2005/02/23 12:06:54 agc Exp $
+$NetBSD: distinfo,v 1.15 2006/07/04 16:19:28 drochner Exp $
 
-SHA1 (calc-2.11.10.1.tar.gz) = e3ea5e7f9375c88eedaabb1e4f530453cb0dc976
-RMD160 (calc-2.11.10.1.tar.gz) = 03da57108be8442eaae3a5638126ee70ec5b6926
-Size (calc-2.11.10.1.tar.gz) = 975250 bytes
-SHA1 (patch-aa) = c3a844e295831e9d034774435c820c7ce4fdba37
+SHA1 (calc-2.12.0.6.tar.gz) = e5a3c3a5a88ab1e06470ccc1f363564fde349da1
+RMD160 (calc-2.12.0.6.tar.gz) = 6bf14d1f3f6c8e72f504f3fd9340d6875404322a
+Size (calc-2.12.0.6.tar.gz) = 1015576 bytes
+SHA1 (patch-aa) = a23c0d11319f28d1de6d3c8d08330284d91772c6
diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa
index 7b8ecafc717..3dba3c781e3 100644
--- a/math/capc-calc/patches/patch-aa
+++ b/math/capc-calc/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
+$NetBSD: patch-aa,v 1.6 2006/07/04 16:19:28 drochner Exp $
 
---- Makefile.orig	2004-02-23 05:57:13.000000000 -0500
-+++ Makefile	2004-06-02 17:01:16.000000000 -0400
-@@ -594,7 +594,7 @@
+--- Makefile.orig	2006-05-19 16:00:01.000000000 +0200
++++ Makefile
+@@ -571,7 +571,7 @@ HAVE_UNUSED=
  
  #INCDIR= /usr/local/include
  #INCDIR= /dev/env/DJDIR/include
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  
  # Where to install calc realted things
  #
-@@ -621,15 +621,15 @@
+@@ -598,15 +598,15 @@ INCDIR= /usr/include
  #
  #BINDIR= /usr/local/bin
  #BINDIR= /dev/env/DJDIR/bin
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  
  #CALC_INCDIR= /usr/local/include/calc
  #CALC_INCDIR= /dev/env/DJDIR/include/calc
-@@ -703,7 +703,7 @@
+@@ -680,7 +680,7 @@ T=
  #MANDIR=
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #MANDIR= /dev/env/DJDIR/man/man1
  #MANDIR= /usr/man/u_man/man1
  #MANDIR= /usr/contrib/man/man1
-@@ -714,7 +714,7 @@
+@@ -691,7 +691,7 @@ MANDIR= /usr/share/man/man1
  #
  # Use CATDIR= to disable installation of the calc cat (formatted) page.
  #
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #CATDIR= /usr/local/man/cat1
  #CATDIR= /usr/local/catman/cat1
  #CATDIR= /usr/man/cat1
-@@ -735,9 +735,9 @@
+@@ -712,9 +712,9 @@ MANEXT= 1
  #
  # This is ignored if CATDIR is empty.
  #
@@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #CATEXT= l
  
  # how to format a man page
-@@ -763,8 +763,8 @@
+@@ -740,8 +740,8 @@ CATEXT= 1
  # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
  # lines below.
  #
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #NROFF= groff
  NROFF_ARG= -man
  #NROFF_ARG= -mandoc
-@@ -808,10 +808,10 @@
+@@ -785,10 +785,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
  #
  # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
  #
@@ -85,20 +85,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #READLINE_LIB= -lreadline -lhistory -lncurses
  #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
  #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
-@@ -824,10 +824,10 @@
- #
- # Select CALCPAGER= less.exe -ci for DJGPP.
- #
--CALCPAGER= more
-+#CALCPAGER= more
- #CALCPAGER= pg
- #CALCPAGER= cat
--#CALCPAGER= less
-+CALCPAGER= less
- #CALCPAGER= less.exe -ci
- 
- # Debug/Optimize options for ${CC} and ${LCC}
-@@ -852,7 +852,7 @@
+@@ -834,7 +834,7 @@ CALCPAGER= less
  #
  #DEBUG= -O3
  #DEBUG= -O3 -g
@@ -107,7 +94,7 @@ $NetBSD: patch-aa,v 1.5 2004/06/02 21:08:33 jschauma Exp $
  #DEBUG= -O3 -ipa
  #DEBUG= -O3 -g3 -ipa
  #
-@@ -1008,10 +1008,10 @@
+@@ -1007,10 +1007,10 @@ CCWERR=
  CCOPT= ${DEBUG} ${NO_SHARED}
  CCMISC=
  #