diff --git a/deskutils/py-autokey/Makefile b/deskutils/py-autokey/Makefile
index 16d52d440b2c..bb1c5344aadf 100644
--- a/deskutils/py-autokey/Makefile
+++ b/deskutils/py-autokey/Makefile
@@ -1,59 +1,59 @@
 PORTNAME=	autokey
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.95.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	daniel@shafer.cc
 COMMENT=	Desktop automation utility for FreeBSD and X11
 WWW=		https://github.com/autokey/autokey
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 USES=		cpe python:3.6+ shebangfix
 CPE_VENDOR=	${PORTNAME}_project
 USE_PYTHON=	distutils concurrent
 USE_GITHUB=	yes
 
 NO_ARCH=	yes
 
 OPTIONS_MULTI=	GUI
 OPTIONS_MULTI_GUI=	GTK3 QT5
 OPTIONS_DEFAULT=	GTK3
 OPTIONS_SUB=	yes
 
 GTK3_RUN_DEPENDS=	libappindicator>0:devel/libappindicator
 GTK3_USES=	gnome
 GTK3_USE=	GNOME=gtk30,gtksourceview3,pygobject3
 
 QT5_USES=	pyqt:5
 QT5_USE=	PYQT=pyqt5,sip
 
 post-patch:
 	@${REINPLACE_CMD} 's|share/man|man|g' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} "/install_requires=/s|'dbus-python', ||g" ${WRKSRC}/setup.py
 
 # setup.py installs both gtk and qt files no matter what, need to clean that up.
 post-install-GTK3-off:
 	@${RM} ${STAGEDIR}${PREFIX}/share/applications/autokey-gtk.desktop
 	@${RM} ${STAGEDIR}${PREFIX}/bin/autokey-gtk
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/autokey-gtk.1
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}${PORTNAME}/gtkui
 
 post-install-QT5-off:
 	@${RM} ${STAGEDIR}${PREFIX}/share/applications/autokey-qt.desktop
 	@${RM} ${STAGEDIR}${PREFIX}/bin/autokey-qt
 	@${RM} ${STAGEDIR}${PREFIX}/man/man1/autokey-qt.1
 	@${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}${PORTNAME}/gtkui
 
 .include <bsd.port.mk>
