CVS commit: pkgsrc/www/curl

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug  9 11:07:36 UTC 2024

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

Log Message:
curl: add/fix brotli and zstd options

from iris000 on pkgsrc-users@


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/www/curl/buildlink3.mk
cvs rdiff -u -r1.20 -r1.21 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/buildlink3.mk
diff -u pkgsrc/www/curl/buildlink3.mk:1.60 pkgsrc/www/curl/buildlink3.mk:1.61
--- pkgsrc/www/curl/buildlink3.mk:1.60  Thu May 16 06:15:40 2024
+++ pkgsrc/www/curl/buildlink3.mk       Fri Aug  9 11:07:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2024/05/16 06:15:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2024/08/09 11:07:36 nia Exp $
 
 BUILDLINK_TREE+=       curl
 
@@ -29,6 +29,12 @@ pkgbase:= curl
 .if ${PKG_BUILD_OPTIONS.curl:Mhttp2}
 .  include "../../www/nghttp2/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.curl:Mbrotli}
+.  include "../../archivers/brotli/buildlink3.mk"
+.endif
+.if ${PKG_BUILD_OPTIONS.curl:Mzstd}
+.  include "../../archivers/zstd/buildlink3.mk"
+.endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/www/curl/options.mk
diff -u pkgsrc/www/curl/options.mk:1.20 pkgsrc/www/curl/options.mk:1.21
--- pkgsrc/www/curl/options.mk:1.20     Sun Oct 22 13:34:31 2023
+++ pkgsrc/www/curl/options.mk  Fri Aug  9 11:07:36 2024
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.20 2023/10/22 13:34:31 js Exp $
+# $NetBSD: options.mk,v 1.21 2024/08/09 11:07:36 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.curl
 PKG_SUPPORTED_OPTIONS=         inet6 libssh2 gssapi ldap rtmp idn http2 brotli
+PKG_SUPPORTED_OPTIONS+=                zstd
 PKG_SUGGESTED_OPTIONS=         http2 inet6 idn
 PKG_OPTIONS_LEGACY_OPTS=       libidn:idn
 
@@ -68,3 +69,10 @@ CONFIGURE_ARGS+=     --with-brotli
 .else
 CONFIGURE_ARGS+=       --without-brotli
 .endif
+
+.if !empty(PKG_OPTIONS:Mzstd)
+.include "../../archivers/zstd/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-zstd
+.else
+CONFIGURE_ARGS+=       --without-zstd
+.endif