4 files changed, 471 insertions, 444 deletions
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index bac00d83710..fbe292cca39 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2002/10/25 18:38:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/03 20:35:29 wiz Exp $
 #
 
-DISTNAME=	calc-2.11.4t2
+DISTNAME=	calc-2.11.6
 PKGNAME=	capc-${DISTNAME:S/t/./}
 CATEGORIES=	math
 MASTER_SITES=	http://www.isthe.com/chongo/src/calc/ \
-		ftp://ftp.batnet.com/wombats/noll/ftp/pub/calc/
+		http://prdownloads.sourceforge.net/calc/
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.isthe.com/chongo/tech/comp/calc/
diff --git a/math/capc-calc/PLIST b/math/capc-calc/PLIST
index b30255819e2..0355551a6b3 100644
--- a/math/capc-calc/PLIST
+++ b/math/capc-calc/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:12:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/03 20:35:29 wiz Exp $
 bin/calc
+bin/cscript/4dsphere
+bin/cscript/fproduct
 bin/cscript/mersenne
 bin/cscript/piforever
 bin/cscript/plus
+bin/cscript/powerterm
 bin/cscript/simple
 bin/cscript/square
 include/calc/align32.h
@@ -62,396 +65,402 @@ include/calc/symbol.h
 include/calc/terminal.h
 include/calc/token.h
 include/calc/value.h
+include/calc/win32dll.h
 include/calc/zmath.h
 include/calc/zrand.h
 include/calc/zrandom.h
