vte: Don't define _XOPEN_SOURCE if using C99 on SunOS.

4 files changed, 63 insertions, 1 deletions

diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index 1c3571e948f..d6fc4049962 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2015/12/29 04:04:32 dholland Exp $
+$NetBSD: distinfo,v 1.55 2017/10/19 13:51:34 jperkin Exp $
 
 SHA1 (vte-0.28.1.tar.bz2) = 9867f84c6be65ff485d8a1a3c41a359709b6f84c
 RMD160 (vte-0.28.1.tar.bz2) = e0748777f5a57266762b3dd88f7a10b143e412d9
@@ -11,3 +11,6 @@ SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
 SHA1 (patch-ai) = 4c365d1d05faa2d9bd0f8f21d500a72605f092d9
 SHA1 (patch-altmeta) = 1fc77f879dfb76220ebe6a6e5769c2662fec58a9
+SHA1 (patch-config.h.in) = 1d80496a6f4299adc0749cf65339ee8407309a17
+SHA1 (patch-configure) = dc8dd91cfee84eaf62c6813defcbf311ebdcfedc
+SHA1 (patch-gnome-pty-helper_config.h.in) = bee681f4e5102213eeeee6a825d02d31b3d0c63d
diff --git a/x11/vte/patches/patch-config.h.in b/x11/vte/patches/patch-config.h.in
new file mode 100644
index 00000000000..99cf22c47ea
--- /dev/null
+++ b/x11/vte/patches/patch-config.h.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-config.h.in,v 1.1 2017/10/19 13:51:34 jperkin Exp $
+
+Don't define _XOPEN_SOURCE if using C99.
+
+--- config.h.in.orig	2011-06-14 21:38:39.000000000 +0000
++++ config.h.in
+@@ -203,11 +203,13 @@
+ /* Use all glibc features. */
+ #undef _GNU_SOURCE
+ 
++#if (__STDC_VERSION__ - 0 < 199901L)
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef _XOPEN_SOURCE
+ 
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef _XOPEN_SOURCE_EXTENDED
++#endif
+ 
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef __EXTENSIONS__
diff --git a/x11/vte/patches/patch-configure b/x11/vte/patches/patch-configure
new file mode 100644
index 00000000000..50749a70042
--- /dev/null
+++ b/x11/vte/patches/patch-configure
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2017/10/19 13:51:34 jperkin Exp $
+
+Don't define _XOPEN_SOURCE if using C99.
+
+--- configure.orig	2011-06-14 21:38:29.000000000 +0000
++++ configure
+@@ -12574,10 +12574,12 @@ rm -f conftest*
+ case $host in
+ *-*-solaris*)
+ 
++$as_echo "#if (__STDC_VERSION__ - 0 < 199901L)" >>confdefs.h
+ $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+ 
+ 
+ $as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
++$as_echo "#endif" >>confdefs.h
+ 
+ 
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
diff --git a/x11/vte/patches/patch-gnome-pty-helper_config.h.in b/x11/vte/patches/patch-gnome-pty-helper_config.h.in
new file mode 100644
index 00000000000..28aa9e12a5a
--- /dev/null
+++ b/x11/vte/patches/patch-gnome-pty-helper_config.h.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-gnome-pty-helper_config.h.in,v 1.1 2017/10/19 13:51:34 jperkin Exp $
+
+Don't define _XOPEN_SOURCE if using C99.
+
+--- gnome-pty-helper/config.h.in.orig	2010-11-16 18:21:13.000000000 +0000
++++ gnome-pty-helper/config.h.in
+@@ -201,11 +201,13 @@
+ /* Use all glibc features. */
+ #undef _GNU_SOURCE
+ 
++#if (__STDC_VERSION__ - 0 < 199901L)
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef _XOPEN_SOURCE
+ 
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef _XOPEN_SOURCE_EXTENDED
++#endif
+ 
+ /* Needed to get declarations for msg_control and msg_controllen on Solaris */
+ #undef __EXTENSIONS__