Fix build with boehm-gc>=7.0.

4 files changed, 10 insertions, 10 deletions

diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index 061761aee19..0c38f707c72 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/01/12 00:05:04 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/07/28 13:10:59 wiz Exp $
 
 SHA1 (sather-1.2.1.tar.gz) = 434f6b9c69d63a022c83f3693011415ad9730cb1
 RMD160 (sather-1.2.1.tar.gz) = 73ff88f8035f7f6a98548a0ca6c359217cb58950
@@ -6,10 +6,10 @@ Size (sather-1.2.1.tar.gz) = 4458088 bytes
 SHA1 (patch-aa) = d326038193ce2fb459ed19f9ab2ae2b6dce1ace3
 SHA1 (patch-ab) = e45f8a8230d1fbe3fc72babbecfa8148699f7906
 SHA1 (patch-ac) = 586cdebde7a2c1b49f9b75a33d26980a2c0397f3
-SHA1 (patch-ad) = 687a05fe5d20757e82a366f04c9c3905f14b5271
+SHA1 (patch-ad) = 47218ca16bb8aec4d43f96f0d72b879b24c95f26
 SHA1 (patch-ae) = 3d36a3dcbc6bc36af6353a619366189445e2b14e
-SHA1 (patch-af) = 601bd3f55f16917d525c29813c23999264c883e2
-SHA1 (patch-ag) = c16f121bac6197284eef907c96e9f903b35835b2
+SHA1 (patch-af) = 1ab2a67446f48c088ec77550d199a9779c50ffb8
+SHA1 (patch-ag) = 5cd0a0ab1c1fbf80c6ba424fa1926957ede35715
 SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b
 SHA1 (patch-ai) = 032b6a4355bdd059d5b88ebe00ae2c1bf35c8eba
 SHA1 (patch-aj) = f9f4d36335fe4c20fa01f4ff6cba59edeb0deab7
diff --git a/lang/sather/patches/patch-ad b/lang/sather/patches/patch-ad
index f166f7419e3..4fee8ca6b1a 100644
--- a/lang/sather/patches/patch-ad
+++ b/lang/sather/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.3 2004/08/27 18:52:00 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2007/07/28 13:10:59 wiz Exp $
 
 --- /dev/null	Thu May  2 17:26:15 2002
 +++ System/Platforms/netbsd/CONFIG	Thu May  2 17:34:27 2002
 @@ -0,0 +1 @@
-+CC_OPTIONS:	"-I@X11BASE@/include -I@TCL_PREFIX@/include -I@TK_PREFIX@/include @LINKER_RPATH_FLAG@ @X11BASE@/lib -L@X11BASE@/lib @LINKER_RPATH_FLAG@ @TCL_PREFIX@/lib -L@TCL_PREFIX@/lib @LINKER_RPATH_FLAG@ @TK_PREFIX@/lib -L@TK_PREFIX@/lib";
++CC_OPTIONS:	"-I@X11BASE@/include -I@GC_PREFIX@/include/gc -L@GC_PREFIX@/lib @LINKER_RPATH_FLAG@ @GC_PREFIX@/lib -I@TCL_PREFIX@/include -I@TK_PREFIX@/include @LINKER_RPATH_FLAG@ @X11BASE@/lib -L@X11BASE@/lib @LINKER_RPATH_FLAG@ @TCL_PREFIX@/lib -L@TCL_PREFIX@/lib @LINKER_RPATH_FLAG@ @TK_PREFIX@/lib -L@TK_PREFIX@/lib";
diff --git a/lang/sather/patches/patch-af b/lang/sather/patches/patch-af
index 94a2c7c796d..72ecce6366c 100644
--- a/lang/sather/patches/patch-af
+++ b/lang/sather/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.4 2004/08/27 18:52:00 jlam Exp $
+$NetBSD: patch-af,v 1.5 2007/07/28 13:10:59 wiz Exp $
 
 --- Boot/sacomp.code/Makefile.orig	Thu Nov  4 08:04:49 1999
 +++ Boot/sacomp.code/Makefile
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.4 2004/08/27 18:52:00 jlam Exp $
  SHOME  =../..
 -CFLAGS = -I.  -O2  -I../System/Common
 -CC     =gcc 
-+CFLAGS = -I. @CFLAGS@ -I../System/Common -I@GC_PREFIX@/include
++CFLAGS = -I. @CFLAGS@ -I../System/Common -I@GC_PREFIX@/include/gc
 +CC     = @CC@
  HDR    =sather.h tags.h
 -LIBS   = -lgc -lm
diff --git a/lang/sather/patches/patch-ag b/lang/sather/patches/patch-ag
index 88f1bc65ccf..5b7499df95d 100644
--- a/lang/sather/patches/patch-ag
+++ b/lang/sather/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2004/08/27 18:52:00 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2007/07/28 13:10:59 wiz Exp $
 
 --- System/Common/CONFIG.proto.orig	Wed Nov  3 18:48:17 1999
 +++ System/Common/CONFIG.proto
@@ -12,7 +12,7 @@ $NetBSD: patch-ag,v 1.4 2004/08/27 18:52:00 jlam Exp $
 -GC_LINK:		"-lgc";
 +VERSION:		"1.2.1";
 +C_COMPILER:		"@CC@";
-+CC_OPTIONS:		"-I@GC_PREFIX@/include";
++CC_OPTIONS:		"-I@GC_PREFIX@/include/gc";
 +GC_LINK:		"-L@GC_PREFIX@/lib @COMPILER_RPATH_FLAG@@GC_PREFIX@/lib -lgc";
  LINK_OPTIONS:		"-lm";
 -MAKE_COMMAND:		"make";