On SunOS, don't ever override _XOPEN_SOURCE if it is already set.

Fixes build on SunOS with gcc>=4.6.

10 files changed, 80 insertions, 5 deletions

diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 8cac8396eae..76652915b6e 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: distinfo,v 1.39 2011/12/16 17:04:17 hans Exp $
 
 SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96
 RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e
@@ -22,3 +22,4 @@ SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81
 SHA1 (patch-aq) = 3d13cd79d50b70302d1b6ee598759a51f0b98532
 SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f
 SHA1 (patch-at) = 9d66115cc561c99dcc3478678aa286c1c0c3df6b
+SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
diff --git a/lang/python24/patches/patch-pyconfig.h.in b/lang/python24/patches/patch-pyconfig.h.in
new file mode 100644
index 00000000000..9169d6ed7f7
--- /dev/null
+++ b/lang/python24/patches/patch-pyconfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:17 hans Exp $
+
+--- pyconfig.h.in.orig	2009-10-27 13:30:12.000000000 +0100
++++ pyconfig.h.in	2011-11-13 14:37:13.053045656 +0100
+@@ -1036,7 +1036,9 @@
+ #undef _REENTRANT
+ 
+ /* Define to the level of X/Open that your system supports */
++#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
+ #undef _XOPEN_SOURCE
++#endif
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 942275a50cf..d1f5773d4c6 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: distinfo,v 1.21 2011/12/16 17:04:17 hans Exp $
 
 SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699
 RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22
@@ -23,3 +23,4 @@ SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
 SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373
 SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218
 SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
+SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
diff --git a/lang/python25/patches/patch-pyconfig.h.in b/lang/python25/patches/patch-pyconfig.h.in
new file mode 100644
index 00000000000..9169d6ed7f7
--- /dev/null
+++ b/lang/python25/patches/patch-pyconfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:17 hans Exp $
+
+--- pyconfig.h.in.orig	2009-10-27 13:30:12.000000000 +0100
++++ pyconfig.h.in	2011-11-13 14:37:13.053045656 +0100
+@@ -1036,7 +1036,9 @@
+ #undef _REENTRANT
+ 
+ /* Define to the level of X/Open that your system supports */
++#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
+ #undef _XOPEN_SOURCE
++#endif
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 32f4ba4689e..4b6810de6c4 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: distinfo,v 1.42 2011/12/16 17:04:18 hans Exp $
 
 SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
 RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
@@ -24,3 +24,4 @@ SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
 SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
 SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
 SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858
+SHA1 (patch-pyconfig.h.in) = ad0f7d60886849e58a03fb28bb6c5ba0600c4698
diff --git a/lang/python26/patches/patch-pyconfig.h.in b/lang/python26/patches/patch-pyconfig.h.in
new file mode 100644
index 00000000000..497080bb29b
--- /dev/null
+++ b/lang/python26/patches/patch-pyconfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:18 hans Exp $
+
+--- pyconfig.h.in.orig	2009-10-27 13:30:12.000000000 +0100
++++ pyconfig.h.in	2011-11-13 14:37:13.053045656 +0100
+@@ -1036,7 +1036,9 @@
+ #undef _REENTRANT
+ 
+ /* Define to the level of X/Open that your system supports */
++#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
+ #undef _XOPEN_SOURCE
++#endif
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 3a96b91809c..86b4b2fccaf 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: distinfo,v 1.14 2011/12/16 17:04:18 hans Exp $
 
 SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
 RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
@@ -20,3 +20,4 @@ SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
 SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
 SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
 SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
+SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c
diff --git a/lang/python27/patches/patch-pyconfig.h.in b/lang/python27/patches/patch-pyconfig.h.in
new file mode 100644
index 00000000000..ca2855eff71
--- /dev/null
+++ b/lang/python27/patches/patch-pyconfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:18 hans Exp $
+
+--- pyconfig.h.in.orig	2011-06-11 17:46:28.000000000 +0200
++++ pyconfig.h.in	2011-11-29 20:17:04.328552361 +0100
+@@ -1173,7 +1173,9 @@
+ #undef _UINT64_T
+ 
+ /* Define to the level of X/Open that your system supports */
++#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
+ #undef _XOPEN_SOURCE
++#endif
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 5e596d2581a..a89f4afaddb 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: distinfo,v 1.7 2011/12/16 17:04:18 hans Exp $
 
 SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c
 RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b
@@ -13,3 +13,4 @@ SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b
 SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20
 SHA1 (patch-av) = dcbcd47a50b56d1fd8b5e5594b94a155c52d5e39
 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc
+SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c
diff --git a/lang/python31/patches/patch-pyconfig.h.in b/lang/python31/patches/patch-pyconfig.h.in
new file mode 100644
index 00000000000..ca2855eff71
--- /dev/null
+++ b/lang/python31/patches/patch-pyconfig.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:18 hans Exp $
+
+--- pyconfig.h.in.orig	2011-06-11 17:46:28.000000000 +0200
++++ pyconfig.h.in	2011-11-29 20:17:04.328552361 +0100
+@@ -1173,7 +1173,9 @@
+ #undef _UINT64_T
+ 
+ /* Define to the level of X/Open that your system supports */
++#if !defined(__sun) || (defined(__sun) && !defined(_XOPEN_SOURCE))
+ #undef _XOPEN_SOURCE
++#endif
+ 
+ /* Define to activate Unix95-and-earlier features */
+ #undef _XOPEN_SOURCE_EXTENDED