Update mathomatic to 11.3f.

Changes since 11.3c:

Improved eliminate command error handling.

Added "eliminate all" command.

Code cleanup.

Man pages for the prime number tools were contributed
by David Moreno Garza.  Many thanks.

Renamed the Mathomatic directory in the source tarball to
"mathomatic-`cat VERSION`".

Added several comments to the source code.

Renamed prime number tools to "matho-*".

Improvement to full simplification.

Tried something new with uf_simp() that fixed a problem with Mathomatic
solve complicating expressions.

Minor bugfix to eliminate command.

5 files changed, 11 insertions, 12 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 4453a8c44a3..66f2d62650d 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7243 2004/09/25 00:34:26 grant Exp $
+$NetBSD: CHANGES,v 1.7244 2004/09/25 00:40:53 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4422,3 +4422,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added vanessa_socket-0.0.7 [grant 2004-09-25]
 	Added vanessa_adt-0.0.6 [grant 2004-09-25]
 	Added mailscanner-4.30.3.2 [grant 2004-09-25]
+	Updated mathomatic to 11.3f [minskim 2004-09-25]
diff --git a/doc/TODO b/doc/TODO
index f4bdd02ef72..3bfda33a548 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2166 2004/09/24 13:50:28 adam Exp $
+$NetBSD: TODO,v 1.2167 2004/09/25 00:40:53 minskim Exp $
 
 Suggested new packages
 ======================
@@ -322,7 +322,6 @@ Suggested package updates
 	o maradns-1.0.23
 	o marbles-1.0.6
 	o matchbox-0.8.3 [pkgsrc-wip]
-	o mathomatic-11.3f
 	o micq-0.4.11
 	o midnight-commander-4.6.0
 	o mimedefang-2.45
diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index 63945d48dd9..12f5507ff5f 100644
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/08/04 19:59:59 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2004/09/25 00:40:53 minskim Exp $
 #
 
-DISTNAME=		mathomatic-11.3c
+DISTNAME=		mathomatic-11.3f
 CATEGORIES=		math
 MASTER_SITES=		http://www.panix.com/~gesslein/
 EXTRACT_SUFX=		.tgz
@@ -12,7 +12,6 @@ COMMENT=		Small portable symbolic math program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/am
 USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile
diff --git a/math/mathomatic/distinfo b/math/mathomatic/distinfo
index 35cc074d898..87eee4f7bfd 100644
--- a/math/mathomatic/distinfo
+++ b/math/mathomatic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2004/08/04 19:59:59 minskim Exp $
+$NetBSD: distinfo,v 1.18 2004/09/25 00:40:53 minskim Exp $
 
-SHA1 (mathomatic-11.3c.tgz) = 6246998f340460bb588caef47e74b45824e7696a
-Size (mathomatic-11.3c.tgz) = 126520 bytes
-SHA1 (patch-aa) = f2879261541a9c5934404b0f7a6272343feb57ca
+SHA1 (mathomatic-11.3f.tgz) = 838140d130f7a084cdfea13056c7464a849c321e
+Size (mathomatic-11.3f.tgz) = 119172 bytes
+SHA1 (patch-aa) = 75ecc14afaa661e27db5020e18fe6da7eb9d7afd
diff --git a/math/mathomatic/patches/patch-aa b/math/mathomatic/patches/patch-aa
index f0fa1f34ece..a4ebe533865 100644
--- a/math/mathomatic/patches/patch-aa
+++ b/math/mathomatic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2004/08/04 19:59:59 minskim Exp $
+$NetBSD: patch-aa,v 1.8 2004/09/25 00:40:54 minskim Exp $
 
 --- makefile.orig	2004-08-02 20:07:42.000000000 -0500
 +++ makefile
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.7 2004/08/04 19:59:59 minskim Exp $
 -CFLAGS		+= $(READLINE:1=-DREADLINE)
 -LIBS		+= $(READLINE:1=-lreadline -lcurses)
 +CFLAGS		+= -DREADLINE
-+LIBS		+= -lreadline
++LIBS		+= -lreadline -ltermcap
  
 -prefix		= /usr/local
 +prefix		= ${PREFIX}