4 files changed, 20 insertions, 126 deletions
diff --git a/math/yacas/files/patch-configure b/math/yacas/files/patch-configure
deleted file mode 100644
index 04aba66cf229..000000000000
--- a/math/yacas/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
-   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 ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -6959,7 +6959,8 @@
- int
- main ()
- {
--__gmpz_init ();
-+mpz_t integ;
-+mpz_init(integ)
-   ;
-   return 0;
- }
diff --git a/math/yacas/files/patch-gmpnumbers.cpp b/math/yacas/files/patch-gmpnumbers.cpp
deleted file mode 100644
index 798dc8e26a7f..000000000000
--- a/math/yacas/files/patch-gmpnumbers.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
---- src/gmpnumbers.cpp.orig	Tue Dec 10 01:30:35 2002
-+++ src/gmpnumbers.cpp	Fri Apr 11 02:53:35 2003
-@@ -6,6 +6,7 @@
-  */
- 
- #include <gmp.h>
-+#include <math.h>
- // do not use math.h without necessity
- /*
- #ifdef HAVE_MATH_H
-@@ -81,25 +82,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)
- {
--  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;
- }
- 
-@@ -148,11 +143,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;
- }
- 
-@@ -169,7 +162,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;
-@@ -240,7 +233,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/files/patch-ltmain.sh b/math/yacas/files/patch-ltmain.sh
index 2679e2491847..08dcf20604e8 100644
--- a/math/yacas/files/patch-ltmain.sh
+++ b/math/yacas/files/patch-ltmain.sh
@@ -1,15 +1,10 @@
---- ltmain.sh.orig	Fri Apr 11 02:52:51 2003
-+++ ltmain.sh	Fri Apr 11 02:53:05 2003
-@@ -4318,10 +4318,12 @@
- 	fi
+--- ltmain.sh.orig	Mon Mar 10 05:53:57 2003
++++ ltmain.sh	Wed May 21 14:17:14 2003
+@@ -973,6 +973,7 @@
+ 	;;
  
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
diff --git a/math/yacas/files/patch-src::Makefile.in b/math/yacas/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..93fdc585b500
--- /dev/null
+++ b/math/yacas/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Wed May 21 05:56:37 2003
++++ src/Makefile.in	Wed May 21 12:55:31 2003
+@@ -791,7 +791,7 @@
+ 	grep '^CORE_KERNEL_FUNCTION' $(srcdir)/yacasmain.cpp > $@
+ 
+ $(srcdir)/libmath.cpp: yacas $(top_srcdir)/scripts/base.rep/math.ys gencorefunctions core_yacasmain.h 
+-	(cd ../scripts && make packages.ys corefunctions.ys)
++	(cd ../scripts && $(MAKE) packages.ys corefunctions.ys)
+ 	echo "Set(LoadPlugIns,False);Use(\"yacasinit.ys\");" > compileinit.txt
+ 	echo "CompileCpp(\"base.rep/math.ys\",\"libmath\");" > compile.txt
+ 	./yacas --rootdir  $(srcdir)/../scripts:../scripts -pc --init compileinit.txt compile.txt