Fix buildling on Darwin/MacOSX

6 files changed, 19 insertions, 20 deletions

diff --git a/graphics/gdchart/buildlink3.mk b/graphics/gdchart/buildlink3.mk
index c4ffddd95aa..c17df052b4f 100644
--- a/graphics/gdchart/buildlink3.mk
+++ b/graphics/gdchart/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:09:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:17:05 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDCHART_BUILDLINK3_MK:=	${GDCHART_BUILDLINK3_MK}+
@@ -18,4 +18,4 @@ BUILDLINK_PKGSRCDIR.gdchart?=	../../graphics/gdchart
 
 .include "../../graphics/gd/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gdchart/distinfo b/graphics/gdchart/distinfo
index 99fa04d7ddc..231bcbafe41 100644
--- a/graphics/gdchart/distinfo
+++ b/graphics/gdchart/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2005/03/11 08:51:58 adam Exp $
+$NetBSD: distinfo,v 1.11 2006/02/10 12:17:05 adam Exp $
 
 SHA1 (gdchart0.11.5dev.tar.gz) = c23e1cd233c38ac007b57420c20a5fa7fa206841
 RMD160 (gdchart0.11.5dev.tar.gz) = be9b11eb446738d9e30d78e8ce73b8a418b1f520
 Size (gdchart0.11.5dev.tar.gz) = 38783 bytes
-SHA1 (patch-aa) = 8f27d077d15c0d203ecd4e4b01c574e035dabce1
 SHA1 (patch-ac) = eb4bc3be51bb1a9e8b3db9cd8c6038381fbf734a
diff --git a/graphics/gdchart/patches/patch-aa b/graphics/gdchart/patches/patch-aa
deleted file mode 100644
index a118a7be3c4..00000000000
--- a/graphics/gdchart/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/01/19 09:05:44 adam Exp $
-
---- gdc.h.orig	2004-12-17 18:12:06.000000000 +0000
-+++ gdc.h
-@@ -126,7 +126,7 @@ short	cnt_nl( char*, int* );
- #endif
- 
- #ifdef GDC_LIB
--#define EXTERND	extern
-+#define EXTERND
- #define DEFAULTO(val)
- extern struct	GDC_FONT_T	GDC_fontc[];
- #else
diff --git a/textproc/gdome2/buildlink3.mk b/textproc/gdome2/buildlink3.mk
index 0a97529abb6..0f7f34146fd 100644
--- a/textproc/gdome2/buildlink3.mk
+++ b/textproc/gdome2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:11:02 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/10 12:09:24 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GDOME2_BUILDLINK3_MK:=	${GDOME2_BUILDLINK3_MK}+
@@ -19,4 +19,4 @@ BUILDLINK_PKGSRCDIR.gdome2?=	../../textproc/gdome2
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/gdome2/distinfo b/textproc/gdome2/distinfo
index adc24ad5bae..c132636012b 100644
--- a/textproc/gdome2/distinfo
+++ b/textproc/gdome2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/11/17 18:22:16 rillig Exp $
+$NetBSD: distinfo,v 1.4 2006/02/10 12:09:24 adam Exp $
 
 SHA1 (gdome2-0.8.1.tar.gz) = e9a3e4140c873d8232635ad10bb135ef7803c408
 RMD160 (gdome2-0.8.1.tar.gz) = 5cc3ff29e0ed040e3bbd02cba4d95b9b634c4072
 Size (gdome2-0.8.1.tar.gz) = 518965 bytes
 SHA1 (patch-aa) = 7e194447d1b4cf4a0799aef6c211e724e577c33c
+SHA1 (patch-ab) = 642f5e5319bdebf3fab8b346d68558e117cb5d26
diff --git a/textproc/gdome2/patches/patch-ab b/textproc/gdome2/patches/patch-ab
new file mode 100644
index 00000000000..2be6d38e7fb
--- /dev/null
+++ b/textproc/gdome2/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2006/02/10 12:09:24 adam Exp $
+
+--- libgdome/xpath/gdome-xpath-xpnsresolv.h.orig	2006-02-10 12:52:28.000000000 +0100
++++ libgdome/xpath/gdome-xpath-xpnsresolv.h
+@@ -42,6 +42,6 @@ void gdome_xpath_xpnsresolv_ref (GdomeXP
+ void gdome_xpath_xpnsresolv_unref (GdomeXPathNSResolver *self, GdomeException *exc);
+ GdomeDOMString * gdome_xpath_xpnsresolv_lookupNamespaceURI( GdomeXPathNSResolver *self, GdomeDOMString *prefix, GdomeException *exc);
+ 
+-const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
++extern const GdomeXPathNSResolverVtab gdome_xpath_xpnsresolv_vtab;
+ 
+ #endif /* GDOME_XPNSRESOLV_FILE */