CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 15:32:11 UTC 2025

Modified Files:
        pkgsrc/chat/matrix-synapse: Makefile
        pkgsrc/filesystems/tahoe-lafs: Makefile
        pkgsrc/net/py-twisted: Makefile
        pkgsrc/net/syncthing-gtk: Makefile
        pkgsrc/security/py-asyncssh: Makefile
        pkgsrc/sysutils/checkpassword-phpbb: Makefile
        pkgsrc/www/py-flask-user: Makefile
        pkgsrc/www/py-trytond-web-user: Makefile

Log Message:
*: switch py-bcrypt users to versioned_dependencies.mk, bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/chat/matrix-synapse/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/filesystems/tahoe-lafs/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/py-twisted/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/syncthing-gtk/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/security/py-asyncssh/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/checkpassword-phpbb/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/py-flask-user/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-trytond-web-user/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/matrix-synapse/Makefile
diff -u pkgsrc/chat/matrix-synapse/Makefile:1.107 pkgsrc/chat/matrix-synapse/Makefile:1.108
--- pkgsrc/chat/matrix-synapse/Makefile:1.107   Sat Feb 15 15:34:05 2025
+++ pkgsrc/chat/matrix-synapse/Makefile Tue Feb 18 15:32:10 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2025/02/15 15:34:05 gdt Exp $
+# $NetBSD: Makefile,v 1.108 2025/02/18 15:32:10 wiz Exp $
 
 DISTNAME=      matrix-synapse-1.124.0
 CATEGORIES=    chat
@@ -114,7 +114,7 @@ post-install:
        # install phase, a pre-install target to clean them up in the
        # sources does not work.  Cleaning them up earlier breaks
        # mkpatches.
-       cd ${DESTDIR} && find . -name '*.orig' | xargs rm 
+       cd ${DESTDIR} && find . -name '*.orig' | xargs rm
 
 # \todo Grok upstream's new test scheme and port to it.
 # As of 1.98.0 all tests fail, most of them failing to import

Index: pkgsrc/filesystems/tahoe-lafs/Makefile
diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.65 pkgsrc/filesystems/tahoe-lafs/Makefile:1.66
--- pkgsrc/filesystems/tahoe-lafs/Makefile:1.65 Mon Oct 14 06:45:43 2024
+++ pkgsrc/filesystems/tahoe-lafs/Makefile      Tue Feb 18 15:32:10 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2024/10/14 06:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2025/02/18 15:32:10 wiz Exp $
 
 VERSION_BASE=  1.19.0
 VERSION_RC=
 DISTNAME=      tahoe-lafs-${VERSION_BASE}${VERSION_RC}
+PKGREVISION=   1
 CATEGORIES=    filesystems
 MASTER_SITES=  https://tahoe-lafs.org/downloads/
 
@@ -26,7 +27,6 @@ DEPENDS+=     ${PYPKGPREFIX}-foolscap>=21.7.
 # TODO: conch??
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=19.10.0:../../net/py-twisted
 # bcrypt and appdirs are required as twisted deps at runtime
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
 DEPENDS+=      ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
@@ -47,7 +47,7 @@ DEPENDS+=     ${PYPKGPREFIX}-click>8.1.1:../
 DEPENDS+=      ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
 DEPENDS+=      ${PYPKGPREFIX}-filelock-[0-9]*:../../devel/py-filelock
 
-PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt cryptography
 
 # tor_requires
 DEPENDS+=      ${PYPKGPREFIX}-txtorcon>=0.17.0:../../net/py-txtorcon

