Workaround build problem on Solaris 10.

If HAVE_POSIX_SPAWN is defined, code is compiled in that requires environ
to be declared. Solaris doesn't declare environ, so declare it (guarded by
HAVE_ENVIRON_DECL) in the files in which it is used.

Solaris 10 systems HAVE_POSIX_SPAWN, whereas previous versions do not.

5 files changed, 65 insertions, 1 deletions

diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 3268b05e190..d33aa0ef248 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/12/05 18:15:49 erh Exp $
+$NetBSD: distinfo,v 1.11 2004/10/13 17:14:36 gavan Exp $
 
 SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
 Size (gettext-0.11.5.tar.gz) = 3724099 bytes
@@ -10,3 +10,7 @@ SHA1 (patch-ah) = 3de0f7bdffb57352cbfc361729d463ed53b53886
 SHA1 (patch-aj) = 8c8cf6fcc6f23a54b5e20e1ab741d4a7d92a11a7
 SHA1 (patch-ak) = 6ba1e5c4180cfc76b3545551f18c16f2c1bdbb15
 SHA1 (patch-al) = de803407110c28b044aad8c122ff42181510a0e3
+SHA1 (patch-am) = 572a97eb3f0d805e27a3654eb4a4294433a51674
+SHA1 (patch-an) = 5bda0ba8f1e8a9c5d2c073b80caa253993111f1d
+SHA1 (patch-ao) = 9d2aea0904acc72951b1f449b65948ec0ecca1e7
+SHA1 (patch-ap) = 99153dcd56d937b15caf25d3f12aa958ea096825
diff --git a/devel/gettext/patches/patch-am b/devel/gettext/patches/patch-am
new file mode 100644
index 00000000000..8e39a19a5a5
--- /dev/null
+++ b/devel/gettext/patches/patch-am
@@ -0,0 +1,15 @@
+$NetBSD: patch-am,v 1.1 2004/10/13 17:14:36 gavan Exp $
+
+--- lib/execute.c.orig	2002-01-02 10:55:32.000000000 +0000
++++ lib/execute.c
+@@ -56,6 +56,10 @@
+ # define STDERR_FILENO 2
+ #endif
+ 
++#ifndef HAVE_ENVIRON_DECL
++extern char **environ;
++#endif
++
+ #define _(str) gettext (str)
+ 
+ 
diff --git a/devel/gettext/patches/patch-an b/devel/gettext/patches/patch-an
new file mode 100644
index 00000000000..7fac37420de
--- /dev/null
+++ b/devel/gettext/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2004/10/13 17:14:36 gavan Exp $
+
+--- lib/pipe-bidi.c.orig	2002-01-02 10:55:32.000000000 +0000
++++ lib/pipe-bidi.c
+@@ -51,6 +51,10 @@
+ # define STDOUT_FILENO 1
+ #endif
+ 
++#ifndef HAVE_ENVIRON_DECL
++extern char **environ;
++#endif
++
+ #define _(str) gettext (str)
+ 
+ 
diff --git a/devel/gettext/patches/patch-ao b/devel/gettext/patches/patch-ao
new file mode 100644
index 00000000000..90cfc8a05e7
--- /dev/null
+++ b/devel/gettext/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2004/10/13 17:14:36 gavan Exp $
+
+--- lib/pipe-in.c.orig	2002-01-02 10:55:32.000000000 +0000
++++ lib/pipe-in.c
+@@ -51,6 +51,10 @@
+ # define STDOUT_FILENO 1
+ #endif
+ 
++#ifndef HAVE_ENVIRON_DECL
++extern char **environ;
++#endif
++
+ #define _(str) gettext (str)
+ 
+ 
diff --git a/devel/gettext/patches/patch-ap b/devel/gettext/patches/patch-ap
new file mode 100644
index 00000000000..47a896ea697
--- /dev/null
+++ b/devel/gettext/patches/patch-ap
@@ -0,0 +1,15 @@
+$NetBSD: patch-ap,v 1.1 2004/10/13 17:14:36 gavan Exp $
+
+--- lib/pipe-out.c.orig	2002-01-02 10:55:32.000000000 +0000
++++ lib/pipe-out.c
+@@ -51,6 +51,10 @@
+ # define STDOUT_FILENO 1
+ #endif
+ 
++#ifndef HAVE_ENVIRON_DECL
++extern char **environ;
++#endif
++
+ #define _(str) gettext (str)
+ 
+