CVS commit: pkgsrc/www/curl

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

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct 22 13:34:31 UTC 2023

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

Log Message:
curl: Make brotli an option

This fixes the linker errors on Fedora 39 for me. Apparently curl picks up the
headers and assumes the libraries must exist then. Explicitly disabling brotli
when not using it or depending on the buildlink when enabling it fixes this.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.19 -r1.20 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.8 pkgsrc/www/curl/Makefile.common:1.9
--- pkgsrc/www/curl/Makefile.common:1.8 Wed Oct 11 07:16:03 2023
+++ pkgsrc/www/curl/Makefile.common     Sun Oct 22 13:34:31 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.8 2023/10/11 07:16:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2023/10/22 13:34:31 js Exp $
 # used by www/libcurl-gnutls/Makefile
 
 DISTNAME=      curl-8.4.0
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://curl.se/download/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/curl/options.mk
diff -u pkgsrc/www/curl/options.mk:1.19 pkgsrc/www/curl/options.mk:1.20
--- pkgsrc/www/curl/options.mk:1.19     Mon Aug 24 20:03:12 2020
+++ pkgsrc/www/curl/options.mk  Sun Oct 22 13:34:31 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.19 2020/08/24 20:03:12 leot Exp $
+# $NetBSD: options.mk,v 1.20 2023/10/22 13:34:31 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.curl
-PKG_SUPPORTED_OPTIONS=         inet6 libssh2 gssapi ldap rtmp idn http2
+PKG_SUPPORTED_OPTIONS=         inet6 libssh2 gssapi ldap rtmp idn http2 brotli
 PKG_SUGGESTED_OPTIONS=         http2 inet6 idn
 PKG_OPTIONS_LEGACY_OPTS=       libidn:idn
 
@@ -61,3 +61,10 @@ TEST_DEPENDS+=               nghttp2-tools-[0-9]*:../
 .else
 CONFIGURE_ARGS+=       --without-nghttp2
 .endif
+
+.if !empty(PKG_OPTIONS:Mbrotli)
+.include "../../archivers/brotli/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-brotli
+.else
+CONFIGURE_ARGS+=       --without-brotli
+.endif