Fixed building with newer versions of boehm-gc, which doesn't provide

the GC_quiet variable.

4 files changed, 45 insertions, 2 deletions

diff --git a/lang/gwydion-dylan/Makefile b/lang/gwydion-dylan/Makefile
index 37f1efbbb31..575ff98ab95 100644
--- a/lang/gwydion-dylan/Makefile
+++ b/lang/gwydion-dylan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/10/04 21:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/05 07:14:51 rillig Exp $
 #
 
 DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
@@ -36,6 +36,11 @@ ALT_ARCH=		ppc
 ALT_ARCH=		${MACHINE_ARCH}
 .endif
 
+SUBST_CLASSES+=		gc
+SUBST_STAGE.gc=		pre-configure
+SUBST_FILES.gc=		d2c/runtime/garbage-collection/Makegen
+SUBST_SED.gc=		-e 's,-I/usr/include,-I${LOCALBASE}/include,'
+
 PLIST_SUBST+=		ALT_ARCH=${ALT_ARCH:Q}
 PLIST_SUBST+=		DYLAN_VERSION=${DYLAN_VERSION:Q}
 
diff --git a/lang/gwydion-dylan/distinfo b/lang/gwydion-dylan/distinfo
index 5d7aacbddfc..6cfccd9e23a 100644
--- a/lang/gwydion-dylan/distinfo
+++ b/lang/gwydion-dylan/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2007/10/13 12:19:42 rillig Exp $
+$NetBSD: distinfo,v 1.3 2007/11/05 07:14:51 rillig Exp $
 
 SHA1 (gwydion-dylan-2.4.0.tar.gz) = 6fea71a876013fff94a37f8a84fdc5d8245e8c9f
 RMD160 (gwydion-dylan-2.4.0.tar.gz) = 2bd5218e1dd36182489e1854c92ae6baf5690974
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 9cc842772e56f389572031e0550606c00fc740f5
 SHA1 (patch-ab) = 155336fc1d07f10d675b95d4c2b524b8bfbbaa4e
 SHA1 (patch-ac) = 436d1e853e724c5d4ea4d9c83a6f267124f9402b
 SHA1 (patch-ad) = 5364bc178130ffc9100ec795b9195255e8e91835
+SHA1 (patch-ae) = 0e49d6d35c3de38148b353836bcd09256e358db3
+SHA1 (patch-af) = f1c9e116db0226cf09933ba6d1573109ef9b1355
diff --git a/lang/gwydion-dylan/patches/patch-ae b/lang/gwydion-dylan/patches/patch-ae
new file mode 100644
index 00000000000..0ca602d6eb7
--- /dev/null
+++ b/lang/gwydion-dylan/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2007/11/05 07:14:51 rillig Exp $
+
+GC_quiet has been removed in boehm-gc-6.9.
+
+--- d2c/runtime/garbage-collection/garbage-collection.dylan.orig	2003-04-09 01:22:30.000000000 +0200
++++ d2c/runtime/garbage-collection/garbage-collection.dylan	2007-11-05 06:55:25.000000000 +0100
+@@ -57,15 +57,6 @@ define sealed method GC-all-interior-poi
+   value;
+ end method GC-all-interior-pointers-setter;
+ 
+-define sealed method GC-quiet () => (result :: <integer>);
+-  as(<integer>, c-variable-ref(int: "&GC_quiet"));
+-end method GC-quiet;
+-
+-define sealed method GC-quiet-setter (value :: <integer>) => (result :: <integer>);
+-  c-variable-ref(int: "&GC_quiet") := value;
+-  value;
+-end method GC-quiet-setter;
+-
+ define sealed method GC-finalize-on-demand () => (result :: <integer>);
+   as(<integer>, c-variable-ref(int: "&GC_finalize_on_demand"));
+ end method GC-finalize-on-demand;
diff --git a/lang/gwydion-dylan/patches/patch-af b/lang/gwydion-dylan/patches/patch-af
new file mode 100644
index 00000000000..7bdc4c93122
--- /dev/null
+++ b/lang/gwydion-dylan/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2007/11/05 07:14:51 rillig Exp $
+
+GC_quiet has been removed in boehm-gc-6.9.
+
+--- d2c/runtime/garbage-collection/garbage-collection-exports.dylan.orig	2002-01-25 12:38:07.000000000 +0100
++++ d2c/runtime/garbage-collection/garbage-collection-exports.dylan	2007-11-05 06:56:57.000000000 +0100
+@@ -14,7 +14,6 @@ define module garbage-collection
+ 
+   export GC-gc-no, 
+     // GC-oom-fn, GC-oom-fn-setter,
+-    GC-quiet, GC-quiet-setter, 
+     GC-dont-gc, GC-dont-gc-setter,
+     GC-dont-expand, GC-dont-expand-setter, 
+     GC-full-freq, GC-full-freq-setter,