Index: pkgsrc/net/py-twisted/Makefile
diff -u pkgsrc/net/py-twisted/Makefile:1.56 pkgsrc/net/py-twisted/Makefile:1.57
--- pkgsrc/net/py-twisted/Makefile:1.56 Wed Nov 13 09:11:39 2024
+++ pkgsrc/net/py-twisted/Makefile      Tue Feb 18 15:32:10 2025
@@ -1,35 +1,36 @@
-# $NetBSD: Makefile,v 1.56 2024/11/13 09:11:39 adam Exp $
+# $NetBSD: Makefile,v 1.57 2025/02/18 15:32:10 wiz Exp $
 
 .include "../../net/py-twisted/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 COMMENT=       Framework for writing networked applications
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-hatchling>=1.10.0:../../devel/py-hatchling
-TOOL_DEPENDS+= ${PYPKGPREFIX}-hatch-fancy-pypi-readme>=22.5.0:../../devel/py-hatch-fancy-pypi-readme
-DEPENDS+=      ${PYPKGPREFIX}-attrs>=22.2.0:../../devel/py-attrs
-DEPENDS+=      ${PYPKGPREFIX}-automat>=24.8.0:../../devel/py-automat
-DEPENDS+=      ${PYPKGPREFIX}-constantly>=15.1:../../devel/py-constantly
-DEPENDS+=      ${PYPKGPREFIX}-hyperlink>=17.1.1:../../www/py-hyperlink
-DEPENDS+=      ${PYPKGPREFIX}-incremental>=24.7.0:../../devel/py-incremental
-DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=4.2.0:../../devel/py-typing-extensions
-DEPENDS+=      ${PYPKGPREFIX}-zope.interface>=5:../../devel/py-zope.interface
+TOOL_DEPENDS+=                 ${PYPKGPREFIX}-hatchling>=1.10.0:../../devel/py-hatchling
+TOOL_DEPENDS+=                 ${PYPKGPREFIX}-hatch-fancy-pypi-readme>=22.5.0:../../devel/py-hatch-fancy-pypi-readme
+DEPENDS+=                      ${PYPKGPREFIX}-attrs>=22.2.0:../../devel/py-attrs
+DEPENDS+=                      ${PYPKGPREFIX}-automat>=24.8.0:../../devel/py-automat
+DEPENDS+=                      ${PYPKGPREFIX}-constantly>=15.1:../../devel/py-constantly
+DEPENDS+=                      ${PYPKGPREFIX}-hyperlink>=17.1.1:../../www/py-hyperlink
+DEPENDS+=                      ${PYPKGPREFIX}-incremental>=24.7.0:../../devel/py-incremental
+DEPENDS+=                      ${PYPKGPREFIX}-typing-extensions>=4.2.0:../../devel/py-typing-extensions
+DEPENDS+=                      ${PYPKGPREFIX}-zope.interface>=5:../../devel/py-zope.interface
 # tls
-DEPENDS+=      ${PYPKGPREFIX}-idna>=2.4:../../www/py-idna
-DEPENDS+=      ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
+DEPENDS+=                      ${PYPKGPREFIX}-idna>=2.4:../../www/py-idna
+DEPENDS+=                      ${PYPKGPREFIX}-service_identity>=18.1.0:../../security/py-service_identity
 PYTHON_VERSIONED_DEPENDENCIES+=        OpenSSL
 # conch
 PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
-DEPENDS+=      ${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
+DEPENDS+=                      ${PYPKGPREFIX}-appdirs>=1.4.0:../../devel/py-appdirs
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt
 # serial
-DEPENDS+=      ${PYPKGPREFIX}-serial>=3.0:../../comms/py-serial
+DEPENDS+=                      ${PYPKGPREFIX}-serial>=3.0:../../comms/py-serial
 # http2
-DEPENDS+=      ${PYPKGPREFIX}-h2>=3.2:../../www/py-h2
-DEPENDS+=      ${PYPKGPREFIX}-priority>=1.1.0:../../www/py-priority
-TEST_DEPENDS+= ${PYPKGPREFIX}-hamcrest>=2:../../devel/py-hamcrest
-TEST_DEPENDS+= ${PYPKGPREFIX}-httpx>=0.27:../../www/py-httpx
-TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis>=6.56:../../devel/py-hypothesis
+DEPENDS+=                      ${PYPKGPREFIX}-h2>=3.2:../../www/py-h2
+DEPENDS+=                      ${PYPKGPREFIX}-priority>=1.1.0:../../www/py-priority
+TEST_DEPENDS+=                 ${PYPKGPREFIX}-hamcrest>=2:../../devel/py-hamcrest
+TEST_DEPENDS+=                 ${PYPKGPREFIX}-httpx>=0.27:../../www/py-httpx
+TEST_DEPENDS+=                 ${PYPKGPREFIX}-hypothesis>=6.56:../../devel/py-hypothesis
 
 REPLACE_PYTHON+=       src/twisted/mail/test/pop3testserver.py
 REPLACE_PYTHON+=       src/twisted/trial/test/scripttest.py

Index: pkgsrc/net/syncthing-gtk/Makefile
diff -u pkgsrc/net/syncthing-gtk/Makefile:1.47 pkgsrc/net/syncthing-gtk/Makefile:1.48
--- pkgsrc/net/syncthing-gtk/Makefile:1.47      Fri Dec 27 08:20:30 2024
+++ pkgsrc/net/syncthing-gtk/Makefile   Tue Feb 18 15:32:10 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2024/12/27 08:20:30 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2025/02/18 15:32:10 wiz Exp $
 
 DISTNAME=      syncthing-gtk-0.9.4.5
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=syncthing-gtk/}
 GITHUB_TAG=    ${PKGVERSION_NOREV}
@@ -15,7 +15,7 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-setuptools
 DEPENDS+=      syncthing>=0.13.0:../../net/syncthing
 DEPENDS+=      glib-networking-[0-9]*:../../net/glib-networking
 DEPENDS+=      psmisc-[0-9]*:../../sysutils/psmisc
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt
 DEPENDS+=      ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
