3 files changed, 332 insertions, 31 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index 9727fbbefa53..e677c3de97ea 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -6,20 +6,16 @@
 # $FreeBSD$
 #
 
-DISTNAME=	calc-2.9.3t6
-PKGNAME=	calc-2.9.3
+DISTNAME=	calc-2.11.1t3.0
+PKGNAME=	calc-2.11.1
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/contrib/
-EXTRACT_SUFX=	.tar
+MASTER_SITES=	ftp://reality.sgi.com/users/chongo/src/calc/		\
+		http://reality.sgi.com/chongo/src/calc/			\
+		ftp://ftp.uu.net/pub/calc/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-EXTRACT_CMD=		${TAR}
-EXTRACT_BEFORE_ARGS=	-xf
-EXTRACT_AFTER_ARGS=	# empty
-
 MAN1=		calc.1
-IGNOREFILES=	${DISTFILES}	# "on-the-fly" creation of tarball
 
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/calc/help
diff --git a/math/calc/distinfo b/math/calc/distinfo
index cc0e0bf63430..87350963bcc7 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1 +1 @@
-MD5 (calc-2.9.3t6.tar) = IGNORE
+MD5 (calc-2.11.1t3.0.tar.gz) = 6b5ea47ecd97dbc4098a272994907642
diff --git a/math/calc/pkg-plist b/math/calc/pkg-plist
index aef1c366f6df..832061f3128f 100644
--- a/math/calc/pkg-plist
+++ b/math/calc/pkg-plist
@@ -22,19 +22,309 @@ lib/calc/help/variable
 lib/calc/help/todo
 lib/calc/help/credit
 lib/calc/help/bindings
-lib/calc/help/altbind
 lib/calc/help/changes
 lib/calc/help/libcalc
-lib/calc/help/stdlib
 lib/calc/help/bugs
-lib/calc/help/full
 lib/calc/help/obj
+lib/calc/help/full
+lib/calc/help/custom
+lib/calc/help/script
+lib/calc/help/unexpected
+lib/calc/help/archive
+lib/calc/help/contrib
+lib/calc/help/wishlist
+lib/calc/help/errorcodes
+lib/calc/help/resource
+lib/calc/help/cscript
+lib/calc/help/custom_cal
+lib/calc/help/new_custom
+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/arg
+lib/calc/help/argv
+lib/calc/help/arrow
+lib/calc/help/asec
+lib/calc/help/avg
+lib/calc/help/asech
+lib/calc/help/asin
+lib/calc/help/asinh
+lib/calc/help/assign
+lib/calc/help/atan
+lib/calc/help/atan2
+lib/calc/help/atanh
+lib/calc/help/base
+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/calclevel
+lib/calc/help/ceil
+lib/calc/help/cfappr
+lib/calc/help/cfsim
+lib/calc/help/char
+lib/calc/help/cmdbuf
+lib/calc/help/cmp
+lib/calc/help/comb
+lib/calc/help/conj
+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/csc
+lib/calc/help/csch
+lib/calc/help/ctime
+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/epsilon
+lib/calc/help/errcount
+lib/calc/help/errmax
+lib/calc/help/errno
+lib/calc/help/error
+lib/calc/help/eval
+lib/calc/help/exp
+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/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/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/gcd
+lib/calc/help/gcdrem
+lib/calc/help/gd
+lib/calc/help/getenv
+lib/calc/help/hash
+lib/calc/help/head
+lib/calc/help/highbit
+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/int
+lib/calc/help/insert
+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/lcm
+lib/calc/help/issq
+lib/calc/help/isstr
+lib/calc/help/istype
+lib/calc/help/jacobi
+lib/calc/help/join
+lib/calc/help/lcmfact
+lib/calc/help/lfactor
+lib/calc/help/ln
+lib/calc/help/lowbit
+lib/calc/help/ltol
+lib/calc/help/makelist
+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/newerror
+lib/calc/help/nextcand
+lib/calc/help/nextprime
+lib/calc/help/norm
+lib/calc/help/null
+lib/calc/help/num
+lib/calc/help/oldvalue
+lib/calc/help/ord
+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/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/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/sort
+lib/calc/help/sqrt
+lib/calc/help/srand
+lib/calc/help/srandom
+lib/calc/help/ssq
+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/trunc
+lib/calc/help/xor
+lib/calc/help/binding
+lib/calc/help/bug
+lib/calc/help/change
+lib/calc/help/errorcode
+lib/calc/help/type
+lib/calc/help/custhelp
+lib/calc/help/custhelp/argv
+lib/calc/help/custhelp/devnull
+lib/calc/help/custhelp/help
+lib/calc/help/custhelp/sysinfo
+lib/calc/help/custhelp/pzasusb8
+lib/calc/bindings
 lib/calc/README
-lib/calc/altbind
 lib/calc/bigprime.cal
-lib/calc/bindings
 lib/calc/chrem.cal
-lib/calc/cryrand.cal
+lib/calc/custom
+lib/calc/custom/argv.cal
+lib/calc/custom/halflen.cal
+lib/calc/custom/pzasusb8.cal
+lib/calc/custom/libcustcalc.a
 lib/calc/deg.cal
 lib/calc/ellip.cal
 lib/calc/lucas.cal
@@ -42,8 +332,7 @@ lib/calc/lucas_chk.cal
 lib/calc/lucas_tbl.cal
 lib/calc/mersenne.cal
 lib/calc/mod.cal
-lib/calc/nextprim.cal
-lib/calc/nextprime.cal
+lib/calc/libcalc.a
 lib/calc/pell.cal
 lib/calc/pi.cal
 lib/calc/pollard.cal
@@ -55,20 +344,36 @@ lib/calc/regress.cal
 lib/calc/solve.cal
 lib/calc/sumsq.cal
 lib/calc/surd.cal
-lib/calc/test1000.cal
 lib/calc/unitfrac.cal
 lib/calc/varargs.cal
-lib/calc/libcalc.a
-lib/calc/alloc.h
-lib/calc/args.h
-lib/calc/cmath.h
-lib/calc/endian.h
-lib/calc/have_malloc.h
-lib/calc/have_stdlib.h
-lib/calc/have_string.h
-lib/calc/longbits.h
-lib/calc/qmath.h
-lib/calc/stdarg.h
-lib/calc/zmath.h
+lib/calc/pix.cal
+lib/calc/mfactor.cal
+lib/calc/test1700.cal
+lib/calc/randrun.cal
+lib/calc/randbitrun.cal
+lib/calc/bernoulli.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/prompt.cal
+lib/calc/test3500.cal
+lib/calc/seedrandom.cal
+lib/calc/test4000.cal
+lib/calc/test4100.cal
+lib/calc/test4600.cal
+lib/calc/beer.cal
+lib/calc/hello.cal
+lib/calc/test5100.cal
+lib/calc/test5200.cal
+lib/calc/randombitrun.cal
+lib/calc/randomrun.cal
+lib/calc/xx_print.cal
+lib/calc/natnumset.cal
+lib/calc/qtime.cal
+lib/calc/test8400.cal
+lib/calc/test8500.cal
 @dirrm lib/calc/help
 @dirrm lib/calc