Update mathomatic to 11.0f.

Changes:
  - Removed calc() fraction code for accuracy because of fraction slack
    that was implemented in version 10.9c.
  - Solve increase power function wasn't working with odd number roots.
    Fixed.  Appears to be another gcc optimizer bug.
  - Improved simplify command.
  - Tweaked factor_constants().
  - Some changes to "makefile" for "readline" support.
    "GNU make" or "gmake" required now.
  - Fixed solving of "x^(1/99)=x".
  - Fixed readline bug.

3 files changed, 24 insertions, 76 deletions

diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index 5413622ddcc..f8cc92549da 100644
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/04/28 04:28:57 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/04 17:20:49 minskim Exp $
 #
 
-DISTNAME=		mathomatic-11.0e
+DISTNAME=		mathomatic-11.0f
 CATEGORIES=		math
 MASTER_SITES=		http://www.panix.com/~gesslein/
 EXTRACT_SUFX=		.tgz
@@ -18,11 +18,12 @@ USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile
 
-CFLAGS+=		-DUNIX
 CFLAGS.SunOS+=		-DSOLARIS
 
 INSTALLATION_DIRS=	bin man/man1
 
+.include "../../devel/readline/buildlink3.mk"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/am ${PREFIX}/bin/am_mathomatic
 	${INSTALL_MAN} ${WRKSRC}/am.1 ${PREFIX}/man/man1/am_mathomatic.1
diff --git a/math/mathomatic/distinfo b/math/mathomatic/distinfo
index 5a21ef6b707..12022ecf223 100644
--- a/math/mathomatic/distinfo
+++ b/math/mathomatic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/04/28 04:28:57 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/05/04 17:20:49 minskim Exp $
 
-SHA1 (mathomatic-11.0e/mathomatic-11.0e.tgz) = 8ed032f536b5e31659535ea7d92f72ce9e5d0099
-Size (mathomatic-11.0e/mathomatic-11.0e.tgz) = 109957 bytes
-SHA1 (patch-aa) = b5b1336df22a9381c3d748e4e49f0429ca773c47
+SHA1 (mathomatic-11.0f/mathomatic-11.0f.tgz) = 9aa8a9c14ac7ba2f6f25a94f42dc4d330fe26e0b
+Size (mathomatic-11.0f/mathomatic-11.0f.tgz) = 110330 bytes
+SHA1 (patch-aa) = 675eb9b2241f39fb0e29e3dcb6cae5b6829d2351
diff --git a/math/mathomatic/patches/patch-aa b/math/mathomatic/patches/patch-aa
index 64e40c9430c..148a2c3e65b 100644
--- a/math/mathomatic/patches/patch-aa
+++ b/math/mathomatic/patches/patch-aa
@@ -1,80 +1,27 @@
-$NetBSD: patch-aa,v 1.2 2004/04/17 17:08:37 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2004/05/04 17:20:49 minskim Exp $
 
---- makefile.orig	2004-04-12 14:05:50.000000000 -0500
+--- makefile.orig	2004-05-01 20:43:07.000000000 -0500
 +++ makefile
-@@ -1,18 +1,21 @@
+@@ -1,16 +1,16 @@
  # Makefile for compiling Mathomatic for UNIX or Linux.
  
--CFLAGS		= -c -O -DUNIX
+-CFLAGS		= -O -DUNIX
 -LDFLAGS		= -s
-+#CFLAGS		= -c -O -DUNIX
++CFLAGS		+= -O -DUNIX
 +#LDFLAGS		= -s
+ LIBS		= -lm
  
- # To use readline, uncomment the following two lines:
- #CFLAGS		+= -DREADLINE
- #LDFLAGS	+= -lreadline -lcurses
+ # Comment out the following lines if you are not using GNU make.
+-ifdef READLINE
++#ifdef READLINE
+ CFLAGS		+= -DREADLINE
+-LIBS		+= -lreadline -lcurses
+-endif
++LIBS		+= -lreadline #-lcurses
++#endif
  
--PREFIX	= /usr/local
-+#PREFIX	= /usr/local
+-PREFIX		= /usr/local
++#PREFIX		= /usr/local
  
  AOUT	=am
  OBJECTS	=main.o am.o parse.o cmds.o simplify.o factor.o super.o \
- 	unfactor.o diff.o complex.o list.o
- 
-+.c.o:
-+	${CC} ${CFLAGS} -c $<
-+
- all: $(AOUT)
- 	@echo Make completed.
- 
-@@ -20,46 +23,15 @@ test: $(AOUT)
- 	./$(AOUT) -c all.in >test.out
- 	diff all.out test.out
- 
--main.o: main.c am.h
--	$(CC) $(CFLAGS) $*.c
--
--am.o: am.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--parse.o: parse.c parse.h am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--cmds.o: cmds.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--simplify.o: simplify.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--factor.o: factor.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--super.o: super.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--unfactor.o: unfactor.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--diff.o: diff.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--complex.o: complex.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
--
--list.o: list.c am.h externs.h
--	$(CC) $(CFLAGS) $*.c
-+${OBJECTS}: am.h externs.h
- 
- $(AOUT): $(OBJECTS)
- 	$(CC) $(LDFLAGS) $(OBJECTS) -lm -o $(AOUT)
- 
- install: $(AOUT)
--	install -m 0755 $(AOUT) $(PREFIX)/bin
--	install -m 0644 am.1 $(PREFIX)/man/man1
-+	${BSD_INSTALL_PROGRAM} $(AOUT) $(PREFIX)/bin
-+	${BSD_INSTALL_MAN} am.1 $(PREFIX)/man/man1
- 	@echo Install completed.
- 
- clean:
--	rm -f *.o
-+	rm -f ${OBJECTS}