CVS commit: pkgsrc/www/curl

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Aug 17 10:09:55 UTC 2022

Modified Files:
        pkgsrc/www/curl: Makefile distinfo
Added Files:
        pkgsrc/www/curl/patches: patch-include_curl_curl.h

Log Message:
curl: SunOS build fix. Reported upstream. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.183 -r1.184 pkgsrc/www/curl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/curl/patches/patch-include_curl_curl.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/curl/Makefile
diff -u pkgsrc/www/curl/Makefile:1.259 pkgsrc/www/curl/Makefile:1.260
--- pkgsrc/www/curl/Makefile:1.259      Tue Jun 28 11:37:03 2022
+++ pkgsrc/www/curl/Makefile    Wed Aug 17 10:09:54 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.259 2022/06/28 11:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.260 2022/08/17 10:09:54 tnn Exp $
 
 DISTNAME=      curl-7.84.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://curl.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/distinfo
diff -u pkgsrc/www/curl/distinfo:1.183 pkgsrc/www/curl/distinfo:1.184
--- pkgsrc/www/curl/distinfo:1.183      Mon Jun 27 07:50:13 2022
+++ pkgsrc/www/curl/distinfo    Wed Aug 17 10:09:54 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.183 2022/06/27 07:50:13 wiz Exp $
+$NetBSD: distinfo,v 1.184 2022/08/17 10:09:54 tnn Exp $
 
 BLAKE2s (curl-7.84.0.tar.xz) = 2585849e9a08bf84ac1d9ca0f1c90362620af4e0350d953d03d9ca4c7d7b7a0d
 SHA512 (curl-7.84.0.tar.xz) = 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
 Size (curl-7.84.0.tar.xz) = 2477944 bytes
 SHA1 (patch-configure) = ae123a94fa84ef99dfc1dadd596ac86ef0d143fe
 SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df
+SHA1 (patch-include_curl_curl.h) = f21dfef515713d6de6e3d8aeb32ba6d44eda6feb

Added files:

Index: pkgsrc/www/curl/patches/patch-include_curl_curl.h
diff -u /dev/null pkgsrc/www/curl/patches/patch-include_curl_curl.h:1.1
--- /dev/null   Wed Aug 17 10:09:55 2022
+++ pkgsrc/www/curl/patches/patch-include_curl_curl.h   Wed Aug 17 10:09:55 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-include_curl_curl.h,v 1.1 2022/08/17 10:09:55 tnn Exp $
+
+https://github.com/curl/curl/pull/9329
+
+--- include/curl/curl.h.orig   2022-06-23 15:51:43.000000000 +0000
++++ include/curl/curl.h
+@@ -75,7 +75,8 @@
+     defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
+     defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
+    (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
+-   (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000))
++   (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
++    defined(__sun__)
+ #include <sys/select.h>
+ #endif
+