From submitter:

- Update to 1.0.53rev1.
- Chase math/libgmp4 version.
- Fix compilation with GCC3 when WITH_GMP is defined.

Submitted by:	marius@alchemy.franken.de

5 files changed, 117 insertions, 11 deletions

diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index bb7d2dfc31d0..872e52466cd1 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	yacas
-PORTVERSION=	1.0.52
+PORTVERSION=	1.0.53r1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +23,7 @@ USE_PERL5=	yes
 
 .if defined(WITH_GMP)
 .if ${OSVERSION} >= 500000
-LIB_DEPENDS+=	gmp.5:${PORTSDIR}/math/libgmp4
+LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 .endif
diff --git a/math/yacas/distinfo b/math/yacas/distinfo
index bff9fbfd6899..c0a5fcfcae04 100644
--- a/math/yacas/distinfo
+++ b/math/yacas/distinfo
@@ -1 +1 @@
-MD5 (yacas-1.0.52.tar.gz) = f86573d314c2335540e04eb869fd9717
+MD5 (yacas-1.0.53rev1.tar.gz) = 2e938e2ec8f7552259439f2a5909803e
diff --git a/math/yacas/files/patch-configure b/math/yacas/files/patch-configure
index d39097c61149..90931a95f3c3 100644
--- a/math/yacas/files/patch-configure
+++ b/math/yacas/files/patch-configure
@@ -1,19 +1,32 @@
 --- configure.orig	Fri May 24 06:40:55 2002
 +++ configure	Fri May 24 14:38:40 2002