-lib/calc/README
-lib/calc/beer.cal
-lib/calc/bernoulli.cal
-lib/calc/bigprime.cal
-lib/calc/bindings
-lib/calc/chrem.cal
-lib/calc/custom/argv.cal
-lib/calc/custom/halflen.cal
-lib/calc/custom/libcustcalc.a
-lib/calc/custom/pzasusb8.cal
-lib/calc/deg.cal
-lib/calc/ellip.cal
-lib/calc/hello.cal
-lib/calc/help/COPYING
-lib/calc/help/COPYING-LGPL
-lib/calc/help/abs
-lib/calc/help/access
-lib/calc/help/acos
-lib/calc/help/acosh
-lib/calc/help/acot
-lib/calc/help/acoth
-lib/calc/help/acsc
-lib/calc/help/acsch
-lib/calc/help/address
-lib/calc/help/agd
-lib/calc/help/append
-lib/calc/help/appr
-lib/calc/help/archive
-lib/calc/help/arg
-lib/calc/help/argv
-lib/calc/help/arrow
-lib/calc/help/asec
-lib/calc/help/asech
-lib/calc/help/asin
-lib/calc/help/asinh
-lib/calc/help/assign
-lib/calc/help/assoc
-lib/calc/help/atan
-lib/calc/help/atan2
-lib/calc/help/atanh
-lib/calc/help/avg
-lib/calc/help/base
-lib/calc/help/bernoulli
-lib/calc/help/binding
-lib/calc/help/bindings
-lib/calc/help/bit
-lib/calc/help/blk
-lib/calc/help/blkcpy
-lib/calc/help/blkfree
-lib/calc/help/blocks
-lib/calc/help/bround
-lib/calc/help/btrunc
-lib/calc/help/bug
-lib/calc/help/bugs
-lib/calc/help/builtin
-lib/calc/help/calc_tty
-lib/calc/help/calclevel
-lib/calc/help/catalan
-lib/calc/help/ceil
-lib/calc/help/cfappr
-lib/calc/help/cfsim
-lib/calc/help/change
-lib/calc/help/changes
-lib/calc/help/char
-lib/calc/help/cmdbuf
-lib/calc/help/cmp
-lib/calc/help/comb
-lib/calc/help/command
-lib/calc/help/config
-lib/calc/help/conj
-lib/calc/help/contrib
-lib/calc/help/cos
-lib/calc/help/cosh
-lib/calc/help/cot
-lib/calc/help/coth
-lib/calc/help/count
-lib/calc/help/cp
-lib/calc/help/credit
-lib/calc/help/csc
-lib/calc/help/csch
-lib/calc/help/cscript
-lib/calc/help/ctime
-lib/calc/help/custhelp/argv
-lib/calc/help/custhelp/devnull
-lib/calc/help/custhelp/help
-lib/calc/help/custhelp/pzasusb8
-lib/calc/help/custhelp/sysinfo
-lib/calc/help/custom
-lib/calc/help/custom_cal
-lib/calc/help/define
-lib/calc/help/delete
-lib/calc/help/den
-lib/calc/help/dereference
-lib/calc/help/det
-lib/calc/help/digit
-lib/calc/help/digits
-lib/calc/help/dp
-lib/calc/help/environment
-lib/calc/help/epsilon
-lib/calc/help/errcount
-lib/calc/help/errmax
-lib/calc/help/errno
-lib/calc/help/error
-lib/calc/help/errorcode
-lib/calc/help/errorcodes
-lib/calc/help/euler
-lib/calc/help/eval
-lib/calc/help/exp
-lib/calc/help/expression
-lib/calc/help/fact
-lib/calc/help/factor
-lib/calc/help/fclose
-lib/calc/help/fcnt
-lib/calc/help/feof
-lib/calc/help/ferror
-lib/calc/help/fflush
-lib/calc/help/fgetc
-lib/calc/help/fgetfield
-lib/calc/help/fgetline
-lib/calc/help/fgets
-lib/calc/help/fgetstr
-lib/calc/help/fib
-lib/calc/help/file
-lib/calc/help/files
-lib/calc/help/floor
-lib/calc/help/fopen
-lib/calc/help/forall
-lib/calc/help/fprintf
-lib/calc/help/fputc
-lib/calc/help/fputs
-lib/calc/help/fputstr
-lib/calc/help/frac
-lib/calc/help/free
-lib/calc/help/freebernoulli
-lib/calc/help/freeeuler
-lib/calc/help/freeglobals
-lib/calc/help/freeredc
-lib/calc/help/freestatics
-lib/calc/help/frem
-lib/calc/help/freopen
-lib/calc/help/fscan
-lib/calc/help/fscanf
-lib/calc/help/fseek
-lib/calc/help/fsize
-lib/calc/help/ftell
-lib/calc/help/full
-lib/calc/help/gcd
-lib/calc/help/gcdrem
-lib/calc/help/gd
-lib/calc/help/getenv
-lib/calc/help/hash
-lib/calc/help/head
-lib/calc/help/help
-lib/calc/help/highbit
-lib/calc/help/history
-lib/calc/help/hmean
-lib/calc/help/hnrmod
-lib/calc/help/hypot
-lib/calc/help/ilog
-lib/calc/help/ilog10
-lib/calc/help/ilog2
-lib/calc/help/im
-lib/calc/help/indices
-lib/calc/help/inputlevel
-lib/calc/help/insert
-lib/calc/help/int
-lib/calc/help/interrupt
-lib/calc/help/intro
-lib/calc/help/inverse
-lib/calc/help/iroot
-lib/calc/help/isassoc
-lib/calc/help/isatty
-lib/calc/help/isblk
-lib/calc/help/isconfig
-lib/calc/help/isdefined
-lib/calc/help/iserror
-lib/calc/help/iseven
-lib/calc/help/isfile
-lib/calc/help/ishash
-lib/calc/help/isident
-lib/calc/help/isint
-lib/calc/help/islist
-lib/calc/help/ismat
-lib/calc/help/ismult
-lib/calc/help/isnull
-lib/calc/help/isnum
-lib/calc/help/isobj
-lib/calc/help/isobjtype
-lib/calc/help/isodd
-lib/calc/help/isprime
-lib/calc/help/isptr
-lib/calc/help/isqrt
-lib/calc/help/isrand
-lib/calc/help/israndom
-lib/calc/help/isreal
-lib/calc/help/isrel
-lib/calc/help/issimple
-lib/calc/help/issq
-lib/calc/help/isstr
-lib/calc/help/istype
-lib/calc/help/jacobi
-lib/calc/help/join
-lib/calc/help/lcm
-lib/calc/help/lcmfact
-lib/calc/help/lfactor
-lib/calc/help/libcalc
-lib/calc/help/list
-lib/calc/help/ln
-lib/calc/help/lowbit
-lib/calc/help/ltol
-lib/calc/help/makelist
-lib/calc/help/mat
-lib/calc/help/matdim
-lib/calc/help/matfill
-lib/calc/help/matmax
-lib/calc/help/matmin
-lib/calc/help/matsum
-lib/calc/help/mattrace
-lib/calc/help/mattrans
-lib/calc/help/max
-lib/calc/help/md5
-lib/calc/help/memsize
-lib/calc/help/meq
-lib/calc/help/min
-lib/calc/help/minv
-lib/calc/help/mmin
-lib/calc/help/mne
-lib/calc/help/mod
-lib/calc/help/modify
-lib/calc/help/name
-lib/calc/help/near
-lib/calc/help/new_custom
-lib/calc/help/newerror
-lib/calc/help/nextcand
-lib/calc/help/nextprime
-lib/calc/help/norm
-lib/calc/help/null
-lib/calc/help/num
-lib/calc/help/obj
-lib/calc/help/oldvalue
-lib/calc/help/operator
-lib/calc/help/ord
-lib/calc/help/overview
-lib/calc/help/param
-lib/calc/help/perm
-lib/calc/help/pfact
-lib/calc/help/pi
-lib/calc/help/pix
-lib/calc/help/places
-lib/calc/help/pmod
-lib/calc/help/polar
-lib/calc/help/poly
-lib/calc/help/pop
-lib/calc/help/popcnt
-lib/calc/help/power
-lib/calc/help/prevcand
-lib/calc/help/prevprime
-lib/calc/help/printf
-lib/calc/help/prompt
-lib/calc/help/protect
-lib/calc/help/ptest
-lib/calc/help/push
-lib/calc/help/putenv
-lib/calc/help/quo
-lib/calc/help/quomod
-lib/calc/help/rand
-lib/calc/help/randbit
-lib/calc/help/random
-lib/calc/help/randombit
-lib/calc/help/randperm
-lib/calc/help/rcin
-lib/calc/help/rcmul
-lib/calc/help/rcout
-lib/calc/help/rcpow
-lib/calc/help/rcsq
-lib/calc/help/re
-lib/calc/help/remove
-lib/calc/help/resource
-lib/calc/help/reverse
-lib/calc/help/rewind
-lib/calc/help/rm
-lib/calc/help/root
-lib/calc/help/round
-lib/calc/help/rsearch
-lib/calc/help/runtime
-lib/calc/help/saveval
-lib/calc/help/scale
-lib/calc/help/scan
-lib/calc/help/scanf
-lib/calc/help/script
-lib/calc/help/search
-lib/calc/help/sec
-lib/calc/help/sech
-lib/calc/help/seed
-lib/calc/help/segment
-lib/calc/help/select
-lib/calc/help/sgn
-lib/calc/help/sha
-lib/calc/help/sha1
-lib/calc/help/sin
-lib/calc/help/sinh
-lib/calc/help/size
-lib/calc/help/sizeof
-lib/calc/help/sleep
-lib/calc/help/sort
-lib/calc/help/sqrt
-lib/calc/help/srand
-lib/calc/help/srandom
-lib/calc/help/ssq
-lib/calc/help/statement
-lib/calc/help/str
-lib/calc/help/strcat
-lib/calc/help/strerror
-lib/calc/help/strlen
-lib/calc/help/strpos
-lib/calc/help/strprintf
-lib/calc/help/strscan
-lib/calc/help/strscanf
-lib/calc/help/substr
-lib/calc/help/sum
-lib/calc/help/swap
-lib/calc/help/system
-lib/calc/help/tail
-lib/calc/help/tan
-lib/calc/help/tanh
-lib/calc/help/test
-lib/calc/help/time
-lib/calc/help/todo
-lib/calc/help/trunc
-lib/calc/help/type
-lib/calc/help/types
-lib/calc/help/unexpected
-lib/calc/help/usage
-lib/calc/help/variable
-lib/calc/help/wishlist
-lib/calc/help/xor
-lib/calc/libcalc.a
-lib/calc/lucas.cal
-lib/calc/lucas_chk.cal
-lib/calc/lucas_tbl.cal
-lib/calc/mersenne.cal
-lib/calc/mfactor.cal
-lib/calc/mod.cal
-lib/calc/natnumset.cal
-lib/calc/pell.cal
-lib/calc/pi.cal
-lib/calc/pix.cal
-lib/calc/pollard.cal
-lib/calc/poly.cal
-lib/calc/prompt.cal
-lib/calc/psqrt.cal
-lib/calc/qtime.cal
-lib/calc/quat.cal
-lib/calc/randbitrun.cal
-lib/calc/randmprime.cal
-lib/calc/randombitrun.cal
-lib/calc/randomrun.cal
-lib/calc/randrun.cal
-lib/calc/regress.cal
-lib/calc/seedrandom.cal
-lib/calc/solve.cal
-lib/calc/sumsq.cal
-lib/calc/surd.cal
-lib/calc/test1700.cal
-lib/calc/test2300.cal
-lib/calc/test2600.cal
-lib/calc/test2700.cal
-lib/calc/test3100.cal
-lib/calc/test3300.cal
-lib/calc/test3400.cal
-lib/calc/test3500.cal
-lib/calc/test4000.cal
-lib/calc/test4100.cal
-lib/calc/test4600.cal
-lib/calc/test5100.cal
-lib/calc/test5200.cal
-lib/calc/test8400.cal
-lib/calc/test8500.cal
-lib/calc/test8600.cal
-lib/calc/unitfrac.cal
-lib/calc/varargs.cal
-lib/calc/xx_print.cal
-man/cat1/calc.0
+lib/libcalc.a
 man/man1/calc.1
