[pkgsrc/trunk]: pkgsrc/net/haproxy haproxy: re-do patch to enable XPG4.2 on S...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb85c914bf90
branches:  trunk
changeset: 337717:bb85c914bf90
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Aug 11 09:09:41 2019 +0000

description:
haproxy: re-do patch to enable XPG4.2 on SunOS.

Define _XOPEN_SOURCE 500/600 based on C mode, as we do in other patches
for this package.

>From wilbury and jperkin, thanks.

diffstat:

 net/haproxy/Makefile                            |   3 +--
 net/haproxy/distinfo                            |   3 ++-
 net/haproxy/patches/patch-src_proto__sockpair.c |  19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r 2a9bdb23da22 -r bb85c914bf90 net/haproxy/Makefile
--- a/net/haproxy/Makefile      Sun Aug 11 05:49:07 2019 +0000
+++ b/net/haproxy/Makefile      Sun Aug 11 09:09:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/08/10 20:45:56 maya Exp $
+# $NetBSD: Makefile,v 1.49 2019/08/11 09:09:41 maya Exp $
 
 DISTNAME=      haproxy-2.0.3
 CATEGORIES=    net www
@@ -57,7 +57,6 @@
 TARGET=        generic
 .endif
 
-CFLAGS.SunOS+=         -D_XPG4_2
 LIBS.SunOS+=           -lxnet
 
 post-install:
diff -r 2a9bdb23da22 -r bb85c914bf90 net/haproxy/distinfo
--- a/net/haproxy/distinfo      Sun Aug 11 05:49:07 2019 +0000
+++ b/net/haproxy/distinfo      Sun Aug 11 09:09:41 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2019/08/03 20:37:19 morr Exp $
+$NetBSD: distinfo,v 1.43 2019/08/11 09:09:41 maya Exp $
 
 SHA1 (haproxy-2.0.3.tar.gz) = 32426b727f88a90b0e8ed04190ba1d138d535394
 RMD160 (haproxy-2.0.3.tar.gz) = e2c94917923852f7df329bd69a59cd409639259e
@@ -7,3 +7,4 @@
 SHA1 (patch-Makefile) = 790242ebde13ac1a9d95a16cba29e30a9bccd57c
 SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
 SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3
+SHA1 (patch-src_proto__sockpair.c) = 1f2a318f3b7c74a191774f8bb3511c23401c10ef
diff -r 2a9bdb23da22 -r bb85c914bf90 net/haproxy/patches/patch-src_proto__sockpair.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/haproxy/patches/patch-src_proto__sockpair.c   Sun Aug 11 09:09:41 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_proto__sockpair.c,v 1.1 2019/08/11 09:09:41 maya Exp $
+
+--- src/proto_sockpair.c.orig  2019-07-23 13:21:26.000000000 +0000
++++ src/proto_sockpair.c
+@@ -10,6 +10,14 @@
+  *
+  */
+ 
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
++#endif
++
+ #include <ctype.h>
+ #include <errno.h>
+ #include <fcntl.h>