5 files changed, 14 insertions, 71 deletions

diff --git a/lang/guile/files/patch-configure b/lang/guile/files/patch-configure
deleted file mode 100644
index 81d7a1afe898..000000000000
--- a/lang/guile/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Jun 19 13:40:51 2002
-+++ configure	Wed Jun 19 13:41:14 2002
-@@ -8469,6 +8469,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/lang/guile/files/patch-guile-readline_configure b/lang/guile/files/patch-guile-readline_configure
deleted file mode 100644
index fc197681536b..000000000000
--- a/lang/guile/files/patch-guile-readline_configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- guile-readline/configure.orig	Wed Jun 19 13:58:18 2002
-+++ guile-readline/configure	Wed Jun 19 13:58:31 2002
-@@ -7316,6 +7316,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/lang/guile/files/patch-libguile_load.c b/lang/guile/files/patch-libguile_load.c
index 6cc5eb43b0b6..8d6b0ade5c9a 100644
--- a/lang/guile/files/patch-libguile_load.c
+++ b/lang/guile/files/patch-libguile_load.c
@@ -1,11 +1,16 @@
---- libguile/load.c.orig	Tue Feb  4 21:05:24 2003
-+++ libguile/load.c	Tue Feb  4 21:19:39 2003
-@@ -239,6 +239,8 @@
-   path = scm_listify (scm_makfrom0str (SCM_SITE_DIR),
- 		      scm_makfrom0str (SCM_LIBRARY_DIR),
- 		      scm_makfrom0str (SCM_PKGDATA_DIR),
-+		      scm_makfrom0str ("%%X11BASE%%/share/guile"),
-+		      scm_makfrom0str ("%%LOCALBASE%%/share/guile"),
- 		      SCM_UNDEFINED);
+--- libguile/load.c.orig	Sat Dec  7 17:41:32 2002
++++ libguile/load.c	Wed Apr 30 22:55:23 2003
+@@ -247,9 +247,11 @@
+   SCM path = SCM_EOL;
+ 
+ #ifdef SCM_LIBRARY_DIR
+-  path = scm_list_3 (scm_makfrom0str (SCM_SITE_DIR),
++  path = scm_list_5 (scm_makfrom0str (SCM_SITE_DIR),
+ 		     scm_makfrom0str (SCM_LIBRARY_DIR),
+-		     scm_makfrom0str (SCM_PKGDATA_DIR));
++		     scm_makfrom0str (SCM_PKGDATA_DIR),
++		     scm_makfrom0str ("/usr/X11R6/share/guile"),
++		     scm_makfrom0str ("/usr/local%%/share/guile"));
  #endif /* SCM_LIBRARY_DIR */
  
+   path = scm_internal_parse_path (getenv ("GUILE_LOAD_PATH"), path);
diff --git a/lang/guile/files/patch-libguile_numbers.c b/lang/guile/files/patch-libguile_numbers.c
deleted file mode 100644
index 2ba35040ab81..000000000000
--- a/lang/guile/files/patch-libguile_numbers.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libguile/numbers.c.orig	Thu Apr  3 23:52:25 2003
-+++ libguile/numbers.c	Thu Apr  3 23:52:41 2003
-@@ -89,8 +89,8 @@
- /* Return true if X is not infinite and is not a NaN
-    Dirk:FIXME:: Since IS_INF is broken, this test does not work if x == 0
-  */
--#ifndef isfinite
--#define isfinite(x) (!IS_INF (x) && (x) == (x))
-+#ifndef xxx_isfinite
-+#define xxx_isfinite(x) (!IS_INF (x) && (x) == (x))
- #endif
- 
- 
-@@ -4071,7 +4071,7 @@
-     if (SCM_FIXABLE (lu)) {
-       return SCM_MAKINUM (lu);
- #ifdef SCM_BIGDIG
--    } else if (isfinite (u)) {
-+    } else if (xxx_isfinite (u)) {
-       return scm_dbl2big (u);
- #endif
-     } else {
diff --git a/lang/guile/files/patch-qt_md_axp.s b/lang/guile/files/patch-qt_md_axp.s
deleted file mode 100644
index 3bdc817eb859..000000000000
--- a/lang/guile/files/patch-qt_md_axp.s
+++ /dev/null
@@ -1,20 +0,0 @@
---- qt/md/axp.s.orig	Thu Sep 26 22:19:15 2002
-+++ qt/md/axp.s	Thu Sep 26 22:30:31 2002
-@@ -15,7 +15,7 @@
- 
- 	.text
- 	.align 4
--	.file 2 "axp.s"
-+	.file  "axp.s"
- 
- 	.globl qt_block
- 	.globl qt_blocki
-@@ -117,7 +117,7 @@
- 	jsr $26,($27),0		# Call `cleanup'.
- 
- 	jsr $26,qt_error	# Cleanup erroniously returned.
--	.end qt_start
-+	.end qt_vstart
- 
- 
- 	#