svn commit: r391334 - in head/x11: libxcb xcb-proto
Ruslan Makhmatkhanov
rm at FreeBSD.org
Sat Jul 4 22:14:16 UTC 2015
Author: rm
Date: Sat Jul 4 22:14:14 2015
New Revision: 391334
URL: https://svnweb.freebsd.org/changeset/ports/391334
Log:
Allow build libxcb and xcb-proto with python3
Since version 1.11 libxcb successfully builds with pytnon3, so we don't
need to limit python version anymore.
PR: 194748 194749
Submitted by: rm (myself)
Approved by: maintainer timeout (6 months+)
Modified:
head/x11/libxcb/Makefile
head/x11/xcb-proto/Makefile
head/x11/xcb-proto/pkg-plist
Modified: head/x11/libxcb/Makefile
==============================================================================
--- head/x11/libxcb/Makefile Sat Jul 4 21:54:53 2015 (r391333)
+++ head/x11/libxcb/Makefile Sat Jul 4 22:14:14 2015 (r391334)
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgcon
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
Modified: head/x11/xcb-proto/Makefile
==============================================================================
--- head/x11/xcb-proto/Makefile Sat Jul 4 21:54:53 2015 (r391333)
+++ head/x11/xcb-proto/Makefile Sat Jul 4 22:14:14 2015 (r391334)
@@ -11,8 +11,16 @@ COMMENT= The X protocol C-language Bindi
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>
Modified: head/x11/xcb-proto/pkg-plist
==============================================================================
--- head/x11/xcb-proto/pkg-plist Sat Jul 4 21:54:53 2015 (r391333)
+++ head/x11/xcb-proto/pkg-plist Sat Jul 4 22:14:14 2015 (r391334)
@@ -37,15 +37,27 @@ libdata/pkgconfig/xcb-proto.pc
%%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
More information about the svn-ports-head
mailing list