-@dirrm lib/calc/help/custhelp
-@dirrm lib/calc/help
-@dirrm lib/calc/custom
-@dirrm lib/calc
+share/calc/README
+share/calc/beer.cal
+share/calc/bernoulli.cal
+share/calc/bigprime.cal
+share/calc/bindings
+share/calc/chi.cal
+share/calc/chrem.cal
+share/calc/custhelp/argv
+share/calc/custhelp/devnull
+share/calc/custhelp/help
+share/calc/custhelp/pzasusb8
+share/calc/custhelp/sysinfo
+share/calc/custom/argv.cal
+share/calc/custom/halflen.cal
+share/calc/custom/libcustcalc.a
+share/calc/custom/pzasusb8.cal
+share/calc/deg.cal
+share/calc/ellip.cal
+share/calc/hello.cal
+share/calc/help/COPYING
+share/calc/help/COPYING-LGPL
+share/calc/help/abs
+share/calc/help/access
+share/calc/help/acos
+share/calc/help/acosh
+share/calc/help/acot
+share/calc/help/acoth
+share/calc/help/acsc
+share/calc/help/acsch
+share/calc/help/address
+share/calc/help/agd
+share/calc/help/append
+share/calc/help/appr
+share/calc/help/archive
+share/calc/help/arg
+share/calc/help/argv
+share/calc/help/arrow
+share/calc/help/asec
+share/calc/help/asech
+share/calc/help/asin
+share/calc/help/asinh
+share/calc/help/assign
+share/calc/help/assoc
+share/calc/help/atan
+share/calc/help/atan2
+share/calc/help/atanh
+share/calc/help/avg
+share/calc/help/base
+share/calc/help/base2
+share/calc/help/bernoulli
+share/calc/help/binding
+share/calc/help/bindings
+share/calc/help/bit
+share/calc/help/blk
+share/calc/help/blkcpy
+share/calc/help/blkfree
+share/calc/help/blocks
+share/calc/help/bround
+share/calc/help/btrunc
+share/calc/help/bug
+share/calc/help/bugs
+share/calc/help/builtin
+share/calc/help/calc_tty
+share/calc/help/calclevel
+share/calc/help/catalan
+share/calc/help/ceil
+share/calc/help/cfappr
+share/calc/help/cfsim
+share/calc/help/change
+share/calc/help/changes
+share/calc/help/char
+share/calc/help/cmdbuf
+share/calc/help/cmp
+share/calc/help/comb
+share/calc/help/command
+share/calc/help/config
+share/calc/help/conj
+share/calc/help/contrib
+share/calc/help/cos
+share/calc/help/cosh
+share/calc/help/cot
+share/calc/help/coth
+share/calc/help/count
+share/calc/help/cp
+share/calc/help/credit
+share/calc/help/csc
+share/calc/help/csch
+share/calc/help/cscript
+share/calc/help/ctime
+share/calc/help/custom
+share/calc/help/custom_cal
+share/calc/help/define
+share/calc/help/delete
+share/calc/help/den
+share/calc/help/dereference
+share/calc/help/det
+share/calc/help/digit
+share/calc/help/digits
+share/calc/help/dp
+share/calc/help/environment
+share/calc/help/epsilon
+share/calc/help/errcount
+share/calc/help/errmax
+share/calc/help/errno
+share/calc/help/error
+share/calc/help/errorcode
+share/calc/help/errorcodes
+share/calc/help/euler
+share/calc/help/eval
+share/calc/help/exp
+share/calc/help/expression
+share/calc/help/fact
+share/calc/help/factor
+share/calc/help/fclose
+share/calc/help/fcnt
+share/calc/help/feof
+share/calc/help/ferror
+share/calc/help/fflush
+share/calc/help/fgetc
+share/calc/help/fgetfield
+share/calc/help/fgetline
+share/calc/help/fgets
+share/calc/help/fgetstr
+share/calc/help/fib
+share/calc/help/file
+share/calc/help/files
+share/calc/help/floor
+share/calc/help/fopen
+share/calc/help/forall
+share/calc/help/fprintf
+share/calc/help/fputc
+share/calc/help/fputs
+share/calc/help/fputstr
+share/calc/help/frac
+share/calc/help/free
+share/calc/help/freebernoulli
+share/calc/help/freeeuler
+share/calc/help/freeglobals
+share/calc/help/freeredc
+share/calc/help/freestatics
+share/calc/help/frem
+share/calc/help/freopen
+share/calc/help/fscan
+share/calc/help/fscanf
+share/calc/help/fseek
+share/calc/help/fsize
+share/calc/help/ftell
+share/calc/help/full
+share/calc/help/gcd
+share/calc/help/gcdrem
+share/calc/help/gd
+share/calc/help/getenv
+share/calc/help/hash
+share/calc/help/head
+share/calc/help/help
+share/calc/help/highbit
+share/calc/help/history
+share/calc/help/hmean
+share/calc/help/hnrmod
+share/calc/help/hypot
+share/calc/help/ilog
+share/calc/help/ilog10
+share/calc/help/ilog2
+share/calc/help/im
+share/calc/help/indices
+share/calc/help/inputlevel
+share/calc/help/insert
+share/calc/help/int
+share/calc/help/interrupt
+share/calc/help/intro
+share/calc/help/inverse
+share/calc/help/iroot
+share/calc/help/isassoc
+share/calc/help/isatty
+share/calc/help/isblk
+share/calc/help/isconfig
+share/calc/help/isdefined
+share/calc/help/iserror
+share/calc/help/iseven
+share/calc/help/isfile
+share/calc/help/ishash
+share/calc/help/isident
+share/calc/help/isint
+share/calc/help/islist
+share/calc/help/ismat
+share/calc/help/ismult
+share/calc/help/isnull
+share/calc/help/isnum
+share/calc/help/isobj
+share/calc/help/isobjtype
+share/calc/help/isodd
+share/calc/help/isprime
+share/calc/help/isptr
+share/calc/help/isqrt
+share/calc/help/isrand
+share/calc/help/israndom
+share/calc/help/isreal
+share/calc/help/isrel
+share/calc/help/issimple
+share/calc/help/issq
+share/calc/help/isstr
+share/calc/help/istype
+share/calc/help/jacobi
+share/calc/help/join
+share/calc/help/lcm
+share/calc/help/lcmfact
+share/calc/help/lfactor
+share/calc/help/libcalc
+share/calc/help/list
+share/calc/help/ln
+share/calc/help/lowbit
+share/calc/help/ltol
+share/calc/help/makelist
+share/calc/help/mat
+share/calc/help/matdim
+share/calc/help/matfill
+share/calc/help/matmax
+share/calc/help/matmin
+share/calc/help/matsum
+share/calc/help/mattrace
+share/calc/help/mattrans
+share/calc/help/max
+share/calc/help/md5
+share/calc/help/memsize
+share/calc/help/meq
+share/calc/help/min
+share/calc/help/minv
+share/calc/help/mmin
+share/calc/help/mne
+share/calc/help/mod
+share/calc/help/modify
+share/calc/help/name
+share/calc/help/near
+share/calc/help/new_custom
+share/calc/help/newerror
+share/calc/help/nextcand
+share/calc/help/nextprime
+share/calc/help/norm
+share/calc/help/null
+share/calc/help/num
+share/calc/help/obj
+share/calc/help/oldvalue
+share/calc/help/operator
+share/calc/help/ord
+share/calc/help/overview
+share/calc/help/param
+share/calc/help/perm
+share/calc/help/pfact
+share/calc/help/pi
+share/calc/help/pix
+share/calc/help/places
+share/calc/help/pmod
+share/calc/help/polar
+share/calc/help/poly
+share/calc/help/pop
+share/calc/help/popcnt
+share/calc/help/power
+share/calc/help/prevcand
+share/calc/help/prevprime
+share/calc/help/printf
+share/calc/help/prompt
+share/calc/help/protect
+share/calc/help/ptest
+share/calc/help/push
+share/calc/help/putenv
+share/calc/help/quo
+share/calc/help/quomod
+share/calc/help/rand
+share/calc/help/randbit
+share/calc/help/random
+share/calc/help/randombit
+share/calc/help/randperm
+share/calc/help/rcin
+share/calc/help/rcmul
+share/calc/help/rcout
+share/calc/help/rcpow
+share/calc/help/rcsq
+share/calc/help/re
+share/calc/help/remove
+share/calc/help/resource
+share/calc/help/reverse
+share/calc/help/rewind
+share/calc/help/rm
+share/calc/help/root
+share/calc/help/round
+share/calc/help/rsearch
+share/calc/help/runtime
+share/calc/help/saveval
+share/calc/help/scale
+share/calc/help/scan
+share/calc/help/scanf
+share/calc/help/script
+share/calc/help/search
+share/calc/help/sec
+share/calc/help/sech
+share/calc/help/seed
+share/calc/help/segment
+share/calc/help/select
+share/calc/help/sgn
+share/calc/help/sha
+share/calc/help/sha1
+share/calc/help/sin
+share/calc/help/sinh
+share/calc/help/size
+share/calc/help/sizeof
+share/calc/help/sleep
+share/calc/help/sort
+share/calc/help/sqrt
+share/calc/help/srand
+share/calc/help/srandom
+share/calc/help/ssq
+share/calc/help/statement
+share/calc/help/str
+share/calc/help/strcat
+share/calc/help/strerror
+share/calc/help/strlen
+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/help/swap
+share/calc/help/system
+share/calc/help/tail
+share/calc/help/tan
+share/calc/help/tanh
+share/calc/help/test
+share/calc/help/time
+share/calc/help/todo
+share/calc/help/trunc
+share/calc/help/type
+share/calc/help/types
+share/calc/help/unexpected
+share/calc/help/usage
+share/calc/help/variable
+share/calc/help/version
+share/calc/help/wishlist
+share/calc/help/xor
+share/calc/intfile.cal
+share/calc/lucas.cal
+share/calc/lucas_chk.cal
+share/calc/lucas_tbl.cal
+share/calc/mersenne.cal
+share/calc/mfactor.cal
+share/calc/mod.cal
+share/calc/natnumset.cal
+share/calc/pell.cal
+share/calc/pi.cal
+share/calc/pix.cal
+share/calc/pollard.cal
+share/calc/poly.cal
+share/calc/prompt.cal
+share/calc/psqrt.cal
+share/calc/qtime.cal
+share/calc/quat.cal
+share/calc/randbitrun.cal
+share/calc/randmprime.cal
+share/calc/randombitrun.cal
+share/calc/randomrun.cal
+share/calc/randrun.cal
+share/calc/regress.cal
+share/calc/seedrandom.cal
+share/calc/solve.cal
+share/calc/sumsq.cal
+share/calc/surd.cal
+share/calc/test1700.cal
+share/calc/test2300.cal
+share/calc/test2600.cal
+share/calc/test2700.cal
+share/calc/test3100.cal
+share/calc/test3300.cal
+share/calc/test3400.cal
+share/calc/test3500.cal
+share/calc/test4000.cal
+share/calc/test4100.cal
+share/calc/test4600.cal
+share/calc/test5100.cal
+share/calc/test5200.cal
+share/calc/test8400.cal
+share/calc/test8500.cal
+share/calc/test8600.cal
+share/calc/unitfrac.cal
+share/calc/varargs.cal
+share/calc/xx_print.cal
+@dirrm share/calc/help
+@dirrm share/calc/custom
+@dirrm share/calc/custhelp
+@dirrm share/calc
+@exec ${MKDIR} %D/include/calc/custom
+@dirrm include/calc/custom
 @dirrm include/calc
 @dirrm bin/cscript
