CVS commit: pkgsrc/net/wget

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jan 14 16:31:00 UTC 2021

Modified Files:
        pkgsrc/net/wget: distinfo
Added Files:
        pkgsrc/net/wget/patches: patch-lib_malloc_dynarray-skeleton.c

Log Message:
Use the macro used elsewhere to fix build on at least macOS. Also
build-tested on CentOS 7 and Tribblix m24.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/net/wget/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/wget/patches/patch-lib_malloc_dynarray-skeleton.c

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

Modified files:

Index: pkgsrc/net/wget/distinfo
diff -u pkgsrc/net/wget/distinfo:1.64 pkgsrc/net/wget/distinfo:1.65
--- pkgsrc/net/wget/distinfo:1.64       Tue Jan 12 12:04:46 2021
+++ pkgsrc/net/wget/distinfo    Thu Jan 14 16:31:00 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.64 2021/01/12 12:04:46 ryoon Exp $
+$NetBSD: distinfo,v 1.65 2021/01/14 16:31:00 schmonz Exp $
 
 SHA1 (wget-1.21.1.tar.lz) = 215b0c056580b28d7d5edeac9c8c356ecc99ec4c
 RMD160 (wget-1.21.1.tar.lz) = 730e08c0b84b5af3cbf4764b1fa149b4ba3e938a
 SHA512 (wget-1.21.1.tar.lz) = 51ce93608094b2e5ba8144ff4d5cd36637eb6f9a3663355558885ea1f9fad0641e4ce13d61a18ac2f1285487ac7c7eba721aef04f9079889c0045f3ab915a450
 Size (wget-1.21.1.tar.lz) = 2367165 bytes
+SHA1 (patch-lib_malloc_dynarray-skeleton.c) = e5bac65aad4a3e09f7ade477d0991ba002900e4d

Added files:

Index: pkgsrc/net/wget/patches/patch-lib_malloc_dynarray-skeleton.c
diff -u /dev/null pkgsrc/net/wget/patches/patch-lib_malloc_dynarray-skeleton.c:1.1
--- /dev/null   Thu Jan 14 16:31:00 2021
+++ pkgsrc/net/wget/patches/patch-lib_malloc_dynarray-skeleton.c        Thu Jan 14 16:31:00 2021
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_malloc_dynarray-skeleton.c,v 1.1 2021/01/14 16:31:00 schmonz Exp $
+
+Use the macro used elsewhere to fix build on at least macOS.
+
+--- lib/malloc/dynarray-skeleton.c.orig        2021-01-14 16:23:44.000000000 +0000
++++ lib/malloc/dynarray-skeleton.c
+@@ -192,6 +192,10 @@ DYNARRAY_NAME (free__array__) (struct DY
+ 
+ /* Initialize a dynamic array object.  This must be called before any
+    use of the object.  */
++#ifdef __nonnull
++#undef __nonnull
++#define __nonnull(params) _GL_ARG_NONNULL(params)
++#endif
+ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)