diff --git a/www/py-flask-bcrypt/Makefile b/www/py-flask-bcrypt/Makefile
index c62656b..4a76296 100644
--- a/www/py-flask-bcrypt/Makefile
+++ b/www/py-flask-bcrypt/Makefile
@@ -1,8 +1,8 @@
 COMMENT= Flask extension provides bcrypt hashing utilities.
 
-MODPY_EGG_VERSION=1.0.1
-DISTNAME=       Flask-Bcrypt-${MODPY_EGG_VERSION}
-PKGNAME=        py-${DISTNAME:L}
+MODPY_DISTV=1.0.1
+DISTNAME=       Flask-Bcrypt-${MODPY_DISTV}
+PKGNAME=        py-${DISTNAME}
 CATEGORIES=     www
 
 # BSD
@@ -12,11 +12,11 @@ MODULES=                lang/python
 
 MODPY_PI=               Yes
 MODPY_PYBUILD =         setuptools
-FLAVORS=                python3
-FLAVOR=                 python3
 
-RUN_DEPENDS=            www/py-flask${MODPY_FLAVOR}
 
+RUN_DEPENDS=            www/py-flask${MODPY_FLAVOR} \
+			security/py-cryptography \
+			security/py-bcrypt
 # Could also use various unported eggs, Flask-Babel, speaklater
 #TEST_DEPENDS=          devel/py-nose
 
diff --git a/www/py-flask-bcrypt/pkg/PLIST b/www/py-flask-bcrypt/pkg/PLIST
index 640f689..219edeb 100644
--- a/www/py-flask-bcrypt/pkg/PLIST
+++ b/www/py-flask-bcrypt/pkg/PLIST
@@ -1,9 +1,9 @@
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/www/py-flask-wtf/Makefile b/www/py-flask-wtf/Makefile
index f57360d..e5fc845 100644
--- a/www/py-flask-wtf/Makefile
+++ b/www/py-flask-wtf/Makefile
@@ -1,8 +1,8 @@
 COMMENT=	simple integration of Flask and WTForms
 
-MODPY_EGG_VERSION=1.2.1
-DISTNAME=	flask_wtf-${MODPY_EGG_VERSION}
-PKGNAME=	py-${DISTNAME:L}
+MODPY_DISTV=1.2.1
+DISTNAME=	flask_wtf-${MODPY_DISTV}
+PKGNAME=	py-${DISTNAME}
 CATEGORIES=	www
 
 # BSD
@@ -11,9 +11,8 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_PYBUILD =		setuptools
-FLAVORS=		python3
-FLAVOR=			python3
+MODPY_PYBUILD =		hatchling
+
 
 RUN_DEPENDS=		www/py-flask${MODPY_FLAVOR} \
 			www/py-wtforms${MODPY_FLAVOR}
diff --git a/www/py-flask-wtf/pkg/PLIST b/www/py-flask-wtf/pkg/PLIST
index 9097381..93ec608 100644
--- a/www/py-flask-wtf/pkg/PLIST
+++ b/www/py-flask-wtf/pkg/PLIST
@@ -1,12 +1,12 @@
 @conflict py-flask-wtf-*
 @pkgpath www/py-flask-wtf
 lib/python${MODPY_VERSION}/site-packages/flask_wtf/
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/licenses/
-lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/flask_wtf-${MODPY_DISTV}.dist-info/licenses/LICENSE.rst
 lib/python${MODPY_VERSION}/site-packages/flask_wtf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flask_wtf/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/flask_wtf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 2a830de..e9020e4 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -1,8 +1,8 @@
 COMMENT =		microframework based on Werkzeug and Jinja 2
 
-MODPY_EGG_VERSION =	3.0.0
-DISTNAME =		flask-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME:L}
+MODPY_DISTV =	3.0.3
+DISTNAME =		flask-${MODPY_DISTV}
+PKGNAME =		py-${DISTNAME}
 
 CATEGORIES =		www devel
 
@@ -11,12 +11,12 @@ HOMEPAGE =		https://flask.palletsprojects.com/
 # BSD
 PERMIT_PACKAGE =	Yes
 
-MODULES =		lang/python
-MODPY_PI =		Yes
-MODPY_PYBUILD =	setuptools
 
-FLAVORS =		python3
-FLAVOR =		python3
+MODULES =               lang/python
+
+MODPY_PI =              Yes
+MODPY_PYBUILD =         flit_core
+
 
 RUN_DEPENDS =		devel/py-blinker${MODPY_FLAVOR} \
 			www/py-itsdangerous${MODPY_FLAVOR} \
diff --git a/www/py-flask/distinfo b/www/py-flask/distinfo
index a2d6f2d..6c862a8 100644
--- a/www/py-flask/distinfo
+++ b/www/py-flask/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flask-3.0.0.tar.gz) = z63Ntji2CTYdKewiNg1gcKd9dGPcs6sI0sLy8WiEX1g=
-SIZE (flask-3.0.0.tar.gz) = 674171
+SHA256 (flask-3.0.3.tar.gz) = zrJ7CvOCPqJzeSik2Z0SWgYXW4USxEXL2anOIA73aEI=
+SIZE (flask-3.0.3.tar.gz) = 676315
diff --git a/www/py-flask/pkg/PLIST b/www/py-flask/pkg/PLIST
index 9975baa..c0b5b37 100644
--- a/www/py-flask/pkg/PLIST
+++ b/www/py-flask/pkg/PLIST
@@ -1,11 +1,11 @@
 bin/flask
 lib/python${MODPY_VERSION}/site-packages/flask/
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/flask-${MODPY_DISTV}.dist-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/flask/__init__.py
 lib/python${MODPY_VERSION}/site-packages/flask/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/flask/${MODPY_PYCACHE}/