diff --git a/math/capc-calc/distinfo b/math/capc-calc/distinfo
index 20b910c08a1..99e61e26348 100644
--- a/math/capc-calc/distinfo
+++ b/math/capc-calc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/05/16 20:28:40 jlam Exp $
+$NetBSD: distinfo,v 1.4 2003/01/03 20:35:29 wiz Exp $
 
-SHA1 (calc-2.11.4t2.tar.gz) = 4df87a5e5343ba57fd7026f434a5980aff48ed89
-Size (calc-2.11.4t2.tar.gz) = 905897 bytes
-SHA1 (patch-aa) = fffd5464cf05d6efce48ba54fb21d9dd530fa46e
+SHA1 (calc-2.11.6.tar.gz) = 4c80d89cc11b7d2ef987a3ecc19bc4528750113f
+Size (calc-2.11.6.tar.gz) = 950894 bytes
+SHA1 (patch-aa) = 7ca5ffdb73cf05ec5ceb76c7d529c8f2112ea923
diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa
index bafffccbc25..faacb9a8075 100644
--- a/math/capc-calc/patches/patch-aa
+++ b/math/capc-calc/patches/patch-aa
@@ -1,39 +1,45 @@
-$NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/03 20:35:29 wiz Exp $
 
---- Makefile.orig	Sun Dec 17 08:09:39 2000
+--- Makefile.orig	Sun Dec 29 08:14:00 2002
 +++ Makefile