-@@ -1787,13 +1787,14 @@
+@@ -1966,9 +1966,9 @@
+ fi
+ 
+ if test "$enable_gmp" = "yes" ; then
+-	echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6
+-echo "configure:1971: checking for __gmpz_init in -lgmp" >&5
+-ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'`
++	echo $ac_n "checking for mpz_init in -lgmp""... $ac_c" 1>&6
++echo "configure:1971: checking for mpz_init in -lgmp" >&5
++ac_lib_var=`echo gmp'_'mpz_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1977,13 +1977,14 @@
  cat > conftest.$ac_ext <<EOF
- #line 1789 "configure"
+ #line 1979 "configure"
  #include "confdefs.h"
 +#include <gmp.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
      builtin and then its argument prototype would still apply.  */
--char mpz_init();
+-char __gmpz_init();
  
  int main() {
--mpz_init()
+-__gmpz_init()
 +mpz_t integ;
 +mpz_init(integ)
  ; return 0; }
  EOF
- if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/math/yacas/files/patch-gmpnumbers.cpp b/math/yacas/files/patch-gmpnumbers.cpp
new file mode 100644
index 000000000000..d78fa944dc2c
--- /dev/null
+++ b/math/yacas/files/patch-gmpnumbers.cpp
@@ -0,0 +1,64 @@
+--- src/gmpnumbers.cpp.orig	Sat Jan  4 21:21:22 2003
++++ src/gmpnumbers.cpp	Sat Jan  4 22:22:56 2003
+@@ -70,25 +70,19 @@
+ 
+ void initGMPNumber(GMPNumber& x, GMPNumber& y)
+ {
+-  mpz_t man;
+-  mpz_init_set(man,y.man);
+-  x.man = man;
++  mpz_init_set(x.man,y.man);
+   x.exp = y.exp;
+ }
+ 
+-void initGMPNumber(GMPNumber& x, long y=0)
++void initGMPNumber(GMPNumber& x, long y)
+ {
+-  mpz_t man;
+-  mpz_init_set_ui(man,y);
+-  x.man = man;
++  mpz_init_set_ui(x.man,y);
+   x.exp = 0;
+ }
+ 
+ void initGMPNumber(GMPNumber& x, mpz_t mpz)
+ {
+-  mpz_t man;
+-  mpz_init_set(man,mpz);
+-  x.man = man;
++  mpz_init_set(x.man,mpz);
+   x.exp = 0;
+ }
+ 
+@@ -137,11 +131,9 @@
+     exp++;
+   }
+   if (!*man) {*man='0';*(man+1)='\0';neg=0;exp=0;}
+-  mpz_t ma;
+-  mpz_init_set_str(ma,man,10);
++  mpz_init_set_str(x.man,man,10);
+   free(man);
+-  if(neg)mpz_neg(ma,ma);
+-  x.man=ma;
++  if(neg)mpz_neg(x.man,x.man);
+   x.exp=exp;
+ }
+ 
+@@ -158,7 +150,7 @@
+   free(str);
+ }
+ 
+-char* getstrGMPNumber(GMPNumber& x, long prec=0)
++char* getstrGMPNumber(GMPNumber& x, long prec)
+ {
+   long rawsize = mpz_sizeinbase(x.man,10);
+   size_t size;
+@@ -229,7 +221,7 @@
+ }
+ 
+ static LispStringPtr GMPNumberToString(GMPNumber& x, LispHashTable& h, 
+-                                       LispInt prec=0)
++                                       LispInt prec)
+ {
+   char* result = getstrGMPNumber(x, prec);
+   LispStringPtr toreturn = h.LookUp(result);
diff --git a/math/yacas/pkg-plist b/math/yacas/pkg-plist
index d39cf5dc4f24..f5f0aad6c11c 100644
--- a/math/yacas/pkg-plist
+++ b/math/yacas/pkg-plist
@@ -1,8 +1,6 @@
 bin/yacas
 bin/yacas_client
-share/yacas/Makefile
-share/yacas/Makefile.am
-share/yacas/Makefile.in
+bin/ytxt2tex
 share/yacas/addons/README
 share/yacas/addons/editvi.ys
 share/yacas/addons/editvi.ys.def
@@ -36,6 +34,13 @@ share/yacas/documentation/Algochapter5.html
 share/yacas/documentation/Algochapter6.html
 share/yacas/documentation/Algochapters.html
 share/yacas/documentation/Algomanual.html
+share/yacas/documentation/LispProgrammingchapter1.html
+share/yacas/documentation/LispProgrammingchapter2.html
+share/yacas/documentation/LispProgrammingchapter3.html
+share/yacas/documentation/LispProgrammingchapter4.html
+share/yacas/documentation/LispProgrammingchapter5.html
+share/yacas/documentation/LispProgrammingchapters.html
+share/yacas/documentation/LispProgrammingmanual.html
 share/yacas/documentation/books.html
 share/yacas/documentation/codingchapter1.html
 share/yacas/documentation/codingchapter2.html
@@ -53,6 +58,7 @@ share/yacas/documentation/essayschapter3.html
 share/yacas/documentation/essayschapter4.html
 share/yacas/documentation/essayschapter5.html
 share/yacas/documentation/essayschapter6.html
+share/yacas/documentation/essayschapter7.html
 share/yacas/documentation/essayschapters.html
 share/yacas/documentation/essaysmanual.html
 share/yacas/documentation/introchapter1.html
@@ -72,6 +78,7 @@ share/yacas/documentation/refchapter14.html
 share/yacas/documentation/refchapter15.html
 share/yacas/documentation/refchapter16.html
 share/yacas/documentation/refchapter17.html
+share/yacas/documentation/refchapter18.html
 share/yacas/documentation/refchapter2.html
 share/yacas/documentation/refchapter3.html
 share/yacas/documentation/refchapter4.html
@@ -179,6 +186,7 @@ share/yacas/include/substitute.h
 share/yacas/include/tokenizer.h
 share/yacas/include/unipoly.h
 share/yacas/include/unixcommandline.h
+share/yacas/include/version.h
 share/yacas/include/win32dll.h
 share/yacas/include/xmltokenizer.h
 share/yacas/include/yacas.h
@@ -199,12 +207,17 @@ 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/lists.rep/scopestack.ys
+share/yacas/lists.rep/scopestack.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/logic.rep/om.ys
 share/yacas/maketest
+share/yacas/manmake/book2TeX.sh
+share/yacas/manmake/book2TeX.ys
+share/yacas/manmake/txt2yacasdoc.pl
 share/yacas/multivar.rep/code.ys
 share/yacas/multivar.rep/code.ys.def
 share/yacas/multivar.rep/makemulti.ys
@@ -231,6 +244,8 @@ share/yacas/plots.rep/code.ys
 share/yacas/plots.rep/code.ys.def
 share/yacas/predicates.rep/code.ys
 share/yacas/predicates.rep/code.ys.def
+share/yacas/probability.rep/code.ys
+share/yacas/probability.rep/code.ys.def
 share/yacas/pslq.rep/code.ys
 share/yacas/pslq.rep/code.ys.def
 share/yacas/rabinmiller.rep/code.ys
@@ -249,12 +264,23 @@ share/yacas/specfunc.rep/bessel.ys
 share/yacas/specfunc.rep/bessel.ys.def
 share/yacas/specfunc.rep/code.ys
 share/yacas/specfunc.rep/code.ys.def
+share/yacas/specfunc.rep/gammaconst.ys
+share/yacas/specfunc.rep/gammaconst.ys.def
 share/yacas/specfunc.rep/gamma.ys
 share/yacas/specfunc.rep/gamma.ys.def
 share/yacas/specfunc.rep/zeta.ys
 share/yacas/specfunc.rep/zeta.ys.def
 share/yacas/standard.ys
 share/yacas/standard.ys.def
+share/yacas/statistics.rep/hypothesystest.ys
+share/yacas/statistics.rep/incompletegamma.ys.def
+share/yacas/statistics.rep/regression.ys.def
+share/yacas/statistics.rep/hypothesystest.ys.def
+share/yacas/statistics.rep/randomtest.ys
+share/yacas/statistics.rep/statistics.ys
+share/yacas/statistics.rep/incompletegamma.ys
+share/yacas/statistics.rep/regression.ys
+share/yacas/statistics.rep/statistics.ys.def
 share/yacas/stats.rep/code.ys
 share/yacas/stats.rep/code.ys.def
 share/yacas/stdfuncs.rep/code.ys
@@ -329,6 +355,7 @@ share/yacas/yacasinit.ys
 @dirrm share/yacas/simplify.rep
 @dirrm share/yacas/solve.rep
 @dirrm share/yacas/specfunc.rep
+@dirrm share/yacas/statistics.rep
 @dirrm share/yacas/stats.rep
 @dirrm share/yacas/stdfuncs.rep
 @dirrm share/yacas/stubs.rep
@@ -339,4 +366,6 @@ share/yacas/yacasinit.ys
 @dirrm share/yacas/texform.rep
 @dirrm share/yacas/trigsimp.rep
 @dirrm share/yacas/univar.rep
+@dirrm share/yacas/probability.rep
+@dirrm share/yacas/manmake
 @dirrm share/yacas