CVS commit: pkgsrc/www/curl

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Jan 19 19:25:40 UTC 2026

Modified Files:
        pkgsrc/www/curl: Makefile.common buildlink3.mk options.mk

Log Message:
curl & libcurl-gnutls: fix BUILDLINK_API_DEPENDS.openssl

The assignment shouldn't be placed in Makefile.common for more than one
reason (openssl is a build option, it should be propagated to packages
that link against libcurl, and, though harmless, makes no sense being
applied to libcurl-gnutls).

Related to PR pkg/59899. Also likely related to:
https://mail-index.netbsd.org/tech-pkg/2026/01/16/msg031893.html


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.69 -r1.70 pkgsrc/www/curl/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/www/curl/options.mk

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.common
diff -u pkgsrc/www/curl/Makefile.common:1.33 pkgsrc/www/curl/Makefile.common:1.34
--- pkgsrc/www/curl/Makefile.common:1.33        Mon Jan 12 11:03:55 2026
+++ pkgsrc/www/curl/Makefile.common     Mon Jan 19 19:25:40 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2026/01/12 11:03:55 mef Exp $
+# $NetBSD: Makefile.common,v 1.34 2026/01/19 19:25:40 gutteridge Exp $
 # used by www/libcurl-gnutls/Makefile
 
 DISTNAME=      curl-8.18.0
@@ -24,8 +24,6 @@ USE_LIBTOOL=          yes
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_ICONV=   no
 
-BUILDLINK_API_DEPENDS.openssl+=        openssl>=3.0
-
 # Some systems use bundles instead of directories; this needs configuring
 # because curl doesn't use default validation.
 .if !empty(SSLCERTBUNDLE)

Index: pkgsrc/www/curl/buildlink3.mk
diff -u pkgsrc/www/curl/buildlink3.mk:1.69 pkgsrc/www/curl/buildlink3.mk:1.70
--- pkgsrc/www/curl/buildlink3.mk:1.69  Wed Jan  7 08:49:17 2026
+++ pkgsrc/www/curl/buildlink3.mk       Mon Jan 19 19:25:40 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.69 2026/01/07 08:49:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.70 2026/01/19 19:25:40 gutteridge Exp $
 
 BUILDLINK_TREE+=       curl
 
@@ -12,6 +12,7 @@ BUILDLINK_PKGSRCDIR.curl?=    ../../www/cur
 pkgbase:= curl
 .include "../../mk/pkg-build-options.mk"
 .if ${PKG_BUILD_OPTIONS.curl:Mopenssl}
+BUILDLINK_API_DEPENDS.openssl+= openssl>=3.0
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 .if ${PKG_BUILD_OPTIONS.curl:Mlibssh2}

Index: pkgsrc/www/curl/options.mk
diff -u pkgsrc/www/curl/options.mk:1.26 pkgsrc/www/curl/options.mk:1.27
--- pkgsrc/www/curl/options.mk:1.26     Thu Jan  1 10:09:54 2026
+++ pkgsrc/www/curl/options.mk  Mon Jan 19 19:25:40 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.26 2026/01/01 10:09:54 rillig Exp $
+# $NetBSD: options.mk,v 1.27 2026/01/19 19:25:40 gutteridge Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.curl
 PKG_SUPPORTED_OPTIONS=         inet6 openssl libssh2 gssapi ldap rtmp idn http2
@@ -18,6 +18,7 @@ CONFIGURE_ARGS+=      --disable-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mopenssl)
+BUILDLINK_API_DEPENDS.openssl+=        openssl>=3.0
 .include "../../security/openssl/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-ssl