[pkgsrc/trunk]: pkgsrc/www/netsurf strchrnul is available on NetBSD 8 or later

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/38899cdfcc5d
branches:  trunk
changeset: 417461:38899cdfcc5d
user:      nros <nros%pkgsrc.org@localhost>
date:      Mon Nov 11 12:31:16 2019 +0000

description:
strchrnul is available on NetBSD 8 or later

strchrnul is available on NetBSD 8 or later, so don't we don't want to
claim that is available for all NetBSD versions.

diffstat:

 www/netsurf/distinfo                             |   4 ++--
 www/netsurf/patches/patch-netsurf_utils_config.h |  22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r b7d3b221ee88 -r 38899cdfcc5d www/netsurf/distinfo
--- a/www/netsurf/distinfo      Mon Nov 11 11:59:06 2019 +0000
+++ b/www/netsurf/distinfo      Mon Nov 11 12:31:16 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2019/11/11 10:33:30 nros Exp $
+$NetBSD: distinfo,v 1.16 2019/11/11 12:31:16 nros Exp $
 
 SHA1 (netsurf-all-3.9.tar.gz) = 392aa7cf94b303228a00e6887c74e5763a81f3a4
 RMD160 (netsurf-all-3.9.tar.gz) = 3f7aff04cfd253f2b18590830b0aa2fca0123b3c
 SHA512 (netsurf-all-3.9.tar.gz) = 3223b0a3bc9721ea1a5a81bbabdda11e1d0f63850074a5dea3ea8999e53c92f07228f58befbf10359c028965131426888a8b9595d6c3cd7a5cde33ca256cf987
 Size (netsurf-all-3.9.tar.gz) = 8416458 bytes
 SHA1 (patch-netsurf_frontends_gtk_download.c) = 8a449c0b46859be104f2eb87860960f84ebd38ad
-SHA1 (patch-netsurf_utils_config.h) = 947eb55fbef10b50b651f2df18f95d30e82078e2
+SHA1 (patch-netsurf_utils_config.h) = 761700b4fd92ea68d8644e3ec2ac270e0e0dd3fc
 SHA1 (patch-nsgenbind_src_Makefile) = 9024fe193c532fefec83b86a8cf85f1bcffb614e
diff -r b7d3b221ee88 -r 38899cdfcc5d www/netsurf/patches/patch-netsurf_utils_config.h
--- a/www/netsurf/patches/patch-netsurf_utils_config.h  Mon Nov 11 11:59:06 2019 +0000
+++ b/www/netsurf/patches/patch-netsurf_utils_config.h  Mon Nov 11 12:31:16 2019 +0000
@@ -1,10 +1,22 @@
-$NetBSD: patch-netsurf_utils_config.h,v 1.2 2019/09/18 20:32:47 nros Exp $
+$NetBSD: patch-netsurf_utils_config.h,v 1.3 2019/11/11 12:31:16 nros Exp $
 
-NetBSD has strcasestr(3) and strchrnul(3).
+NetBSD has strcasestr(3)
+NetBSD 8 and later has strchrnul(3).
 
 --- netsurf/utils/config.h.orig        2019-07-17 15:37:00.000000000 +0000
 +++ netsurf/utils/config.h
-@@ -30,7 +30,7 @@
+@@ -21,6 +21,10 @@
+ 
+ #include <stddef.h>
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
+ /* Try to detect which features the target OS supports */
+ 
+ #if (defined(_GNU_SOURCE) && !defined(__APPLE__) || defined(__amigaos4__) || defined(__HAIKU__) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L)) && !defined(__riscos__))
+@@ -30,7 +34,7 @@
  char *strndup(const char *s, size_t n);
  #endif
  
@@ -13,12 +25,12 @@
  #define HAVE_STRCASESTR
  #else
  #undef HAVE_STRCASESTR
-@@ -51,7 +51,7 @@ char *strcasestr(const char *haystack, c
+@@ -51,7 +55,7 @@ char *strcasestr(const char *haystack, c
  /* For some reason, UnixLib defines this unconditionally. Assume we're using
   *  UnixLib if building for RISC OS.
   */
 -#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__))
-+#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__) || defined(__NetBSD__))
++#if ((defined(_GNU_SOURCE) && !defined(__APPLE__)) || defined(__riscos__) || (defined(__NetBSD_Version__) && __NetBSD_Prereq__(8,0,0)))
  #define HAVE_STRCHRNUL
  #else
  #undef HAVE_STRCHRNUL