[pkgsrc/trunk]: pkgsrc/net/haproxy haproxy: Fix SunOS C99 handling.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12202ac1a601
branches:  trunk
changeset: 383218:12202ac1a601
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jul 25 13:51:18 2018 +0000

description:
haproxy: Fix SunOS C99 handling.

diffstat:

 net/haproxy/distinfo                    |   8 ++++----
 net/haproxy/patches/patch-Makefile      |  10 +++++-----
 net/haproxy/patches/patch-src_cli.c     |  14 +++++++++-----
 net/haproxy/patches/patch-src_haproxy.c |  14 +++++++++-----
 4 files changed, 27 insertions(+), 19 deletions(-)

diffs (102 lines):

diff -r 37c711b1fbd4 -r 12202ac1a601 net/haproxy/distinfo
--- a/net/haproxy/distinfo      Wed Jul 25 13:36:51 2018 +0000
+++ b/net/haproxy/distinfo      Wed Jul 25 13:51:18 2018 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.37 2018/07/09 07:37:02 morr Exp $
+$NetBSD: distinfo,v 1.38 2018/07/25 13:51:18 jperkin Exp $
 
 SHA1 (haproxy-1.8.12.tar.gz) = f234549cf7d1c2dc113d441bacf23db131285e31
 RMD160 (haproxy-1.8.12.tar.gz) = b4f00d35bf54c06c1df8369021a12bc781c1606a
 SHA512 (haproxy-1.8.12.tar.gz) = 2b782a54988cc88d1af0e5f011af062910e8fac28eab13db7e05a58d0d23961f827da47e3871e8d081f5a2d222588480d81dec2e9f14ec9f54a1c3cb5bf3d56a
 Size (haproxy-1.8.12.tar.gz) = 2059925 bytes
-SHA1 (patch-Makefile) = d146acadbb16fe00d7c8a92ef706e8d8f73e5da6
-SHA1 (patch-src_cli.c) = f540a2e5a9374df29398d84529911bb5ad95bab5
-SHA1 (patch-src_haproxy.c) = 2de3aa4b05528933d39e63506eb7d09448a2b9e8
+SHA1 (patch-Makefile) = 30a778c6d83270ef672d14d6ae3fe7a1126fea53
+SHA1 (patch-src_cli.c) = 4bc5cf0116df121ac4c3c38b8f962c3a62d536e5
+SHA1 (patch-src_haproxy.c) = badb172013541087d84f03726ea928c6f5634dc3
diff -r 37c711b1fbd4 -r 12202ac1a601 net/haproxy/patches/patch-Makefile
--- a/net/haproxy/patches/patch-Makefile        Wed Jul 25 13:36:51 2018 +0000
+++ b/net/haproxy/patches/patch-Makefile        Wed Jul 25 13:51:18 2018 +0000
@@ -1,20 +1,20 @@
-$NetBSD: patch-Makefile,v 1.4 2018/04/05 09:18:39 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.5 2018/07/25 13:51:18 jperkin Exp $
 
 Do not hardcode _XOPEN_SOURCE.
 Skip installing unnecessary documentation.
 
---- Makefile.orig      2017-12-30 17:13:19.000000000 +0000
+--- Makefile.orig      2018-06-27 14:27:32.000000000 +0000
 +++ Makefile
-@@ -309,7 +309,7 @@ ifeq ($(TARGET),solaris)
+@@ -310,7 +310,7 @@ ifeq ($(TARGET),solaris)
    # This is for Solaris 8
    # We also enable getaddrinfo() which works since solaris 8.
    USE_POLL       = implicit
 -  TARGET_CFLAGS  = -fomit-frame-pointer -DFD_SETSIZE=65536 -D_REENTRANT -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
-+  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D__EXTENSIONS__ -D_XOPEN_SOURCE_EXTENDED=1
++  TARGET_CFLAGS  = -DFD_SETSIZE=65536 -D_REENTRANT -D__EXTENSIONS__
    TARGET_LDFLAGS = -lnsl -lsocket
    USE_TPROXY     = implicit
    USE_LIBCRYPT    = implicit
-@@ -931,9 +931,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
+@@ -933,9 +933,6 @@ DOCUMENTATION = $(filter-out $(EXCLUDE_D
  
  install-doc:
        install -d "$(DESTDIR)$(DOCDIR)"
diff -r 37c711b1fbd4 -r 12202ac1a601 net/haproxy/patches/patch-src_cli.c
--- a/net/haproxy/patches/patch-src_cli.c       Wed Jul 25 13:36:51 2018 +0000
+++ b/net/haproxy/patches/patch-src_cli.c       Wed Jul 25 13:51:18 2018 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-src_cli.c,v 1.1 2018/04/05 09:18:39 jperkin Exp $
+$NetBSD: patch-src_cli.c,v 1.2 2018/07/25 13:51:18 jperkin Exp $
 
 Special handling for XPG4_2 on SunOS.
 
---- src/cli.c.orig     2018-02-08 13:05:15.000000000 +0000
+--- src/cli.c.orig     2018-06-27 14:27:32.000000000 +0000
 +++ src/cli.c
-@@ -11,6 +11,9 @@
+@@ -11,6 +11,13 @@
   *
   */
  
-+#if defined(__sun) && !defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L)
-+#define _XOPEN_SOURCE
++#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>
diff -r 37c711b1fbd4 -r 12202ac1a601 net/haproxy/patches/patch-src_haproxy.c
--- a/net/haproxy/patches/patch-src_haproxy.c   Wed Jul 25 13:36:51 2018 +0000
+++ b/net/haproxy/patches/patch-src_haproxy.c   Wed Jul 25 13:51:18 2018 +0000
@@ -1,15 +1,19 @@
-$NetBSD: patch-src_haproxy.c,v 1.1 2018/04/05 09:18:39 jperkin Exp $
+$NetBSD: patch-src_haproxy.c,v 1.2 2018/07/25 13:51:18 jperkin Exp $
 
 Special handling for XPG4_2 on SunOS.
 
---- src/haproxy.c.orig 2018-02-08 13:05:15.000000000 +0000
+--- src/haproxy.c.orig 2018-06-27 14:27:32.000000000 +0000
 +++ src/haproxy.c
-@@ -26,6 +26,9 @@
+@@ -26,6 +26,13 @@
   */
  
  #define _GNU_SOURCE
-+#if defined(__sun) && !defined(_XOPEN_SOURCE) && (__STDC_VERSION__-0 < 199901L)
-+#define _XOPEN_SOURCE
++#if defined(__sun) && !defined(_XOPEN_SOURCE)
++#  if (__STDC_VERSION__-0 < 199901L)
++#define _XOPEN_SOURCE 500
++#  else
++#define _XOPEN_SOURCE 600
++#  endif
 +#endif
  #include <stdio.h>
  #include <stdlib.h>