Don't try to reference "char **environ" under Mac OS X. It breaks the

build under Leopard.

4 files changed, 41 insertions, 2 deletions

diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile
index bd5da8d6fdf..22b6dc9d660 100644
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/07/26 06:53:02 adam Exp $
+# $NetBSD: Makefile,v 1.8 2007/11/26 18:08:36 tron Exp $
 
 DISTNAME=	gettext-0.14.6
 PKGNAME=	gettext-tools-0.14.6
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=gettext/}
 
diff --git a/devel/gettext-tools/distinfo b/devel/gettext-tools/distinfo
index 65bd9b7511c..d0a98c66344 100644
--- a/devel/gettext-tools/distinfo
+++ b/devel/gettext-tools/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2007/03/12 23:59:47 rillig Exp $
+$NetBSD: distinfo,v 1.8 2007/11/26 18:08:36 tron Exp $
 
 SHA1 (gettext-0.14.6.tar.gz) = 0d8ce8d9a09a719065a1530399c4f45c15a002c5
 RMD160 (gettext-0.14.6.tar.gz) = 02138d12fd4d9ce0b3bda2d132f1569b30d16726
 Size (gettext-0.14.6.tar.gz) = 7102365 bytes
 SHA1 (patch-aa) = da7ff06b28645b7c63ae9e49a29a8014f07dcec1
 SHA1 (patch-ab) = d13af25a5fbe3e4141b67bbeaeaf637482e78442
+SHA1 (patch-ac) = 2ecf4b3e10e64b6d73249ecc2673fae1395f283a
 SHA1 (patch-ad) = 53bf06d6073cd2ff4a09a688b1df3d294ef7ddb4
 SHA1 (patch-ae) = f2efed6024ef1aa3fb972c043e0900676659c766
+SHA1 (patch-af) = a767c2877a2a4b54eb3653b373f5d7d9a6dec52f
 SHA1 (patch-ag) = 9a39ea58e8e8c10c747ab34fe198072c8663d6b0
 SHA1 (patch-ah) = b33e4c81a8046e4f45b927613af59a0d99a4d0bb
 SHA1 (patch-aj) = 5a28ee9299b5c0e7ba10621bf73b638cafdcfa7e
diff --git a/devel/gettext-tools/patches/patch-ac b/devel/gettext-tools/patches/patch-ac
new file mode 100644
index 00000000000..2da9247eb68
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2007/11/26 18:09:04 tron Exp $
+
+--- gettext-tools/lib/pipe.c.orig	2005-05-20 22:03:42.000000000 +0100
++++ gettext-tools/lib/pipe.c	2007-11-26 17:50:22.000000000 +0000
+@@ -61,8 +61,13 @@
+ #endif
+ 
+ #ifndef HAVE_ENVIRON_DECL
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
+ #endif
++#endif
+ 
+ #ifndef STDIN_FILENO
+ # define STDIN_FILENO 0
diff --git a/devel/gettext-tools/patches/patch-af b/devel/gettext-tools/patches/patch-af
new file mode 100644
index 00000000000..a856abd2226
--- /dev/null
+++ b/devel/gettext-tools/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2007/11/26 18:09:05 tron Exp $
+
+--- gettext-tools/lib/execute.c.orig	2005-05-20 22:03:42.000000000 +0100
++++ gettext-tools/lib/execute.c	2007-11-26 17:51:20.000000000 +0000
+@@ -62,8 +62,13 @@
+ #endif
+ 
+ #ifndef HAVE_ENVIRON_DECL
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
+ #endif
++#endif
+ 
+ #ifndef STDIN_FILENO
+ # define STDIN_FILENO 0