Re: [PATCH] www/curl certbundle and missing dep

["Dr. Thomas Orgis" <thomas.orgis%uni-hamburg.de@localhost>]

Missed the buildlink3 part in the first patch.

-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg

--- pkgsrc-2020Q3/www/curl/Makefile	2020-08-31 20:12:32.000000000 +0200
+++ pkgsrc/www/curl/Makefile	2020-11-15 14:03:17.797692782 +0100
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.233 2020/08/31 18:12:32 wiz Exp $
 
 DISTNAME=	curl-7.72.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://curl.haxx.se/download/
 EXTRACT_SUFX=	.tar.xz
@@ -20,7 +20,6 @@
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 PKGCONFIG_OVERRIDE=	libcurl.pc.in
 TEST_TARGET=		check
@@ -49,5 +48,14 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/libpsl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# Openssl builtin detection sets SSLCERTBUNDLE if a bundle is found
+# in /etc/. This is essential to have working curl!
+.if !empty(SSLCERTBUNDLE)
+CONFIGURE_ARGS+=        --with-ca-bundle=${SSLCERTBUNDLE}
+.else
+CONFIGURE_ARGS+=	--with-ca-path=${SSLCERTS}
+.endif
--- pkgsrc-2020Q3/www/curl/buildlink3.mk	2020-07-01 09:54:09.000000000 +0200
+++ pkgsrc/www/curl/buildlink3.mk	2020-11-15 14:35:46.017872934 +0100
@@ -33,6 +33,7 @@
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../www/libpsl/buildlink3.mk"
 .endif # CURL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-curl