diff --git a/devel/py-ewmh/Makefile b/devel/py-ewmh/Makefile
index 7bdfafbd9e96..e00291ae5b4f 100644
--- a/devel/py-ewmh/Makefile
+++ b/devel/py-ewmh/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	ewmh
 DISTVERSION=	0.1.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Python implementation of Extended Window Manager Hints, based on Xlib
 WWW=		https://github.com/parkouss/pyewmh
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-ueberzug/Makefile b/graphics/py-ueberzug/Makefile
index 1bc6c38a7db7..b589cdbcd724 100644
--- a/graphics/py-ueberzug/Makefile
+++ b/graphics/py-ueberzug/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	ueberzug
 DISTVERSION=	18.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Draw images on terminals with X11 child windows
 WWW=		https://github.com/seebye/ueberzug
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PY_PILLOW} \
 		${PYTHON_PKGNAMEPREFIX}attrs>=18.2.0:devel/py-attrs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docopt>=0:devel/py-docopt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-xlib>=0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 USES=		localbase python:3.6+ shebangfix xorg
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	seebye
 USE_PYTHON=	autoplist concurrent distutils
 USE_XORG=	x11 xext
 SHEBANG_GLOB=	*.py *.sh
 
 PORTEXAMPLES=	fzfimg.sh mastodon.sh
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Xshm*.so
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/py-PyUserInput/Makefile b/misc/py-PyUserInput/Makefile
index 00ec248a37c8..1bbcc09d05c8 100644
--- a/misc/py-PyUserInput/Makefile
+++ b/misc/py-PyUserInput/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	PyUserInput
 DISTVERSION=	0.1.11
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Module for mouse and keyboard control
 WWW=		https://github.com/PyUserInput/PyUserInput
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/chamfer/Makefile b/x11-wm/chamfer/Makefile
index 49d9263ee40b..66347ca8f8bc 100644
--- a/x11-wm/chamfer/Makefile
+++ b/x11-wm/chamfer/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	chamfer
 DISTVERSION=	s20210622
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tiling X11 window manager with Vulkan compositor
 WWW=		https://jaelpark.github.io/chamferwm-docs/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		${PYTHON_PKGNAMEPREFIX}boost-libs>0:devel/boost-python-libs@${PY_FLAVOR} \
 		spirv-opt:graphics/spirv-tools \
 		vulkan-headers>0:graphics/vulkan-headers \
 		glslc:graphics/shaderc \
 		glm>0:math/glm
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 USES=		compiler:c++17-lang meson localbase pkgconfig python:3.3+ xorg
 USE_GITHUB=	yes
 USE_XORG=	xcb
 GH_ACCOUNT=	jaelpark
 GH_PROJECT=	${PORTNAME}wm
 GH_TAGNAME=	d0916ee
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \
 		${WRKSRC}/src/config.cpp ${WRKSRC}/src/main.cpp
 # XXX import('python').find_installation().dependency()
 # XXX https://github.com/mesonbuild/meson/issues/4788
 	@${REINPLACE_CMD} -e '/boost/!s/python3/python-${PYTHON_VER}/' \
 		-e '/boost/s/python3/python${PYTHON_SUFFIX}/' \
 		`if [ ${PYTHON_REL} -lt 30800 ]; then \
 			printf "%s %s" -e '/python.*embed/d'; \
 		 fi` \
 		-e '/boost/s/,/,static:true,/' \
 		${WRKSRC}/meson.build
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/shaders
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/*.spv \
 		${STAGEDIR}${DATADIR}/shaders
 	${MKDIR} ${STAGEDIR}${DATADIR}/config
 	${INSTALL_DATA} ${WRKSRC}/config/config.py \
 		${STAGEDIR}${DATADIR}/config/config.py.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions/
 	${INSTALL_DATA} ${WRKSRC}/share/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/xsessions/
 
 .include <bsd.port.mk>
diff --git a/x11/mate-dock-applet/Makefile b/x11/mate-dock-applet/Makefile
index 247ff95e492f..56339c95056e 100644
--- a/x11/mate-dock-applet/Makefile
+++ b/x11/mate-dock-applet/Makefile
@@ -1,38 +1,39 @@
 PORTNAME=	mate-dock-applet
 PORTVERSION=	21.10.0
+PORTREVISION=	1
 CATEGORIES=	x11 mate
 DIST_SUBDIR=	mate
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Application dock applet for the MATE panel
 WWW=		https://github.com/ubuntu-mate/mate-dock-applet
 
 LICENSE=	GPLv3
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-python-xlib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-xlib>=0:x11-toolkits/py-python-xlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR}
 
 USES=		python:3.7+ autoreconf gettext gmake gnome libtool localbase \
 		pkgconfig shebangfix tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ubuntu-mate
 USE_GNOME=	gtk30 libwnck3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk3
 INSTALL_TARGET=	install-strip
 SHEBANG_FILES=	src/*.in
 
 GLIB_SCHEMAS=	org.mate.panel.applet.dock.gschema.xml
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/bin/env python3|${PYTHON_CMD}|g' \
 		${WRKSRC}/src/org.mate.panel.applet.DockAppletFactory.service.in
 
 .include <bsd.port.mk>
diff --git a/x11/py-i3ipc/Makefile b/x11/py-i3ipc/Makefile
index eb2a13503a1f..ebe3baa0f27c 100644
--- a/x11/py-i3ipc/Makefile
+++ b/x11/py-i3ipc/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	i3ipc
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Improved Python library to control i3wm and sway
 WWW=		https://i3ipc-python.readthedocs.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>