Update mathomatic to 11.0b.

Changes since 10.9b:
  - Removed more MS-DOS specific code; functionality improved.
  - Implemented what I call "fraction slack".  This perfects float to
    fraction conversion, and now Mathomatic doesn't rely on perfect
    floating point routines.  "-O" option added to CFLAGS in file
    "makefile" (we can do this now).
  - Changed modf() to fmod() where possible.
  - Accuracy increased one more digit by reducing the "epsilon" variable.
  - Cleaned up "makefile".
  - Took a step towards internationalization with gettext(3) by
    calling _() for all English strings.  Everything ported except for
    the "help" command.
  - Commented out some unfactoring code that wasn't helpful and took out
    the "pause" command from "all.in" for easier testing.
  - Rearranged "simplify" command to simplify better.
  - Removed some more unfactoring code and made simplification much
    better.  Go figure.  Perfection has been achieved.
  - Added "unfactor fully" option.
  - Added "make test" to fully test Mathomatic after compilation.
  - Removed masking of 8th bit in all Mathomatic input.
  - Updated primes program with a nice user interface.

3 files changed, 36 insertions, 26 deletions

diff --git a/math/mathomatic/Makefile b/math/mathomatic/Makefile
index 01688d50321..77c5708c975 100644
--- a/math/mathomatic/Makefile
+++ b/math/mathomatic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/31 18:14:08 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/17 17:08:37 minskim Exp $
 #
 
-DISTNAME=		am-10.9b
-PKGNAME=		mathomatic-10.9b
+DISTNAME=		am
+PKGNAME=		mathomatic-11.0b
 CATEGORIES=		math
 MASTER_SITES=		http://www.panix.com/~gesslein/
 EXTRACT_SUFX=		.tgz
@@ -14,6 +14,7 @@ COMMENT=		Small portable symbolic math program
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/am
+DIST_SUBDIR=		${PKGNAME}
 USE_BUILDLINK3=		yes
 NO_CONFIGURE=		yes
 MAKEFILE=		makefile
diff --git a/math/mathomatic/distinfo b/math/mathomatic/distinfo
index ae714669247..c5b6793ab3f 100644
--- a/math/mathomatic/distinfo
+++ b/math/mathomatic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/31 18:14:08 minskim Exp $
+$NetBSD: distinfo,v 1.2 2004/04/17 17:08:37 minskim Exp $
 
-SHA1 (am-10.9b.tgz) = 443c1fe9a66c24ea27d93de5c864ab0b83dcd3a2
-Size (am-10.9b.tgz) = 104823 bytes
-SHA1 (patch-aa) = 194e98949804567c125181251b3339fed10b114f
+SHA1 (mathomatic-11.0b/am.tgz) = 88e0eaeca53c34a5da4df00a0cb58374aef2a43a
+Size (mathomatic-11.0b/am.tgz) = 109458 bytes
+SHA1 (patch-aa) = b5b1336df22a9381c3d748e4e49f0429ca773c47
diff --git a/math/mathomatic/patches/patch-aa b/math/mathomatic/patches/patch-aa
index da22db1a374..64e40c9430c 100644
--- a/math/mathomatic/patches/patch-aa
+++ b/math/mathomatic/patches/patch-aa
@@ -1,32 +1,36 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/31 18:14:08 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/17 17:08:37 minskim Exp $
 
---- makefile.orig	2004-03-21 18:58:00.000000000 -0700
+--- makefile.orig	2004-04-12 14:05:50.000000000 -0500
 +++ makefile
-@@ -1,54 +1,22 @@
+@@ -1,18 +1,21 @@
  # Makefile for compiling Mathomatic for UNIX or Linux.
  
--#CC		= cc
--
--CFLAGS		= -c -DUNIX
--LFLAGS		= -s
+-CFLAGS		= -c -O -DUNIX
+-LDFLAGS		= -s
++#CFLAGS		= -c -O -DUNIX
++#LDFLAGS		= -s
+ 
  # To use readline, uncomment the following two lines:
- #CFLAGS		= -c -DUNIX -DREADLINE
- #LFLAGS		= -s -lreadline -lcurses
+ #CFLAGS		+= -DREADLINE
+ #LDFLAGS	+= -lreadline -lcurses
  
--INSTALL_DIR	= /usr/local
-+INSTALL_DIR	= ${PREFIX}
+-PREFIX	= /usr/local
++#PREFIX	= /usr/local
  
--AOUT	=am
-+AOUT	= am
+ 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 $<
++	${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
 -
@@ -59,13 +63,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/31 18:14:08 minskim Exp $
 -
 -list.o: list.c am.h externs.h
 -	$(CC) $(CFLAGS) $*.c
-+$(OBJECTS): am.h externs.h
++${OBJECTS}: am.h externs.h
  
  $(AOUT): $(OBJECTS)
- 	$(CC) $(LFLAGS) $(OBJECTS) -lm -o $(AOUT)
-@@ -59,4 +27,4 @@ install: $(AOUT)
+ 	$(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 *.o
-+	rm -f $(OBJECTS)
+-	rm -f *.o
++	rm -f ${OBJECTS}