Index: Makefile
===================================================================
--- Makefile	(revision 372044)
+++ Makefile	(working copy)
@@ -11,8 +11,16 @@
 
 USE_GNOME=	libxml2:build
 XORG_CAT=	proto
-USES=		python:2
+USES=		python
 
 DATADIR=	${PREFIX}/share/xcb
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} == 3
+PLIST_SUB+=	PYTHON_SUFFIX=${PYTHON_SUFFIX} PY3="" PY2="@comment "
+.else
+PLIST_SUB+=	PY2="" PY3="@comment "
+.endif
+
+.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 372044)
+++ pkg-plist	(working copy)
@@ -37,15 +37,27 @@
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
 %%PYTHON_SITELIBDIR%%/xcbgen/state.py
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
-%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
-%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyc
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/__init__.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/error.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/expr.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/matcher.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/state.pyo
+%%PY2%%%%PYTHON_SITELIBDIR%%/xcbgen/xtypes.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyo
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PY3%%%%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes.cpython-%%PYTHON_SUFFIX%%.pyo