diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index ac9d0fcb8..916d41b89 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,9 +1,9 @@
 COMMENT=	LDAP client API for Python
 
-MODPY_EGG_VERSION =	3.4.4
-DISTNAME=	python-ldap-${MODPY_EGG_VERSION}
-PKGNAME=	py-ldap-${MODPY_EGG_VERSION}
-REVISION=	0
+MODPY_DISTV =	3.4.4
+DISTNAME=	python-ldap-${MODPY_DISTV}
+PKGNAME=	py-ldap-${MODPY_DISTV}
+REVISION=	1
 
 CATEGORIES=	databases
 
@@ -16,9 +16,6 @@ WANTLIB += lber ldap pthread ${MODPY_WANTLIB}
 
 MODULES=	lang/python
 
-FLAVORS=	python3
-FLAVOR=		python3
-
 MODPY_PI=	Yes
 MODPY_PYBUILD=	setuptools
 
@@ -26,7 +23,7 @@ LIB_DEPENDS=	${MODPY_LIB_DEPENDS} \
 		databases/openldap
 
 RUN_DEPENDS=	${MODPY_RUN_DEPENDS} \
-		devel/py-asn1-modules${MODPY_FLAVOR}
+		devel/py-asn1-modules
 
 MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/databases/py-ldap/pkg/PLIST b/databases/py-ldap/pkg/PLIST
index e236860f5..3730eaa38 100644
--- a/databases/py-ldap/pkg/PLIST
+++ b/databases/py-ldap/pkg/PLIST
@@ -1,9 +1,4 @@
-@conflict py-ldap-examples-*
-@conflict ${MODPY_PY_PREFIX}ldap-examples-*
-@pkgpath databases/py-ldap,-main
-@pkgpath databases/py-ldap,-main,python3
-@pkgpath databases/py-ldap,-examples
-@pkgpath databases/py-ldap,-examples,python3
+@pkgpath databases/py-ldap,python3
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}pyc
@@ -128,12 +123,12 @@ lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.py
 lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.py
 lib/python${MODPY_VERSION}/site-packages/ldapurl.py
 lib/python${MODPY_VERSION}/site-packages/ldif.py
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/LICENCE
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/LICENCE
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/slapdtest/
 lib/python${MODPY_VERSION}/site-packages/slapdtest/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}/
diff --git a/databases/py-mongo/Makefile b/databases/py-mongo/Makefile
index 3efdd3170..06c19db37 100644
--- a/databases/py-mongo/Makefile
+++ b/databases/py-mongo/Makefile
@@ -1,8 +1,9 @@
 COMMENT=	Python driver for mongodb
 
-MODPY_EGG_VERSION= 4.7.3
-DISTNAME=	pymongo-${MODPY_EGG_VERSION}
+MODPY_DISTV=	4.7.3
+DISTNAME=	pymongo-${MODPY_DISTV}
 PKGNAME=	py-${DISTNAME:S/py//}
+REVISION=	0
 
 CATEGORIES=	databases devel
 
@@ -16,8 +17,6 @@ WANTLIB=	pthread ${MODPY_WANTLIB}
 MODPY_PI=	Yes
 
 MODULES=	lang/python
-FLAVORS=	python3
-FLAVOR=		python3
 
 MODPY_PYBUILD=	setuptools
 
diff --git a/databases/py-mongo/pkg/PLIST b/databases/py-mongo/pkg/PLIST
index 60cbd81b7..8d2fe0e1e 100644
--- a/databases/py-mongo/pkg/PLIST
+++ b/databases/py-mongo/pkg/PLIST
@@ -1,4 +1,4 @@
-@pkgpath databases/py-mongo
+@pkgpath databases/py-mongo,python3
 %%no_be%%
 lib/python${MODPY_VERSION}/site-packages/bson/
 lib/python${MODPY_VERSION}/site-packages/bson/__init__.py
@@ -85,12 +85,12 @@ lib/python${MODPY_VERSION}/site-packages/gridfs/errors.py
 lib/python${MODPY_VERSION}/site-packages/gridfs/grid_file.py
 lib/python${MODPY_VERSION}/site-packages/gridfs/py.typed
 lib/python${MODPY_VERSION}/site-packages/pymongo/
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pymongo-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pymongo/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pymongo/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/pymongo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}