Fix build on SunOS.

6 files changed, 64 insertions, 5 deletions

diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index dc3f6dc1e71..6471ce1b8f3 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2011/09/12 22:01:34 wiz Exp $
+$NetBSD: distinfo,v 1.22 2011/09/14 16:53:38 hans Exp $
 
 SHA1 (pygobject-2.28.6.tar.xz) = b1749ba806499f4c2780dbd1cbb363aaf1f41e78
 RMD160 (pygobject-2.28.6.tar.xz) = 4bc5e8546a5029d3d6b154629ab3fa4023d96bef
@@ -6,3 +6,4 @@ Size (pygobject-2.28.6.tar.xz) = 747248 bytes
 SHA1 (patch-aa) = a706cc4cd48121f21d12027c315dfe92d34157ed
 SHA1 (patch-ab) = f9ec40fcac11fe9d6625b6028dba2e316d9ce59e
 SHA1 (patch-ac) = 083e691cb13dbefeece505a7b6596c69ec8491f7
+SHA1 (patch-ad) = 1fa6c9ec6c3926d2915b7fa0391245bf7ca2daf4
diff --git a/devel/py-gobject/patches/patch-ad b/devel/py-gobject/patches/patch-ad
new file mode 100644
index 00000000000..19f78313c71
--- /dev/null
+++ b/devel/py-gobject/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.3 2011/09/14 16:53:38 hans Exp $
+
+--- gi/gimodule.c.orig	2011-04-18 17:35:33.000000000 +0200
++++ gi/gimodule.c	2011-09-07 13:02:33.039179462 +0200
+@@ -62,6 +62,7 @@ _wrap_pyg_enum_register_new_gtype_and_ad
+     GEnumValue *g_enum_values;
+     GType g_type;
+     const gchar *type_name;
++    int i;
+ 
+     if (!PyArg_ParseTupleAndKeywords (args, kwargs,
+                                       "O:enum_add_make_new_gtype",
+@@ -79,7 +80,7 @@ _wrap_pyg_enum_register_new_gtype_and_ad
+     n_values = g_enum_info_get_n_values (info);
+     g_enum_values = g_new0 (GEnumValue, n_values + 1);
+ 
+-    for (int i=0; i < n_values; i++) {
++    for (i=0; i < n_values; i++) {
+         GIValueInfo *value_info;
+         GEnumValue *enum_value;
+         const gchar *name;
+@@ -149,6 +150,7 @@ _wrap_pyg_flags_register_new_gtype_and_a
+     GFlagsValue *g_flags_values;
+     GType g_type;
+     const gchar *type_name;
++    int i;
+ 
+     if (!PyArg_ParseTupleAndKeywords (args, kwargs,
+                                       "O:flags_add_make_new_gtype",
+@@ -166,7 +168,7 @@ _wrap_pyg_flags_register_new_gtype_and_a
+     n_values = g_enum_info_get_n_values (info);
+     g_flags_values = g_new0 (GFlagsValue, n_values + 1);
+ 
+-    for (int i=0; i < n_values; i++) {
++    for (i=0; i < n_values; i++) {
+         GIValueInfo *value_info;
+         GFlagsValue *flags_value;
+         const gchar *name;
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 4d3bab4e884..41f6938ef9c 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/04/22 13:42:31 obache Exp $
+# $NetBSD: Makefile,v 1.22 2011/09/14 16:54:31 hans Exp $
 
 DISTNAME=	gegl-0.1.6
 PKGREVISION=	1
@@ -33,6 +33,9 @@ PLIST_VARS+=	v4l
 PLIST.v4l=	yes
 .endif
 
+CFLAGS.SunOS+=		-std=c99 -D_XOPEN_SOURCE=600
+CXXFLAGS.SunOS+=	--std=c99
+
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.babl+=	babl>=0.1.4
diff --git a/graphics/gegl/distinfo b/graphics/gegl/distinfo
index 34c33a70930..22d86058700 100644
--- a/graphics/gegl/distinfo
+++ b/graphics/gegl/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/02/15 17:11:46 adam Exp $
+$NetBSD: distinfo,v 1.9 2011/09/14 16:54:31 hans Exp $
 
 SHA1 (gegl-0.1.6.tar.bz2) = 27bedcfd077da7a6913b82966dbec904b22c121d
 RMD160 (gegl-0.1.6.tar.bz2) = 8b7bf74fe769cee289b336b5d815b370aa3a125d
 Size (gegl-0.1.6.tar.bz2) = 4118465 bytes
 SHA1 (patch-aa) = 0f46061f7b0c213abfe422124839eec29780d039
+SHA1 (patch-ab) = e86bd51009ac7adf05e41aa1f39204db5cdf43ba
diff --git a/graphics/gegl/patches/patch-ab b/graphics/gegl/patches/patch-ab
new file mode 100644
index 00000000000..7394515699b
--- /dev/null
+++ b/graphics/gegl/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.5 2011/09/14 16:54:31 hans Exp $
+
+--- gegl/gegl-xml.c.orig	2011-01-24 23:03:30.000000000 +0100
++++ gegl/gegl-xml.c	2011-09-13 17:06:43.989058716 +0200
+@@ -18,7 +18,10 @@
+ #include "config.h"
+ 
+ /* For clang, remove when getting rid of using PATH_MAX */
++#ifndef __sun
+ #define _XOPEN_SOURCE 500
++#endif
++
+ 
+ #include <glib.h>
+ #include <glib-object.h>
diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile
index 6f1a8e24eeb..8edb5cb2f66 100644
--- a/graphics/py-cairo/Makefile
+++ b/graphics/py-cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/02/25 09:47:23 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2011/09/14 16:55:10 hans Exp $
 #
 
 DISTNAME=		py2cairo-1.8.10
@@ -28,7 +28,8 @@ PY_PATCHPLIST=		yes
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-2*)
+.if !empty(CC_VERSION:Mgcc-2*) || \
+    ${OPSYS} == "SunOS"
 BUILDLINK_TRANSFORM+=	rm:-std=c99
 .endif