Index: head/x11/libxcb/Makefile
===================================================================
--- head/x11/libxcb/Makefile	(revision 391333)
+++ head/x11/libxcb/Makefile	(revision 391334)
@@ -1,46 +1,46 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	libxcb
 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) library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
 		xcb-proto>=1.9:${PORTSDIR}/x11/xcb-proto \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
 
 CONFIGURE_ARGS+=	--disable-build-docs --without-doxygen --enable-xinput
 
 XORG_CAT=	lib
-USES=		cpe gmake python:2,build
+USES=		cpe gmake python:build
 USE_GNOME=	libxslt:build
 USE_XORG=	xau xdmcp
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	x
 
 OPTIONS_DEFINE=	DOCS
 
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 CONFIGURE_ARGS+=${f}="${${f}}"
 .endfor
 CONFIGURE_ARGS+=--enable-xkb
 
 NEEDED_CFLAGS=	-I${LOCALBASE}/include
 NEEDED_LIBS=	-L${LOCALBASE}/lib -lXau `pkg-config --libs pthread-stubs`
 
 XDMCP_CFLAGS=	-I${LOCALBASE}/include
 XDMCP_LIBS=	-L${LOCALBASE}/lib -lXdmcp
 
 XPROTO_CFLAGS=	-I${LOCALBASE}/include
 XPROTO_LIBS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
Index: head/x11/xcb-proto/Makefile
===================================================================
--- head/x11/xcb-proto/Makefile	(revision 391333)
+++ head/x11/xcb-proto/Makefile	(revision 391334)
@@ -1,18 +1,26 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	xcb-proto
 PORTVERSION=	1.11
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) protocol
 
 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: head/x11/xcb-proto/pkg-plist
===================================================================
--- head/x11/xcb-proto/pkg-plist	(revision 391333)
+++ head/x11/xcb-proto/pkg-plist	(revision 391334)
@@ -1,51 +1,63 @@
 libdata/pkgconfig/xcb-proto.pc
 %%DATADIR%%/bigreq.xml
 %%DATADIR%%/composite.xml
 %%DATADIR%%/damage.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%%/xkb.xml
 %%DATADIR%%/xinerama.xml
 %%DATADIR%%/xinput.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/error.py
 %%PYTHON_SITELIBDIR%%/xcbgen/expr.py
 %%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