6 files changed, 31 insertions, 131 deletions

diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index 0a70a88c10e7..f94474f58248 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	boost-python-libs
-PORTREVISION=	1
 COMMENT=	Framework for interfacing Python and C++
 
 USE_BZIP2=	yes
@@ -18,7 +17,6 @@ OPTIONS=	VERBOSE_BUILD	"Show compiler messages"	off \
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/boost-all/common.mk"
-.include "${PORTSDIR}/devel/boost-all/sites.mk"
 .include "${PORTSDIR}/devel/boost-all/compiled.mk"
 
 MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
@@ -28,12 +26,7 @@ MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 
 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
 
@@ -44,25 +37,12 @@ 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
 	cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_OPTIONS} --prefix=${PREFIX}\
 		--toolset=${BOOST_TOOLS} --with-python
 
-# Build pyste, the Boost.Python code generator
-	cd ${BUILD_WRKSRC}/libs/python/pyste/install && \
-	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \
-		build ${PYDISTUTILS_BUILDARGS}
-
 # Remove non-python headers
 	cd ${WRKSRC} && \
  	${FIND} boost -not -path '*boost/python*' -delete
@@ -90,13 +70,6 @@ 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
 	@${TOUCH} ${PKGMESSAGE}
diff --git a/devel/boost-python-libs/distinfo b/devel/boost-python-libs/distinfo
index 72159a820690..4741c16b2910 100644
--- a/devel/boost-python-libs/distinfo
+++ b/devel/boost-python-libs/distinfo
@@ -1,3 +1,3 @@
-MD5 (boost_1_39_0.tar.bz2) = a17281fd88c48e0d866e1a12deecbcc0
-SHA256 (boost_1_39_0.tar.bz2) = 44785eae8c6cce61a29a8a51f9b737e57b34d66baa7c0bcd4af188832b8018fd
-SIZE (boost_1_39_0.tar.bz2) = 29408537
+MD5 (boost_1_41_0.tar.bz2) = 8bb65e133907db727a2a825c5400d0a6
+SHA256 (boost_1_41_0.tar.bz2) = 1ef94e6749eaf13318284b4f629be063544c7015b45e38113b975ac1945cc726
+SIZE (boost_1_41_0.tar.bz2) = 33348161
diff --git a/devel/boost-python-libs/files/patch-Jamroot b/devel/boost-python-libs/files/patch-Jamroot
index 3b8f07c6ec50..7903f6daf682 100644
--- a/devel/boost-python-libs/files/patch-Jamroot
+++ b/devel/boost-python-libs/files/patch-Jamroot
@@ -1,20 +1,11 @@
---- Jamroot.orig-orig	2009-07-06 20:50:54.000000000 +0400
-+++ Jamroot	2009-07-06 20:52:21.000000000 +0400
-@@ -333,7 +333,7 @@
-             # suffixes either. Pgi compilers can not accept library with version
-             # suffix.
-             if $(type) = SHARED_LIB &&
--              ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-+              ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) &&
-                 ! ( [ $(property-set).get <toolset> ] in pgi ) )
-             {
-                 result = $(result).$(BOOST_VERSION)  ;
-@@ -356,7 +356,7 @@
-             # suffixes either. Pgi compilers can not accept library with version
-             # suffix.
-             if $(type) = SHARED_LIB &&
--              ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
-+              ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) &&
-                 ! ( [ $(property-set).get <toolset> ] in pgi ) )
-             {
-                 result = $(result).$(BOOST_VERSION)  ;
+--- Jamroot.orig	2009-09-23 16:35:49.000000000 +0400
++++ Jamroot	2009-09-23 16:36:49.000000000 +0400
+@@ -384,7 +384,7 @@
+         # suffixes either. Pgi compilers can not accept library with version
+         # suffix.
+         if $(type) = SHARED_LIB &&
+-          ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
++          ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix freebsd ) &&
+             ! ( [ $(property-set).get <toolset> ] in pgi ) )
+         {
+             result = $(result).$(BOOST_VERSION)  ;
diff --git a/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam b/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam
index 68683f173aee..cc306b204292 100644
--- a/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam
+++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_common.jam
@@ -1,17 +1,17 @@
---- tools/build/v2/tools/common.jam.orig	Thu Oct 16 12:42:03 2008
-+++ tools/build/v2/tools/common.jam	Tue Nov 11 23:43:27 2008
-@@ -760,14 +760,6 @@
+--- tools/build/v2/tools/common.jam.orig	2009-09-23 16:39:31.000000000 +0400
++++ tools/build/v2/tools/common.jam	2009-09-23 16:39:33.000000000 +0400
+@@ -765,14 +765,6 @@
                  result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
-                     $(property-set) ] ] ;
- 
--                case <threading> :
+                 $(property-set) ] ] ;
+             
+-            case <threading> :
 -                result += [ join-tag $(f:G=) : [ threading-tag $(name) : $(type)
--                    : $(property-set) ] ] ;
--
--                case <runtime> :
+-                : $(property-set) ] ] ;
+-            
+-            case <runtime> :
 -                result += [ join-tag $(f:G=) : [ runtime-tag $(name) : $(type) :
--                    $(property-set) ] ] ;
--
-                 case <version:*> :
-                 local key = [ MATCH <version:(.*)> : $(f:G) ] ;
-                 local version = [ $(property-set).get <$(key)> ] ;
+-                $(property-set) ] ] ;
+-            
+             case <qt> :
+             result += [ join-tag $(f:G=) : [ qt-tag $(name) : $(type) :
+                 $(property-set) ] ] ;
diff --git a/devel/boost-python-libs/pkg-descr b/devel/boost-python-libs/pkg-descr
index 0401922628a4..827c54514377 100644
--- a/devel/boost-python-libs/pkg-descr
+++ b/devel/boost-python-libs/pkg-descr
@@ -3,4 +3,6 @@ C++. It allows you to quickly and seamlessly expose C++ classes
 functions and objects to Python, and vice-versa, using no special
 tools -- just your C++ compiler.
 
+The Boost.Pyste code generator resides in a separate port: devel/boost-pyste 
+
 WWW:  http://www.boost.org/
diff --git a/devel/boost-python-libs/pkg-plist b/devel/boost-python-libs/pkg-plist
index 4ed9e1bbd6a5..b687cf942b50 100644
--- a/devel/boost-python-libs/pkg-plist
+++ b/devel/boost-python-libs/pkg-plist
@@ -1,4 +1,3 @@
-%%PYSTE%%bin/pyste.py
 include/boost/python.hpp
 include/boost/python/arg_from_python.hpp
 include/boost/python/args.hpp
@@ -213,71 +212,6 @@ include/boost/python/wrapper.hpp
 lib/libboost_python.a
 lib/libboost_python.so
 lib/libboost_python.so.%%BOOST_SHARED_LIB_VER%%
-%%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