Update to 1.8.4. Parts of patch-ae were merged upstream.

(Bug fixes only from 1.8.3.)

3 files changed, 13 insertions, 34 deletions

diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 640dfe4d534..6faac6ddcf4 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2008/01/04 18:17:16 joerg Exp $
+# $NetBSD: Makefile,v 1.81 2008/02/19 23:33:35 gdt Exp $
 
-DISTNAME=		guile-1.8.3
+DISTNAME=		guile-1.8.4
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index b1d5fb14959..7d369f82108 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2008/01/03 13:30:26 gdt Exp $
+$NetBSD: distinfo,v 1.34 2008/02/19 23:33:35 gdt Exp $
 
-SHA1 (guile-1.8.3.tar.gz) = 26cf7b70d4caff8fe2a5fbcc363f2457bc591c2b
-RMD160 (guile-1.8.3.tar.gz) = 6255e99dbd175700dba6b861aaa64631c5bd6d49
-Size (guile-1.8.3.tar.gz) = 3871450 bytes
+SHA1 (guile-1.8.4.tar.gz) = 1e80fe242acfde2bfa39fd1e8409a8f010e24e2b
+RMD160 (guile-1.8.4.tar.gz) = 58a502e553519b7f4e409ede361ad12141f20fec
+Size (guile-1.8.4.tar.gz) = 3821388 bytes
 SHA1 (patch-aa) = 37fdeb8171b13468bfd0fa4e45aaf1770b8668ea
-SHA1 (patch-ae) = 479e1f1452c0589910aa757087743fa18f4de994
+SHA1 (patch-ae) = c3e5065408082978df5b6ddd62e47dda8ab41f40
 SHA1 (patch-ag) = 8aeb781ba43597f37b1ce4aaa2fb0baba2e4ce9c
 SHA1 (patch-ah) = 7a33742c2b4ae21a6e673ceeccc48ccae6a26ba3
 SHA1 (patch-aj) = bcb095105f4a956a1766052893f0545f22e8b25f
diff --git a/lang/guile/patches/patch-ae b/lang/guile/patches/patch-ae
index bff30bbadcf..41b1316606a 100644
--- a/lang/guile/patches/patch-ae
+++ b/lang/guile/patches/patch-ae
@@ -1,22 +1,10 @@
-$NetBSD: patch-ae,v 1.13 2007/07/20 00:09:22 gdt Exp $
+$NetBSD: patch-ae,v 1.14 2008/02/19 23:33:35 gdt Exp $
 
 support for NetBSD/alpha, NetBSD/sparc64, and NetBSD/x86_64
 
---- libguile/gc_os_dep.c.orig	2007-05-09 16:22:03.000000000 -0400
+--- libguile/gc_os_dep.c.orig	2008-02-16 13:50:24.000000000 -0500
 +++ libguile/gc_os_dep.c
-@@ -110,6 +110,11 @@ typedef int GC_bool;
- #    define OPENBSD
- #    define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__alpha__)
-+#    define ALPHA
-+#    define NETBSD
-+#    define mach_type_known
-+# endif
- # if defined(__NetBSD__) && defined(__powerpc__)
- #    define POWERPC
- #    define NETBSD
-@@ -127,7 +132,7 @@ typedef int GC_bool;
+@@ -132,7 +132,7 @@ typedef int GC_bool;
  #    define NETBSD
  #    define mach_type_known
  # endif
@@ -25,16 +13,7 @@ support for NetBSD/alpha, NetBSD/sparc64, and NetBSD/x86_64
  #    define SPARC
  #    define NETBSD
  #    define mach_type_known
-@@ -246,7 +251,7 @@ typedef int GC_bool;
- # endif
- # if defined(__alpha) || defined(__alpha__)
- #   define ALPHA
--#   if !defined(LINUX)
-+#   if !defined(LINUX) && !defined(NETBSD)
- #     define OSF1	/* a.k.a Digital Unix */
- #   endif
- #   define mach_type_known
-@@ -299,6 +304,11 @@ typedef int GC_bool;
+@@ -304,6 +304,11 @@ typedef int GC_bool;
  #   define NETBSD
  #   define mach_type_known
  # endif
@@ -46,7 +25,7 @@ support for NetBSD/alpha, NetBSD/sparc64, and NetBSD/x86_64
  # if defined(bsdi) && defined(i386)
  #    define I386
  #    define BSDI
-@@ -439,12 +449,12 @@ scm_get_stack_base ()
+@@ -444,12 +449,12 @@ scm_get_stack_base ()
  /*
   * For each architecture and OS, the following need to be defined:
   *
@@ -62,7 +41,7 @@ support for NetBSD/alpha, NetBSD/sparc64, and NetBSD/x86_64
   *
   * MACH_TYPE is a string representation of the machine type.
   * OS_TYPE is analogous for the OS.
-@@ -989,6 +999,21 @@ scm_get_stack_base ()
+@@ -994,6 +999,21 @@ scm_get_stack_base ()
  #    endif
  # endif