-@@ -348,18 +348,18 @@
- # ${CUSTOMHELPDIR}	where custom help files are installed.
- # ${SCRIPTDIR}		where calc shell scripts are installed.
- #
--BINDIR= /usr/local/bin
-+BINDIR= ${PREFIX}/bin
- #BINDIR= /usr/bin
- #BINDIR= /usr/contrib/bin
- #
--TOPDIR= /usr/local/lib
-+TOPDIR= ${PREFIX}/lib
- #TOPDIR= /usr/lib
- #TOPDIR= /usr/libdata
- #TOPDIR= /usr/contrib/lib
- #
- LIBDIR= ${TOPDIR}/calc
- HELPDIR= ${LIBDIR}/help
--INCDIR= /usr/local/include
+@@ -556,7 +556,7 @@ HAVE_UNISTD_H=
+ 
+ #INCDIR= /usr/local/include
+ #INCDIR= /dev/env/DJDIR/include
+-INCDIR= /usr/include
 +INCDIR= ${PREFIX}/include
- INCDIRCALC= ${INCDIR}/calc
- CUSTOMLIBDIR= ${LIBDIR}/custom
- CUSTOMHELPDIR= ${HELPDIR}/custhelp
-@@ -369,7 +369,7 @@
+ 
+ # Where to install calc realted things
  #