@@ -56,4 +56,5 @@ BUILDLINK_API_DEPENDS.librsvg+=       librsvg>
 .include "../../lang/python/wheel.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-asyncssh/Makefile
diff -u pkgsrc/security/py-asyncssh/Makefile:1.48 pkgsrc/security/py-asyncssh/Makefile:1.49
--- pkgsrc/security/py-asyncssh/Makefile:1.48   Thu Dec 26 13:57:48 2024
+++ pkgsrc/security/py-asyncssh/Makefile        Tue Feb 18 15:32:10 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2024/12/26 13:57:48 adam Exp $
+# $NetBSD: Makefile,v 1.49 2025/02/18 15:32:10 wiz Exp $
 
 DISTNAME=      asyncssh-2.19.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    security python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=a/asyncssh/}
 
@@ -11,7 +12,6 @@ COMMENT=      Asynchronous SSHv2 client and s
 LICENSE=       epl-v2.0
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
 DEPENDS+=      ${PYPKGPREFIX}-gssapi>=1.2.0:../../security/py-gssapi
 DEPENDS+=      ${PYPKGPREFIX}-typing-extensions>=4.0:../../devel/py-typing-extensions
 
@@ -19,6 +19,7 @@ USE_LANGUAGES=        # none
 
 .include "../../lang/python/wheel.mk"
 PYTHON_VERSIONED_DEPENDENCIES+=        OpenSSL
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt
 PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/checkpassword-phpbb/Makefile
diff -u pkgsrc/sysutils/checkpassword-phpbb/Makefile:1.3 pkgsrc/sysutils/checkpassword-phpbb/Makefile:1.4
--- pkgsrc/sysutils/checkpassword-phpbb/Makefile:1.3    Sat Nov 25 18:44:57 2023
+++ pkgsrc/sysutils/checkpassword-phpbb/Makefile        Tue Feb 18 15:32:10 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2023/11/25 18:44:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2025/02/18 15:32:10 wiz Exp $
 
 DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=               ${GITHUB_PROJECT}-0.0.20150326
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=ser/}
 GITHUB_PROJECT=                checkpassword-phpbb
@@ -14,7 +14,6 @@ COMMENT=              DJB-style checkpassword for ph
 LICENSE=               gnu-lgpl-v3
 
 DEPENDS+=              ${PYPKGPREFIX}-mysql-connector-[0-9]*:../../databases/py-mysql-connector
-DEPENDS+=              ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
 
 USE_LANGUAGES=         # none
 NO_BUILD=              yes
@@ -27,4 +26,6 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../lang/python/application.mk"
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-flask-user/Makefile
diff -u pkgsrc/www/py-flask-user/Makefile:1.25 pkgsrc/www/py-flask-user/Makefile:1.26
--- pkgsrc/www/py-flask-user/Makefile:1.25      Mon Nov 11 07:29:23 2024
+++ pkgsrc/www/py-flask-user/Makefile   Tue Feb 18 15:32:11 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2024/11/11 07:29:23 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2025/02/18 15:32:11 wiz Exp $
 
 DISTNAME=      Flask-User-1.0.2.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
+PKGREVISION=   1
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=F/Flask-User/}
 
@@ -11,7 +12,6 @@ COMMENT=      Customizable user account manag
 LICENSE=       2-clause-bsd
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=2.0:../../security/py-bcrypt
 DEPENDS+=      ${PYPKGPREFIX}-flask>=0.9:../../www/py-flask
 DEPENDS+=      ${PYPKGPREFIX}-flask-login>=0.2:../../www/py-flask-login
 DEPENDS+=      ${PYPKGPREFIX}-flask-mail>=0.9:../../www/py-flask-mail
@@ -23,7 +23,7 @@ USE_LANGUAGES=                # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt cryptography
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/wheel.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-trytond-web-user/Makefile
diff -u pkgsrc/www/py-trytond-web-user/Makefile:1.7 pkgsrc/www/py-trytond-web-user/Makefile:1.8
--- pkgsrc/www/py-trytond-web-user/Makefile:1.7 Wed Jul 20 23:02:36 2022
+++ pkgsrc/www/py-trytond-web-user/Makefile     Tue Feb 18 15:32:11 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2022/07/20 23:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2025/02/18 15:32:11 wiz Exp $
 TRYTON_MODULE_NAME=    trytond_web_user
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../devel/py-trytond/Makefile.common"
-CATEGORIES=    python www
+CATEGORIES=    www python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.tryton.org/
@@ -11,11 +11,12 @@ LICENSE=    gnu-gpl-v3
 
 DEPENDS+=      ${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
 DEPENDS+=      ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
-DEPENDS+=      ${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
 DEPENDS+=      ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+PYTHON_VERSIONED_DEPENDENCIES+=        bcrypt
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"