CVS commit: pkgsrc/www/py-urllib3

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Mar 19 10:58:01 UTC 2024

Modified Files:
        pkgsrc/www/py-urllib3: Makefile
Added Files:
        pkgsrc/www/py-urllib3: options.mk

Log Message:
py-urllib3: Make optional dependencies actually optional.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/www/py-urllib3/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/py-urllib3/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/py-urllib3/Makefile
diff -u pkgsrc/www/py-urllib3/Makefile:1.58 pkgsrc/www/py-urllib3/Makefile:1.59
--- pkgsrc/www/py-urllib3/Makefile:1.58 Sun Feb 18 08:24:11 2024
+++ pkgsrc/www/py-urllib3/Makefile      Tue Mar 19 10:58:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2024/02/18 08:24:11 adam Exp $
+# $NetBSD: Makefile,v 1.59 2024/03/19 10:58:01 nia Exp $
 
 DISTNAME=      urllib3-2.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,17 +14,15 @@ TOOL_DEPENDS+=      ${PYPKGPREFIX}-hatchling>
 # optional dependencies:
 # "socks"; higher requirement from dev_requirements.txt
 DEPENDS+=      ${PYPKGPREFIX}-Socks>=1.7.1:../../net/py-Socks
-# "brotli"
-DEPENDS+=      ${PYPKGPREFIX}-brotli>=1.0.9:../../archivers/py-brotli
-DEPENDS+=      ${PYPKGPREFIX}-brotlicffi>=0.8.0:../../archivers/py-brotlicffi
-# "zstd"
-DEPENDS+=      ${PYPKGPREFIX}-zstandard>=0.18.0:../../archivers/py-zstandard
 # "secure"
 #PYTHON_VERSIONED_DEPENDENCIES+=       OpenSSL cryptography
 #DEPENDS+=     ${PYPKGPREFIX}-idna>=2.0.0:../../www/py-idna
 #DEPENDS+=     ${PYPKGPREFIX}-certifi>=0:../../www/py-certify
 # but also needs unpackaged urlib3-secure-extra
 
+# brotli, zstd
+.include "options.mk"
+
 # needs py-cryptography>=39.0.1
 PYTHON_VERSIONED_DEPENDENCIES+=        cryptography:test
 

Added files:

Index: pkgsrc/www/py-urllib3/options.mk
diff -u /dev/null pkgsrc/www/py-urllib3/options.mk:1.1
--- /dev/null   Tue Mar 19 10:58:01 2024
+++ pkgsrc/www/py-urllib3/options.mk    Tue Mar 19 10:58:01 2024
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2024/03/19 10:58:01 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.py-urllib3
+PKG_SUPPORTED_OPTIONS=         brotli zstd
+PKG_SUGGESTED_OPTIONS=         brotli zstd
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mbrotli)
+DEPENDS+=      ${PYPKGPREFIX}-brotli>=1.0.9:../../archivers/py-brotli
+DEPENDS+=      ${PYPKGPREFIX}-brotlicffi>=0.8.0:../../archivers/py-brotlicffi
+.endif
+
+.if !empty(PKG_OPTIONS:Mzstd)
+DEPENDS+=      ${PYPKGPREFIX}-zstandard>=0.18.0:../../archivers/py-zstandard
+.endif