- # Use MANDIR= to disable installation of the calc man (source) page.
+@@ -583,15 +583,15 @@ INCDIR= /usr/include
  #
--MANDIR=
-+MANDIR= ${PREFIX}/man/man1
+ #BINDIR= /usr/local/bin
+ #BINDIR= /dev/env/DJDIR/bin
+-BINDIR= /usr/bin
++BINDIR= ${PREFIX}/bin
+ 
+ #LIBDIR= /usr/local/lib
+ #LIBDIR= /dev/env/DJDIR/lib
+-LIBDIR= /usr/lib
++LIBDIR= ${PREFIX}/lib
+ 
+ #CALC_SHAREDIR= /usr/local/lib/calc
+ #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
+-CALC_SHAREDIR= /usr/share/calc
++CALC_SHAREDIR= ${PREFIX}/share/calc
+ 
+ #CALC_INCDIR= /usr/local/include/calc
+ #CALC_INCDIR= /dev/env/DJDIR/include/calc
+@@ -665,7 +665,7 @@ T=
+ #MANDIR=
  #MANDIR= /usr/local/man/man1
  #MANDIR= /usr/man/man1
- #MANDIR= /usr/share/man/man1
-@@ -380,7 +380,7 @@
+-MANDIR= /usr/share/man/man1
++MANDIR= ${PREFIX}/man/man1
+ #MANDIR= /dev/env/DJDIR/man/man1
+ #MANDIR= /usr/man/u_man/man1
+ #MANDIR= /usr/contrib/man/man1
+@@ -676,7 +676,7 @@ MANDIR= /usr/share/man/man1
  #
  # Use CATDIR= to disable installation of the calc cat (formatted) page.
  #
