diff -Nru xcb-proto.orig/Makefile xcb-proto/Makefile
--- xcb-proto.orig/Makefile	2016-01-04 16:28:43.536398411 +1030
+++ xcb-proto/Makefile	2016-01-04 15:39:13.750602436 +1030
@@ -3,24 +3,20 @@
 
 PORTNAME=	xcb-proto
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
+LICENSE=	MIT
+
 USE_GNOME=	libxml2:build
 XORG_CAT=	proto
 USES=		python
+USE_PYTHON=	py3kplist
 
 DATADIR=	${PREFIX}/share/xcb
 
-.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>
+.include <bsd.port.mk>
diff -Nru xcb-proto.orig/pkg-plist xcb-proto/pkg-plist
--- xcb-proto.orig/pkg-plist	2016-01-04 16:28:43.555399131 +1030
+++ xcb-proto/pkg-plist	2016-01-04 15:01:43.127757557 +1030
@@ -37,27 +37,15 @@
 %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py
 %%PYTHON_SITELIBDIR%%/xcbgen/state.py
 %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py
-%%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
+%%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