Fix calc so that it will build properly again.

changed distfile from calc-2.9.3t6.tar.gz to calc-2.9.3t6.tar
calc is fetched as an on-the-fly tarball from ftp.cdrom.com
gzipped on-the-fly tars are not supported.

removed trailing whitespace on several lines in PLIST

revised DESCR to <24 lines.

4 files changed, 49 insertions, 94 deletions

diff --git a/math/calc/Makefile b/math/calc/Makefile
index e93b14b53ea5..5d21eb261932 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -3,22 +3,22 @@
 # Date created:         3 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.9 1997/08/15 18:54:17 jmz Exp $
+# $Id: Makefile,v 1.10 1997/08/25 00:09:35 asami Exp $
 #
 
 DISTNAME=	calc-2.9.3t6
 PKGNAME=	calc-2.9.3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/contrib/
+EXTRACT_SUFX=	.tar
 
 MAINTAINER=	jmz@FreeBSD.org
 
+EXTRACT_BEFORE_ARGS=	-xf
+
 MAN1=		calc.1
 IGNOREFILES=	${DISTFILES}	# "on-the-fly" creation of tarball
 
-pre-patch:
-	@cd ${WRKDIR} && mv pub/bsd-sources/4.4BSD-Lite/usr/src/contrib/calc-2.9.3t6 .
-
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/calc/help
 
diff --git a/math/calc/distinfo b/math/calc/distinfo
index e1648be3fbb4..cc0e0bf63430 100644
--- a/math/calc/distinfo
+++ b/math/calc/distinfo
@@ -1 +1 @@
-MD5 (calc-2.9.3t6.tar.gz) = IGNORE
+MD5 (calc-2.9.3t6.tar) = IGNORE
diff --git a/math/calc/pkg-descr b/math/calc/pkg-descr
index 3944e2f9ea88..bb60c95a3e54 100644
--- a/math/calc/pkg-descr
+++ b/math/calc/pkg-descr
@@ -2,52 +2,7 @@ Calc is an interactive calculator which provides for easy large
 numeric calculations, but which also can be easily programmed for
 difficult or long calculations.  It can accept a command line
 argument, in which case it executes that single command and exits.
-Otherwise, it enters interactive mode.  In this mode, it accepts
-commands one at a time, processes them, and displays the answers.  In
-the simplest case, commands are simply expressions which are
-evaluated.  For example, the following line can be input:
-
-        3 * (4 + 1)
-
-and the calculator will print 15.
-
-The special '.' symbol (called dot), represents the result of the last
-command expression, if any.  This is of great use when a series of
-partial results are calculated, or when the output mode is changed and
-the last result needs to be redisplayed.  For example, the above
-result can be doubled by typing:
-
-        . * 2
-
-and the calculator will print 30.
-
-For more complex calculations, variables can be used to save the
-intermediate results.  For example, the result of adding 7 to the
-previous result can be saved by typing:
-
-        old = . + 7
-
-Functions can be used in expressions.  There are a great number of
-pre-defined functions.  For example, the following will calculate the
-factorial of the value of 'old':
-
-        fact(old)
-
-and the calculator prints 13763753091226345046315979581580902400000000.
-Notice that numbers can be very large. (There is a practical limit
-of several thousand digits before calculations become too slow.)
-
-The calculator can calculate transcendental functions, and accept and
-display numbers in real or exponential format. For example, typing:
-
-        config("display", 50)
-        epsilon(1e-50)
-        sin(1)
-
-prints "~.84147098480789650665250232163029899962256306079837".
-
-The calculator also knows about complex numbers, so that typing:
-
-        (2+3i) * (4-3i)
-
-prints "17+6i".
+Otherwise, it enters interactive mode.  There are a great number
+of pre-defined functions.  The calculator can calculate transcendental
+functions, and accept and display numbers in real or exponential format.
+The calculator also knows about complex numbers.
diff --git a/math/calc/pkg-plist b/math/calc/pkg-plist
index 046694ca9996..712fcf7ec692 100644
--- a/math/calc/pkg-plist
+++ b/math/calc/pkg-plist
@@ -1,35 +1,35 @@
 bin/calc
-lib/calc/help/intro 
-lib/calc/help/overview 
-lib/calc/help/help 
-lib/calc/help/assoc 
-lib/calc/help/builtin 
-lib/calc/help/command 
-lib/calc/help/config 
-lib/calc/help/define 
-lib/calc/help/environment 
-lib/calc/help/expression 
-lib/calc/help/file 
-lib/calc/help/history 
-lib/calc/help/interrupt 
-lib/calc/help/list 
-lib/calc/help/mat 
-lib/calc/help/operator 
-lib/calc/help/statement 
-lib/calc/help/types 
-lib/calc/help/usage 
-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/intro
+lib/calc/help/overview
+lib/calc/help/help
+lib/calc/help/assoc
+lib/calc/help/builtin
+lib/calc/help/command
+lib/calc/help/config
+lib/calc/help/define
+lib/calc/help/environment
+lib/calc/help/expression
+lib/calc/help/file
+lib/calc/help/history
+lib/calc/help/interrupt
+lib/calc/help/list
+lib/calc/help/mat
+lib/calc/help/operator
+lib/calc/help/statement
+lib/calc/help/types
+lib/calc/help/usage
+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/README 
+lib/calc/README
 lib/calc/bigprime.cal
 lib/calc/chrem.cal
 lib/calc/cryrand.cal
@@ -57,15 +57,15 @@ 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/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
 man/man1/calc.1.gz