Disable pyste by default (depends on abandoned gccxml, which

brings in gcc34 for modern systems).
Bump PORTREVISION.

PR:		ports/138770
Submitted by:	Mel Flynn <mel at rachie.is-a-geek.net>
Approved by:	Alexander Churanov (maintainer)

2 files changed, 79 insertions, 71 deletions

diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index 064608cafde8..0a70a88c10e7 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	boost-python-libs
+PORTREVISION=	1
 COMMENT=	Framework for interfacing Python and C++
 
 USE_BZIP2=	yes
@@ -25,10 +26,14 @@ MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
 		PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
 
-RUN_DEPENDS+=	${PREFIX}/lib/libboost_thread.so.${BOOST_SHARED_LIB_VER}:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS+=	gccxml:${PORTSDIR}/devel/gccxml \
-		${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
-
+RUN_DEPENDS+=	${LOCALBASE}/lib/libboost_thread.so.${BOOST_SHARED_LIB_VER}:${PORTSDIR}/devel/boost-libs
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
+.if defined(WITH_PYSTE)
+RUN_DEPENDS+=	gccxml:${PORTSDIR}/devel/gccxml
+PLIST_SUB+=	PYSTE=
+.else
+PLIST_SUB+=	PYSTE="@comment "
+.endif
 BUILD_DEPENDS+=	${BJAM}:${PORTSDIR}/devel/boost-jam
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/elementtree/ElementTree.py:${PORTSDIR}/devel/py-elementtree
 
@@ -39,12 +44,13 @@ PLIST_SUB+=	PYTHON_VERSION=${PYTHON_VERSION:C/python//1}
 
 post-patch: customize-boost-build
 
-
+.if defined(WITH_PYSTE)
 post-configure:
 # Configure pyste, the Boost.Python code generator
 	@cd ${BUILD_WRKSRC}/libs/python/pyste/install && \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \
 		config ${PYDISTUTILS_CONFIGUREARGS}
+.endif
 
 do-build:
 # build the library
@@ -84,10 +90,12 @@ do-install:
 	${FIND} boost -type f -a \! -name "*.orig"\
 		-exec ${INSTALL_DATA} \{\} ${PREFIX}/include/\{\} \;
 
+.if defined(WITH_PYSTE)
 # Install pyste, the Boost.Python code generator
 	cd ${WRKSRC}/libs/python/pyste/install && \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \
 		install ${PYDISTUTILS_INSTALLARGS}
+.endif
 
 post-install:
 # display pkg-message
diff --git a/devel/boost-python-libs/pkg-plist b/devel/boost-python-libs/pkg-plist
index 8e7afac2f87b..4ed9e1bbd6a5 100644
--- a/devel/boost-python-libs/pkg-plist
+++ b/devel/boost-python-libs/pkg-plist
@@ -1,4 +1,4 @@
-bin/pyste.py
+%%PYSTE%%bin/pyste.py
 include/boost/python.hpp
 include/boost/python/arg_from_python.hpp
 include/boost/python/args.hpp
@@ -213,71 +213,71 @@ include/boost/python/wrapper.hpp
 lib/libboost_python.a
 lib/libboost_python.so
 lib/libboost_python.so.%%BOOST_SHARED_LIB_VER%%
-%%PYTHON_SITELIBDIR%%/Pyste-0.9.10-py%%PYTHON_VERSION%%.egg-info
-%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/CppParser.py
-%%PYTHON_SITELIBDIR%%/Pyste/CppParser.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/CppParser.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/Exporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/Exporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/Exporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.py
-%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.py
-%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.py
-%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.py
-%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.py
-%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/__init__.py
-%%PYTHON_SITELIBDIR%%/Pyste/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/declarations.py
-%%PYTHON_SITELIBDIR%%/Pyste/declarations.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/declarations.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/exporters.py
-%%PYTHON_SITELIBDIR%%/Pyste/exporters.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/exporters.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.py
-%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/infos.py
-%%PYTHON_SITELIBDIR%%/Pyste/infos.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/infos.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/policies.py
-%%PYTHON_SITELIBDIR%%/Pyste/policies.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/policies.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/pyste.py
-%%PYTHON_SITELIBDIR%%/Pyste/pyste.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/pyste.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/settings.py
-%%PYTHON_SITELIBDIR%%/Pyste/settings.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/settings.pyo
-%%PYTHON_SITELIBDIR%%/Pyste/utils.py
-%%PYTHON_SITELIBDIR%%/Pyste/utils.pyc
-%%PYTHON_SITELIBDIR%%/Pyste/utils.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/Pyste
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste-0.9.10-py%%PYTHON_VERSION%%.egg-info
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/ClassExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CodeExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CppParser.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CppParser.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/CppParser.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/EnumExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/Exporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/Exporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/Exporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/FunctionExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/GCCXMLParser.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/HeaderExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/MultipleCodeUnit.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SingleCodeUnit.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/SmartFile.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/VarExporter.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/__init__.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/__init__.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/__init__.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/declarations.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/declarations.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/declarations.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporters.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporters.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporters.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/exporterutils.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/infos.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/infos.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/infos.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/policies.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/policies.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/policies.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/pyste.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/pyste.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/pyste.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/settings.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/settings.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/settings.pyo
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/utils.py
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/utils.pyc
+%%PYSTE%%%%PYTHON_SITELIBDIR%%/Pyste/utils.pyo
+%%PYSTE%%@dirrm %%PYTHON_SITELIBDIR%%/Pyste
 @dirrm include/boost/python/suite/indexing/detail
 @dirrm include/boost/python/suite/indexing
 @dirrm include/boost/python/suite