Index: head/devel/boost-python-libs/Makefile
===================================================================
--- head/devel/boost-python-libs/Makefile	(revision 533155)
+++ head/devel/boost-python-libs/Makefile	(revision 533156)
@@ -1,52 +1,70 @@
 # Created by: Alexander Churanov <churanov.port.maintainer@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	boost-libs
+PORTREVISION=	1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 COMMENT=	Framework for interfacing Python and C++
 
 BUILD_DEPENDS=	bjam:devel/boost-jam \
 		${PYNUMPY}
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		python
 USE_PYTHON=	flavors
 
 OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS
 
 .include "${.CURDIR}/../boost-all/common.mk"
 
 .include "${.CURDIR}/../boost-all/compiled.mk"
 
 MAKE_ENV+=	PYTHON_ROOT="${LOCALBASE}"\
 		PYTHON_VERSION="${PYTHON_VERSION}"\
 		PYTHON_INCLUDES="${PYTHON_INCLUDEDIR}"\
 		PYTHON_LIB_PATH="${PYTHON_LIBDIR}"
 
 MAKE_ARGS+=	--with-python
 ALL_TARGET=	stage
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} == ${PYTHON_DEFAULT}
+PLIST_SUB+=	PY_DEFAULT_ONLY=""
+.else
+PLIST_SUB+=	PY_DEFAULT_ONLY="@comment "
+.endif
+
 pre-build:
 	@${ECHO_CMD} "using python : " ${PYTHON_VER} " : " ${PYTHON_CMD} " : " ${PYTHON_INCLUDEDIR} ";" >> ${WRKSRC}/tools/build/src/site-config.jam
 
 do-install:
 	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p libboost* ${STAGEDIR}${PREFIX}/lib
 # For some reasons BJAM forget about the links
 	@cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX}
+# CMake part
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-py${PYTHON_VER}.cmake ${STAGEDIR}${PREFIX}/lib
+.if ${PYTHON_VER} == ${PYTHON_DEFAULT}
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_numpy*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKSRC}/stage/lib && ${PAX} -rw -p p cmake/boost_python*/*-config*.cmake ${STAGEDIR}${PREFIX}/lib
+.endif
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/cmake -type f -exec \
+		${REINPLACE_CMD} -i '' -e 's,${STAGEDIR},,' {} +
 
 post-install:
 # display pkg-message
 	@${TOUCH} ${PKGMESSAGE}
 	@${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${CAT} ${PKG_MESSAGE_FILE_PYTHON} >> ${PKGMESSAGE}
 	@${ECHO_CMD} >> ${PKGMESSAGE}
 	@${REINPLACE_CMD} \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		-e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \
 		-e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \
 		-e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libboost_python*.so.${PORTVERSION}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/devel/boost-python-libs/pkg-plist
===================================================================
--- head/devel/boost-python-libs/pkg-plist	(revision 533155)
+++ head/devel/boost-python-libs/pkg-plist	(revision 533156)
@@ -1,10 +1,18 @@
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/boost_numpy-config-version.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/boost_numpy-config.cmake
+lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/libboost_numpy-variant-shared-py%%PYTHON_VER%%.cmake
+lib/cmake/boost_numpy-%%BOOST_SHARED_LIB_VER%%/libboost_numpy-variant-static-py%%PYTHON_VER%%.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/boost_python-config-version.cmake
+%%PY_DEFAULT_ONLY%%lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/boost_python-config.cmake
+lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/libboost_python-variant-shared-py%%PYTHON_VER%%.cmake
+lib/cmake/boost_python-%%BOOST_SHARED_LIB_VER%%/libboost_python-variant-static-py%%PYTHON_VER%%.cmake
 lib/libboost_numpy%%PYTHON_SUFFIX%%.a
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so.%%MAJOR_VER%%
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so.%%MAJOR_VER%%.%%MINOR_VER%%
 lib/libboost_numpy%%PYTHON_SUFFIX%%.so.%%BOOST_SHARED_LIB_VER%%
 lib/libboost_python%%PYTHON_SUFFIX%%.a
 lib/libboost_python%%PYTHON_SUFFIX%%.so
 lib/libboost_python%%PYTHON_SUFFIX%%.so.%%MAJOR_VER%%
 lib/libboost_python%%PYTHON_SUFFIX%%.so.%%MAJOR_VER%%.%%MINOR_VER%%
 lib/libboost_python%%PYTHON_SUFFIX%%.so.%%BOOST_SHARED_LIB_VER%%