CVS commit: pkgsrc/www/netsurf

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Wed Sep 18 20:32:47 UTC 2019

Modified Files:
        pkgsrc/www/netsurf: distinfo
        pkgsrc/www/netsurf/patches: patch-netsurf_utils_config.h

Log Message:
Remove compilation messages about redundant declaration of strchrnul

NetBSD has strchrnul so tell netsurf this.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/netsurf/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/netsurf/distinfo
diff -u pkgsrc/www/netsurf/distinfo:1.13 pkgsrc/www/netsurf/distinfo:1.14
--- pkgsrc/www/netsurf/distinfo:1.13    Wed Sep 18 20:21:39 2019
+++ pkgsrc/www/netsurf/distinfo Wed Sep 18 20:32:47 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2019/09/18 20:21:39 nros Exp $
+$NetBSD: distinfo,v 1.14 2019/09/18 20:32:47 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) = 25bbb146ed57ddfc943155b366cb73850e4ff0ac
-SHA1 (patch-netsurf_utils_config.h) = de48304e3484a883509ea3ad92658788f7869041
+SHA1 (patch-netsurf_utils_config.h) = 947eb55fbef10b50b651f2df18f95d30e82078e2
 SHA1 (patch-nsgenbind_src_Makefile) = 9024fe193c532fefec83b86a8cf85f1bcffb614e

Index: pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h
diff -u pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.1 pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.2
--- pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h:1.1 Thu Sep  3 20:56:10 2015
+++ pkgsrc/www/netsurf/patches/patch-netsurf_utils_config.h     Wed Sep 18 20:32:47 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-netsurf_utils_config.h,v 1.1 2015/09/03 20:56:10 leot Exp $
+$NetBSD: patch-netsurf_utils_config.h,v 1.2 2019/09/18 20:32:47 nros Exp $
 
-NetBSD has strcasestr(3).
+NetBSD has strcasestr(3) and strchrnul(3).
 
---- netsurf/utils/config.h.orig        2015-03-11 07:34:53.000000000 +0000
+--- netsurf/utils/config.h.orig        2019-07-17 15:37:00.000000000 +0000
 +++ netsurf/utils/config.h
-@@ -31,7 +31,7 @@
+@@ -30,7 +30,7 @@
  char *strndup(const char *s, size_t n);
  #endif
  
@@ -13,3 +13,12 @@ NetBSD has strcasestr(3).
  #define HAVE_STRCASESTR
  #else
  #undef HAVE_STRCASESTR
+@@ -51,7 +51,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__))
+ #define HAVE_STRCHRNUL
+ #else
+ #undef HAVE_STRCHRNUL