@@ -42,18 +48,30 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $
  #CATDIR= /usr/local/man/cat1
  #CATDIR= /usr/local/catman/cat1
  #CATDIR= /usr/man/cat1
-@@ -399,8 +399,8 @@
+@@ -697,9 +697,9 @@ MANEXT= 1
  #
  # This is ignored if CATDIR is empty.
  #
 -CATEXT= 1
--#CATEXT= 0
 +#CATEXT= 1
+ #CATEXT= 1.gz
+-#CATEXT= 0
 +CATEXT= 0
  #CATEXT= l
  
  # how to format a man page
-@@ -456,10 +456,10 @@
+@@ -725,8 +725,8 @@ CATEXT= 1
+ # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
+ # lines below.
+ #
+-#NROFF= nroff
+-NROFF=
++NROFF= nroff
++#NROFF=
+ #NROFF= groff
+ NROFF_ARG= -man
+ #NROFF_ARG= -mandoc
+@@ -770,10 +770,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc
  #
  # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
  #
@@ -64,12 +82,12 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $
  #
 -READLINE_LIB=
 +READLINE_LIB= -lreadline -ltermcap
- #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory
- #READLINE_LIB= -lreadline -lhistory
- #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory
-@@ -470,10 +470,10 @@
- 
- # If $PAGER is not set, use this program to display a help file
+ #READLINE_LIB= -lreadline -lhistory -lncurses
+ #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses
+ #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses
+@@ -786,10 +786,10 @@ READLINE_INCLUDE=
+ #
+ # Select CALCPAGER= less.exe -ci for DJGPP.
  #
 -CALCPAGER= more
 +#CALCPAGER= more
