2 files changed, 41 insertions, 33 deletions

diff --git a/math/yacas/files/patch-configure b/math/yacas/files/patch-configure
index 90931a95f3c3..04aba66cf229 100644
--- a/math/yacas/files/patch-configure
+++ b/math/yacas/files/patch-configure
@@ -1,32 +1,41 @@
---- configure.orig	Fri May 24 06:40:55 2002
-+++ configure	Fri May 24 14:38:40 2002
-@@ -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
+--- configure.orig	Sat Jan 18 22:23:21 2003
++++ configure	Sat Mar 15 11:51:16 2003
+@@ -6932,9 +6932,9 @@
+   gmp)
+     echo "$as_me:$LINENO: result: gmp" >&5
+ echo "${ECHO_T}gmp" >&6
+-    echo "$as_me:$LINENO: checking for __gmpz_init in -lgmp" >&5
+-echo $ECHO_N "checking for __gmpz_init in -lgmp... $ECHO_C" >&6
+-if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then
++    echo "$as_me:$LINENO: checking for mpz_init in -lgmp" >&5
++echo $ECHO_N "checking for mpz_init in -lgmp... $ECHO_C" >&6
++if test "${ac_cv_lib_gmp_mpz_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1977,13 +1977,14 @@
- cat > conftest.$ac_ext <<EOF
- #line 1979 "configure"
+   ac_check_lib_save_LIBS=$LIBS
+@@ -6942,6 +6942,7 @@
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
  #include "confdefs.h"
 +#include <gmp.h>
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -6949,7 +6950,6 @@
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char __gmpz_init();
- 
- int main() {
--__gmpz_init()
+    builtin and then its argument prototype would still apply.  */
+-char __gmpz_init ();
+ #ifdef F77_DUMMY_MAIN
+ #  ifdef __cplusplus
+      extern "C"
+@@ -6959,7 +6959,8 @@
+ int
+ main ()
+ {
+-__gmpz_init ();
 +mpz_t integ;
 +mpz_init(integ)
- ; return 0; }
- EOF
- if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ;
+   return 0;
+ }
diff --git a/math/yacas/files/patch-gmpnumbers.cpp b/math/yacas/files/patch-gmpnumbers.cpp
index d78fa944dc2c..25243ed17c3e 100644
--- a/math/yacas/files/patch-gmpnumbers.cpp
+++ b/math/yacas/files/patch-gmpnumbers.cpp
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/gmpnumbers.cpp.orig	Tue Dec 10 01:30:35 2002
++++ src/gmpnumbers.cpp	Sat Mar 15 12:02:41 2003
+@@ -81,25 +81,19 @@
  
  void initGMPNumber(GMPNumber& x, GMPNumber& y)
  {
@@ -11,8 +11,7 @@
    x.exp = y.exp;
  }
  
--void initGMPNumber(GMPNumber& x, long y=0)
-+void initGMPNumber(GMPNumber& x, long y)
+ void initGMPNumber(GMPNumber& x, long y)
  {
 -  mpz_t man;
 -  mpz_init_set_ui(man,y);
@@ -30,7 +29,7 @@
    x.exp = 0;
  }
  
-@@ -137,11 +131,9 @@
+@@ -148,11 +142,9 @@
      exp++;
    }
    if (!*man) {*man='0';*(man+1)='\0';neg=0;exp=0;}
@@ -44,7 +43,7 @@
    x.exp=exp;
  }
  
-@@ -158,7 +150,7 @@
+@@ -169,7 +161,7 @@
    free(str);
  }
  
@@ -53,7 +52,7 @@
  {
    long rawsize = mpz_sizeinbase(x.man,10);
    size_t size;
-@@ -229,7 +221,7 @@
+@@ -240,7 +232,7 @@
  }
  
  static LispStringPtr GMPNumberToString(GMPNumber& x, LispHashTable& h,