diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 95131972d231..8a03571772e2 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,20 +1,19 @@
 PORTNAME=	xcb-proto
 PORTVERSION=	1.17.0
 CATEGORIES=	x11 python
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 WWW=		https://xcb.freedesktop.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnome python tar:xz xorg-cat:proto
 USE_GNOME=	libxml2:build
-USE_PYTHON=	py3kplist
 NO_ARCH=	yes
 MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 DATADIR=	${PREFIX}/share/xcb
 
 .include <bsd.port.mk>
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index 0f79c71d935d..10db9e7288d2 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -1,62 +1,62 @@
 libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/bigreq.xml
 %%DATADIR%%/composite.xml
 %%DATADIR%%/damage.xml
 %%DATADIR%%/dbe.xml
 %%DATADIR%%/dpms.xml
 %%DATADIR%%/dri2.xml
 %%DATADIR%%/dri3.xml
 %%DATADIR%%/ge.xml
 %%DATADIR%%/glx.xml
 %%DATADIR%%/present.xml
 %%DATADIR%%/randr.xml
 %%DATADIR%%/record.xml
 %%DATADIR%%/render.xml
 %%DATADIR%%/res.xml
 %%DATADIR%%/screensaver.xml
 %%DATADIR%%/shape.xml
 %%DATADIR%%/shm.xml
 %%DATADIR%%/sync.xml
 %%DATADIR%%/xc_misc.xml
 %%DATADIR%%/xcb.xsd
 %%DATADIR%%/xevie.xml
 %%DATADIR%%/xf86dri.xml
 %%DATADIR%%/xf86vidmode.xml
 %%DATADIR%%/xfixes.xml
 %%DATADIR%%/xinerama.xml
 %%DATADIR%%/xinput.xml
 %%DATADIR%%/xkb.xml
 %%DATADIR%%/xprint.xml
 %%DATADIR%%/xproto.xml
 %%DATADIR%%/xselinux.xml
 %%DATADIR%%/xtest.xml
 %%DATADIR%%/xv.xml
 %%DATADIR%%/xvmc.xml
 %%PYTHON_SITELIBDIR%%/xcbgen/__init__.py
-%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.opt-2.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.opt-2.pyc
 %%PYTHON_SITELIBDIR%%/xcbgen/align.py
-%%PYTHON_SITELIBDIR%%/xcbgen/align.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/align.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/error.py
-%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/expr.py
-%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
-%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/state.py
-%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.opt-2.pyc