@@ -77,26 +95,26 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $
  #CALCPAGER= cat
 -#CALCPAGER= less
 +CALCPAGER= less
+ #CALCPAGER= less.exe -ci
  
  # Debug/Optimize options for ${CC} and ${LCC}
- #
-@@ -489,7 +489,7 @@
+@@ -807,7 +807,7 @@ CALCPAGER= more
+ #DEBUG= -O1 -g3
  #
  #DEBUG= -O2
- #DEBUG= -O2 -g
--DEBUG= -O2 -g3
-+#DEBUG= -O2 -g3
+-DEBUG= -O2 -g
++#DEBUG= -O2 -g
+ #DEBUG= -O2 -g3
  #DEBUG= -O2 -ipa
  #DEBUG= -O2 -g3 -ipa
- #
-@@ -636,10 +636,10 @@
+@@ -959,10 +959,10 @@ CCWARN= -Wall -Wno-implicit -Wno-comment
  CCOPT= ${DEBUG} ${NO_SHARED}
  CCMISC=
  #
--CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC}
--ICFLAGS= ${CCWARN} ${CCMISC}
-+CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS}
-+ICFLAGS= ${CCWARN} ${CCMISC} ${CPPFLAGS}
+-CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC}
+-ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC}
++CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS}
++ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ${CPPFLAGS}
  #
 -LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED}
 +LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED}