CVS commit: pkgsrc/www/curl

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 17:17:00 UTC 2025

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

Log Message:
www/curl: Make openssl an option

QNX doesn't support OpenSSL, so default to not using openssl there.


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 pkgsrc/www/curl/Makefile
cvs rdiff -u -r1.22 -r1.23 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
diff -u pkgsrc/www/curl/Makefile:1.298 pkgsrc/www/curl/Makefile:1.299
--- pkgsrc/www/curl/Makefile:1.298      Sat May 31 19:27:42 2025
+++ pkgsrc/www/curl/Makefile    Sun Oct  5 17:17:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.298 2025/05/31 19:27:42 wiz Exp $
+# $NetBSD: Makefile,v 1.299 2025/10/05 17:17:00 js Exp $
 
 .include "Makefile.common"
 
@@ -14,5 +14,4 @@ SUPERSEDES+=          wcurl-[0-9]*
 
 .include "options.mk"
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/curl/options.mk
diff -u pkgsrc/www/curl/options.mk:1.22 pkgsrc/www/curl/options.mk:1.23
--- pkgsrc/www/curl/options.mk:1.22     Wed Dec 11 12:00:53 2024
+++ pkgsrc/www/curl/options.mk  Sun Oct  5 17:17:00 2025
@@ -1,9 +1,12 @@
-# $NetBSD: options.mk,v 1.22 2024/12/11 12:00:53 ryoon Exp $
+# $NetBSD: options.mk,v 1.23 2025/10/05 17:17:00 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS=         inet6 libssh2 gssapi ldap rtmp idn http2 brotli
-PKG_SUPPORTED_OPTIONS+=                zstd
+PKG_SUPPORTED_OPTIONS=         inet6 openssl libssh2 gssapi ldap rtmp idn http2
+PKG_SUPPORTED_OPTIONS+=                brotli zstd
 PKG_SUGGESTED_OPTIONS=         http2 inet6 idn
+.if ${OPSYS} != "QNX"
+PKG_SUGGESTED_OPTIONS+=                openssl
+.endif
 PKG_OPTIONS_LEGACY_OPTS=       libidn:idn
 
 .include "../../mk/bsd.options.mk"
@@ -14,6 +17,13 @@ CONFIGURE_ARGS+=     --enable-ipv6
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
+.if !empty(PKG_OPTIONS:Mopenssl)
+.include "../../security/openssl/buildlink3.mk"                                                                                              
+CONFIGURE_ARGS+=       --enable-openssl
+.else
+CONFIGURE_ARGS+=       --without-ssl
+.endif
+
 .if !empty(PKG_OPTIONS:Mlibssh2)
 CONFIGURE_ARGS+=       --with-libssh2=${BUILDLINK_PREFIX.libssh2}
 .  include "../../security/libssh2/buildlink3.mk"