many bug fixes and improvements such as:

* small improvement to Arg(...) working on real numbers.
* improved 'make test', no need to install before test any more.
* VarList can now accept a second argument, a filter predicate.
* Pattern     matcher     now    allows    extended    prototypes,    like
  PP(list_Contains("a")) <-- ... etcetera.
* c-style  tokenizer  using CTokenizer() (DefaultTokenizer() switches back
  to the default tokenizer).
* Great speed-up of function Assoc.
* Christian   Obrecht   implemented  the  Rabin-Miller  primality  testing
  algorithm, which greatly improves the speed of IsPrime.
* Orthogonal      polynomials     OrthoP,     OrthoP,OrthoG,OrthoH,OrthoL,
  OrthoT,OrthoU implemented by Serge Winitzki.
* various  speedups,  and  a  new memory manager, optimized for allocating
  many small blocks (which is the case in Yacas).
* Changed the directory structure for the script files
* Greatly improved Simplify function.
* Added CurrentFile, CurrentLine functions
* Implemented  backquote  mechanism:  `(...) will substitute every @a with
  the  evaluation  of  a  (and  if  a  is  a function the function name is
  replaced).  The  end  result  is  evaluated. see substitute.cpp for more
  details

many more...  see http://www.xs4all.nl/~apinkus/changes.html for the complete
list.

5 files changed, 173 insertions, 139 deletions

diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index 0823ce03bc5..f925050e31d 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,27 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2001/05/05 23:54:47 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/19 01:09:25 dmcmahill Exp $
 #
 
-DISTNAME=	yacas-latest
-PKGNAME=	yacas-1.0.43
+DISTNAME=	yacas-1.0.48
 CATEGORIES=	math
-MASTER_SITES=	http://www.xs4all.nl/~apinkus/
+MASTER_SITES=	http://www.xs4all.nl/~apinkus/backups/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.xs4all.nl/~apinkus/yacas.html
 COMMENT=	Yet Another Computer Algebra System
 
-DIST_SUBDIR=	${PKGNAME}
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	YES
 
-post-patch:
-	cd ${WRKSRC}; ${SED} 's|@prefix@|${PREFIX}|g' yacas.sh.in > \
-	  yacas.sh
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/yacas.sh ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/yacas.el ${PREFIX}/share/emacs/site-lisp
 
+test: build
+	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} test 2>&1 | \
+		tee ${WRKDIR}/tests.log
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/PLIST b/math/yacas/PLIST
index c0f936fbcd6..3e730671595 100644
--- a/math/yacas/PLIST
+++ b/math/yacas/PLIST
@@ -1,29 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:34:32 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/19 01:09:25 dmcmahill Exp $
 bin/yacas
-bin/yacas.sh
 bin/yacas_client
 share/emacs/site-lisp/yacas.el
+share/yacas/Makefile
+share/yacas/Makefile.am
+share/yacas/Makefile.in
 share/yacas/addons/README
-share/yacas/addons/editvi
-share/yacas/addons/editvi.def
-share/yacas/addons/gnuplot
-share/yacas/addons/gnuplot.def
-share/yacas/array
-share/yacas/array.def
-share/yacas/assoc
-share/yacas/assoc.def
-share/yacas/c_form
-share/yacas/complex
-share/yacas/complex.def
-share/yacas/constants
-share/yacas/controlflow
-share/yacas/controlflow.def
-share/yacas/cstubgen
-share/yacas/deffunc
-share/yacas/deriv
-share/yacas/deriv.def
+share/yacas/addons/editvi.ys
+share/yacas/addons/editvi.ys.def
+share/yacas/addons/gnuplot.ys
+share/yacas/addons/gnuplot.ys.def
+share/yacas/array.rep/code.ys
+share/yacas/array.rep/code.ys.def
+share/yacas/assoc.rep/code.ys
+share/yacas/assoc.rep/code.ys.def
+share/yacas/c_form.rep/code.ys
+share/yacas/c_form.rep/code.ys.def
+share/yacas/complex.rep/code.ys
+share/yacas/complex.rep/code.ys.def
+share/yacas/constants.rep/code.ys
+share/yacas/constants.rep/code.ys.def
+share/yacas/controlflow.rep/code.ys
+share/yacas/controlflow.rep/code.ys.def
+share/yacas/cstubgen.rep/code.ys
+share/yacas/cstubgen.rep/code.ys.def
+share/yacas/deffunc.rep/code.ys
+share/yacas/deffunc.rep/code.ys.def
+share/yacas/deriv.rep/code.ys
+share/yacas/deriv.rep/code.ys.def
 share/yacas/documentation/books.html
-share/yacas/documentation/coding.html
 share/yacas/documentation/codingchapter1.html
 share/yacas/documentation/codingchapter2.html
 share/yacas/documentation/codingchapter3.html
@@ -37,7 +42,6 @@ share/yacas/documentation/introchapter2.html
 share/yacas/documentation/introchapter3.html
 share/yacas/documentation/introchapters.html
 share/yacas/documentation/intromanual.html
-share/yacas/documentation/isboolean.html
 share/yacas/documentation/manicon.html
 share/yacas/documentation/ref.html
 share/yacas/documentation/refchapter1.html
@@ -46,6 +50,7 @@ share/yacas/documentation/refchapter11.html
 share/yacas/documentation/refchapter12.html
 share/yacas/documentation/refchapter13.html
 share/yacas/documentation/refchapter14.html
+share/yacas/documentation/refchapter15.html
 share/yacas/documentation/refchapter2.html
 share/yacas/documentation/refchapter3.html
 share/yacas/documentation/refchapter4.html
@@ -63,69 +68,142 @@ share/yacas/documentation/refprogchapter4.html
 share/yacas/documentation/refprogchapters.html
 share/yacas/documentation/refprogmanual.html
 share/yacas/documentation/yacaslogo.gif
-share/yacas/example
-share/yacas/example.def
-share/yacas/factors
-share/yacas/factors.def
-share/yacas/fakedb
-share/yacas/fakedb.def
-share/yacas/formula
-share/yacas/formula.def
-share/yacas/functional
-share/yacas/functional.def
-share/yacas/glview
-share/yacas/html
-share/yacas/html.def
-share/yacas/integrate
-share/yacas/integrate.def
-share/yacas/linalg
-share/yacas/linalg.def
-share/yacas/lists
-share/yacas/lists.def
-share/yacas/logic
-share/yacas/logic.def
-share/yacas/newly
-share/yacas/newly.def
-share/yacas/numbers
-share/yacas/numbers.def
-share/yacas/padic
-share/yacas/padic.def
-share/yacas/patterns
-share/yacas/patterns.def
-share/yacas/predicates
-share/yacas/predicates.def
-share/yacas/print
-share/yacas/random
-share/yacas/random.def
-share/yacas/simplify
-share/yacas/simplify.def
-share/yacas/solve
-share/yacas/solve.def
-share/yacas/standard
-share/yacas/stats
-share/yacas/stats.def
-share/yacas/stdfuncs
-share/yacas/stdfuncs.def
-share/yacas/stdopers
-share/yacas/stubs
-share/yacas/stubs.def
-share/yacas/substitute
-share/yacas/substitute.def
-share/yacas/sums
-share/yacas/sums.def
-share/yacas/tensor
-share/yacas/tensor.def
-share/yacas/testers
-share/yacas/testers.def
-share/yacas/texform
-share/yacas/texform.def
-share/yacas/trigsimp
-share/yacas/trigsimp.def
-share/yacas/univar
-share/yacas/univar.def
-share/yacas/yacasinit
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
+share/yacas/example.rep/code.ys
+share/yacas/example.rep/code.ys.def
+share/yacas/examples/benchbuild.ys
+share/yacas/examples/benchmark.ys
+share/yacas/examples/benchmark2.ys
+share/yacas/examples/findsum.ys
+share/yacas/examples/goldbach.ys
+share/yacas/examples/queens.ys
+share/yacas/examples/series.ys
+share/yacas/examples/tests.ys
+share/yacas/factors.rep/code.ys
+share/yacas/factors.rep/code.ys.def
+share/yacas/fakedb.rep/code.ys
+share/yacas/fakedb.rep/code.ys.def
+share/yacas/formula.rep/code.ys
+share/yacas/formula.rep/code.ys.def
+share/yacas/functional.rep/code.ys
+share/yacas/functional.rep/code.ys.def
+share/yacas/glview.ys
+share/yacas/html.rep/code.ys
+share/yacas/html.rep/code.ys.def
+share/yacas/integrate.rep/code.ys
+share/yacas/integrate.rep/code.ys.def
+share/yacas/limit.rep/code.ys
+share/yacas/limit.rep/code.ys.def
+share/yacas/linalg.rep/code.ys
+share/yacas/linalg.rep/code.ys.def
+share/yacas/lists.rep/code.ys
+share/yacas/lists.rep/code.ys.def
+share/yacas/localrules.rep/code.ys
+share/yacas/localrules.rep/code.ys.def
+share/yacas/logic.rep/code.ys
+share/yacas/logic.rep/code.ys.def
+share/yacas/multivar.rep/code.ys
+share/yacas/multivar.rep/code.ys.def
+share/yacas/newly.rep/code.ys
+share/yacas/newly.rep/code.ys.def
+share/yacas/numbers.rep/code.ys
+share/yacas/numbers.rep/code.ys.def
+share/yacas/odesolver.rep/code.ys
+share/yacas/odesolver.rep/code.ys.def
+share/yacas/openmath.rep/code.ys
+share/yacas/openmath.rep/code.ys.def
+share/yacas/orthopoly.rep/code.ys
+share/yacas/orthopoly.rep/code.ys.def
+share/yacas/padic.rep/code.ys
+share/yacas/padic.rep/code.ys.def
+share/yacas/patterns.rep/code.ys
+share/yacas/patterns.rep/code.ys.def
+share/yacas/predicates.rep/code.ys
+share/yacas/predicates.rep/code.ys.def
+share/yacas/print.ys
+share/yacas/pslq.rep/code.ys
+share/yacas/pslq.rep/code.ys.def
+share/yacas/rabinmiller.rep/code.ys
+share/yacas/rabinmiller.rep/code.ys.def
+share/yacas/radsimp.rep/code.ys
+share/yacas/radsimp.rep/code.ys.def
+share/yacas/random.rep/code.ys
+share/yacas/random.rep/code.ys.def
+share/yacas/simplify.rep/code.ys
+share/yacas/simplify.rep/code.ys.def
+share/yacas/solve.rep/code.ys
+share/yacas/solve.rep/code.ys.def
+share/yacas/standard.ys
+share/yacas/stats.rep/code.ys
+share/yacas/stats.rep/code.ys.def
+share/yacas/stdfuncs.rep/code.ys
+share/yacas/stdfuncs.rep/code.ys.def
+share/yacas/stdopers.ys
+share/yacas/stubs.rep/code.ys
+share/yacas/stubs.rep/code.ys.def
+share/yacas/substitute.rep/code.ys
+share/yacas/substitute.rep/code.ys.def
+share/yacas/sums.rep/code.ys
+share/yacas/sums.rep/code.ys.def
+share/yacas/tensor.rep/code.ys
+share/yacas/tensor.rep/code.ys.def
+share/yacas/testers.rep/code.ys
+share/yacas/testers.rep/code.ys.def
+share/yacas/texform.rep/code.ys
+share/yacas/texform.rep/code.ys.def
+share/yacas/trigsimp.rep/code.ys
+share/yacas/trigsimp.rep/code.ys.def
+share/yacas/univar.rep/code.ys
+share/yacas/univar.rep/code.ys.def
+share/yacas/yacasinit.ys
+@dirrm share/yacas/univar.rep
+@dirrm share/yacas/trigsimp.rep
+@dirrm share/yacas/texform.rep
+@dirrm share/yacas/testers.rep
+@dirrm share/yacas/tensor.rep
+@dirrm share/yacas/sums.rep
+@dirrm share/yacas/substitute.rep
+@dirrm share/yacas/stubs.rep
+@dirrm share/yacas/stdfuncs.rep
+@dirrm share/yacas/stats.rep
+@dirrm share/yacas/solve.rep
+@dirrm share/yacas/simplify.rep
+@dirrm share/yacas/random.rep
+@dirrm share/yacas/radsimp.rep
+@dirrm share/yacas/rabinmiller.rep
+@dirrm share/yacas/pslq.rep
+@dirrm share/yacas/predicates.rep
+@dirrm share/yacas/patterns.rep
+@dirrm share/yacas/padic.rep
+@dirrm share/yacas/orthopoly.rep
+@dirrm share/yacas/openmath.rep
+@dirrm share/yacas/odesolver.rep
+@dirrm share/yacas/numbers.rep
+@dirrm share/yacas/newly.rep
+@dirrm share/yacas/multivar.rep
+@dirrm share/yacas/logic.rep
+@dirrm share/yacas/localrules.rep
+@dirrm share/yacas/lists.rep
+@dirrm share/yacas/linalg.rep
+@dirrm share/yacas/limit.rep
+@dirrm share/yacas/integrate.rep
+@dirrm share/yacas/html.rep
+@dirrm share/yacas/functional.rep
+@dirrm share/yacas/formula.rep
+@dirrm share/yacas/fakedb.rep
+@dirrm share/yacas/factors.rep
+@dirrm share/yacas/examples
+@dirrm share/yacas/example.rep
 @dirrm share/yacas/documentation
+@dirrm share/yacas/deriv.rep
+@dirrm share/yacas/deffunc.rep
+@dirrm share/yacas/cstubgen.rep
+@dirrm share/yacas/controlflow.rep
+@dirrm share/yacas/constants.rep
+@dirrm share/yacas/complex.rep
+@dirrm share/yacas/c_form.rep
+@dirrm share/yacas/assoc.rep
+@dirrm share/yacas/array.rep
 @dirrm share/yacas/addons
 @dirrm share/yacas
+@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
+@unexec rmdir %D/share/emacs 2>/dev/null || true
diff --git a/math/yacas/distinfo b/math/yacas/distinfo
index 3d00eac88d4..7a3a3b2fc38 100644
--- a/math/yacas/distinfo
+++ b/math/yacas/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 08:45:46 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/12/19 01:09:25 dmcmahill Exp $
 
-SHA1 (yacas-1.0.43/yacas-latest.tar.gz) = eff3e8eb9264f2b6a236f0933ee3dcbcf05ef5a9
-Size (yacas-1.0.43/yacas-latest.tar.gz) = 538867 bytes
-SHA1 (patch-aa) = 58e0fbd4460c45f258e32550dedf59d348dfdd76
-SHA1 (patch-ad) = 4ea45ffba21a863a294419deae629c1524e4a3fa
+SHA1 (yacas-1.0.48.tar.gz) = a4099347971063d3080858d4c6203a82e3fec914
+Size (yacas-1.0.48.tar.gz) = 796932 bytes
diff --git a/math/yacas/patches/patch-aa b/math/yacas/patches/patch-aa
deleted file mode 100644
index 6956b82432c..00000000000
--- a/math/yacas/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/12/05 19:02:05 drochner Exp $
-
---- src/Makefile.in.orig	Sun Nov 19 01:39:17 2000
-+++ src/Makefile.in	Tue Nov 28 11:07:23 2000
-@@ -89,7 +89,7 @@
- # supports elf binaries?
- #
- 
--yacas_LDFLAGS = -ldl -rdynamic
-+yacas_LDFLAGS = -Wl,--export-dynamic
- 
- testnum_SOURCES = anumber.cpp grower.cpp lispstring.cpp stdstubs.cpp 	testnum.cpp mathutil.cpp
- 
diff --git a/math/yacas/patches/patch-ad b/math/yacas/patches/patch-ad
deleted file mode 100644
index 6fd2ca2dbc8..00000000000
--- a/math/yacas/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/02/20 14:40:35 dmcmahill Exp $
-
---- /dev/null	Sun Feb 20 09:00:11 2000
-+++ yacas.sh.in	Sun Feb 20 09:07:01 2000
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+
-+# save the tty settings
-+stty -a | grep "\-extproc" 2>&1 > /dev/null
-+if [ $? = 0 ]; then
-+  OLD=-extproc
-+else
-+  OLD=extproc
-+fi
-+#OLD=`stty -g`
-+
-+# make sure one critical tty setting is correct
-+stty -extproc
-+
-+# run yacas
-+@prefix@/bin/yacas $*
-+
-+# restore the tty setting
-+stty $OLD
-+