Rename boost-python to py-boost and make it a proper multi-version package.

10 files changed, 32 insertions, 26 deletions

diff --git a/devel/Makefile b/devel/Makefile
index c7b0a445b2c..f7cff5cf6e6 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2119 2015/07/10 17:27:53 khorben Exp $
+# $NetBSD: Makefile,v 1.2120 2015/07/13 15:08:54 wiz Exp $
 #
 
 COMMENT=	Development utilities
@@ -84,7 +84,6 @@ SUBDIR+=	boost-docs
 SUBDIR+=	boost-headers
 SUBDIR+=	boost-jam
 SUBDIR+=	boost-libs
-SUBDIR+=	boost-python
 SUBDIR+=	bouml
 SUBDIR+=	bpython
 SUBDIR+=	buddy
@@ -1588,6 +1587,7 @@ SUBDIR+=	py-at-spi2
 SUBDIR+=	py-atomicwrites
 SUBDIR+=	py-babel
 SUBDIR+=	py-blinker
+SUBDIR+=	py-boost
 SUBDIR+=	py-buildbot
 SUBDIR+=	py-buildbot-slave
 SUBDIR+=	py-cffi
diff --git a/devel/boost-headers/DESCR b/devel/boost-headers/DESCR
index 73d62a12727..1680308a554 100644
--- a/devel/boost-headers/DESCR
+++ b/devel/boost-headers/DESCR
@@ -3,4 +3,4 @@ portable libraries which work well with the ISO C++ Standard Library.
 
 This package provides all the Boost header files required at build-time
 to compile any package that requires Boost.  Binary libraries are provided
-in the boost-libs and boost-python packages.
+in the boost-libs and py-boost packages.
diff --git a/devel/boost-libs/DESCR b/devel/boost-libs/DESCR
index 2fb883ccf02..2040fe58afb 100644
--- a/devel/boost-libs/DESCR
+++ b/devel/boost-libs/DESCR
@@ -3,4 +3,4 @@ portable libraries which work well with the ISO C++ Standard Library.
 
 This package adds static and shared binary libraries for Boost.  All
 libraries are included here, except Boost.Python, which can be found in
-the boost-python package.
+the py-boost package.
diff --git a/devel/boost-python/buildlink3.mk b/devel/boost-python/buildlink3.mk
deleted file mode 100644
index f8c53b27f57..00000000000
--- a/devel/boost-python/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.35 2015/04/17 14:04:47 adam Exp $
-
-BUILDLINK_TREE+=	boost-python
-
-.if !defined(BOOST_PYTHON_BUILDLINK3_MK)
-BOOST_PYTHON_BUILDLINK3_MK:=
-
-# Use a dependency pattern that guarantees the proper ABI.
-BUILDLINK_API_DEPENDS.boost-python+=	boost-python-1.58.*
-BUILDLINK_ABI_DEPENDS.boost-python+=	boost-python-1.58.*
-BUILDLINK_PKGSRCDIR.boost-python?=	../../devel/boost-python
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.endif # BOOST_PYTHON_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-boost-python
diff --git a/devel/boost-python/DESCR b/devel/py-boost/DESCR
index 6a9e766e7c1..6a9e766e7c1 100644
--- a/devel/boost-python/DESCR
+++ b/devel/py-boost/DESCR
diff --git a/devel/boost-python/Makefile b/devel/py-boost/Makefile
index 14645963e8a..2bde4505ec2 100644
--- a/devel/boost-python/Makefile
+++ b/devel/py-boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/08/13 10:56:35 adam Exp $
+# $NetBSD: Makefile,v 1.1 2015/07/13 15:08:55 wiz Exp $
 
 BOOST_PACKAGE=		python
 BOOST_COMMENT=		(Boost.Python binary library)
@@ -8,9 +8,12 @@ INSTALLATION_DIRS+=	lib
 
 .include "../../meta-pkgs/boost/Makefile.common"
 
+PKGNAME=		${PYPKGPREFIX}-boost-${BOOST_VERSION}
+
 BJAM_ARGS+=		--user-config=${WRKSRC}/user-config.jam
 BJAM_ARGS+=		--with-python
 MAKE_ENV+=		BOOST_BUILD_PATH=${WRKSRC}
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # as of 1.58.0
 
 .include "../../devel/boost-jam/bjam.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/boost-python/PLIST b/devel/py-boost/PLIST
index d9edd767c28..e27e809e8dc 100644
--- a/devel/boost-python/PLIST
+++ b/devel/py-boost/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/01/23 15:44:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.1 2015/07/13 15:08:55 wiz Exp $
 lib/libboost_python.a
 lib/libboost_python.so
 lib/libboost_python.so.${BOOST_VERSION}
diff --git a/devel/py-boost/buildlink3.mk b/devel/py-boost/buildlink3.mk
new file mode 100644
index 00000000000..c43425b192f
--- /dev/null
+++ b/devel/py-boost/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/07/13 15:08:55 wiz Exp $
+
+BUILDLINK_TREE+=	py-boost
+
+.if !defined(PY_BOOST_BUILDLINK3_MK)
+PY_BOOST_BUILDLINK3_MK:=
+
+.include "../../lang/python/pyversion.mk"
+
+# Use a dependency pattern that guarantees the proper ABI.
+BUILDLINK_API_DEPENDS.py-boost+=	${PYPKGPREFIX}-boost-1.58.*
+BUILDLINK_ABI_DEPENDS.py-boost+=	${PYPKGPREFIX}-boost-1.58.*
+BUILDLINK_PKGSRCDIR.py-boost?=	../../devel/py-boost
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.endif # PY_BOOST_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-py-boost
diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile
index 8a2aca252c3..14d80b6ece9 100644
--- a/meta-pkgs/boost/Makefile
+++ b/meta-pkgs/boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2015/04/17 14:04:47 adam Exp $
+# $NetBSD: Makefile,v 1.17 2015/07/13 15:08:55 wiz Exp $
 
 BOOST_PACKAGE=	meta-pkg
 BOOST_COMMENT=	(meta package)
@@ -22,6 +22,7 @@ DEPENDS+=	boost-docs-${BOOST_DEPENDS_VERSION}:../../devel/boost-docs
 DEPENDS+=	boost-headers-${BOOST_DEPENDS_VERSION}:../../devel/boost-headers
 DEPENDS+=	boost-jam-${BOOST_DEPENDS_VERSION}:../../devel/boost-jam
 DEPENDS+=	boost-libs-${BOOST_DEPENDS_VERSION}:../../devel/boost-libs
-DEPENDS+=	boost-python-${BOOST_DEPENDS_VERSION}:../../devel/boost-python
+DEPENDS+=	${PYPKGPREFIX}-boost-${BOOST_DEPENDS_VERSION}:../../devel/py-boost
 
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index c69099eb1d1..30666feba6a 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.52 2015/04/27 20:01:27 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.53 2015/07/13 15:08:55 wiz Exp $
 #
 # used by devel/boost-build/Makefile
 # used by devel/boost-docs/Makefile
 # used by devel/boost-jam/Makefile
 # used by devel/boost-headers/Makefile
 # used by devel/boost-libs/Makefile
-# used by devel/boost-python/Makefile
+# used by devel/py-boost/Makefile
 
 BOOST_PACKAGE?=		undefined
 BOOST_COMMENT?=		undefined