Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9961,3 +9961,4 @@
 www/mod_security-devel|www/mod_security3|2018-02-12|Renamed, upstream has made a release
 devel/pear-channel-htmlpurifier|devel/pear-channel-htmlpurifier.org|2018-02-13|Rename for consistency
 games/lolcat|games/rubygem-lolcat|2018-02-13|Rename to match our rubygems naming
+devel/boost-python3-libs|devel/boost-python-libs@py36|2018-02-14|Flavorize
Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -671,6 +671,12 @@
 PY_FUTURES=
 .endif
 
+.if ${PYTHON_REL} < 3000
+PY_BOOST=	libboost_python.so:devel/boost-python-libs@${PY_FLAVOR}
+.else
+PY_BOOST=	libboost_python3.so:devel/boost-python-libs@${PY_FLAVOR}
+.endif
+
 # dependencies
 .for _stage in PATCH BUILD RUN TEST
 .  if defined(_PYTHON_${_stage}_DEP)
Index: audio/py-tagpy/Makefile
===================================================================
--- audio/py-tagpy/Makefile
+++ audio/py-tagpy/Makefile
@@ -13,7 +13,7 @@
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libtag.so:audio/taglib
 
 USES=		compiler:c++11-lang python shebangfix
Index: cad/freecad/Makefile
===================================================================
--- cad/freecad/Makefile
+++ cad/freecad/Makefile
@@ -15,7 +15,7 @@
 		swig3.0:devel/swig30
 LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
-		libboost_python.so:devel/boost-python-libs \
+		${PY_BOOST} \
 		libpyside-python2.7.so:devel/pyside@${PY_FLAVOR} \
 		libCoin.so:graphics/Coin \
 		libpng.so:graphics/png \
Index: cad/linuxcnc-devel/Makefile
===================================================================
--- cad/linuxcnc-devel/Makefile
+++ cad/linuxcnc-devel/Makefile
@@ -15,7 +15,7 @@
 BROKEN=		wrong DEPENDS
 
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
-		libboost_python.so:devel/boost-python-libs \
+		${PY_BOOST} \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libmodbus.so:comms/libmodbus \
Index: comms/gnuradio/Makefile
===================================================================
--- comms/gnuradio/Makefile
+++ comms/gnuradio/Makefile
@@ -27,7 +27,7 @@
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libqwt.so:x11-toolkits/qwt5 \
-		libboost_python.so:devel/boost-python-libs \
+		${PY_BOOST} \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
Index: comms/uhd/Makefile
===================================================================
--- comms/uhd/Makefile
+++ comms/uhd/Makefile
@@ -11,7 +11,7 @@
 MAINTAINER=	mr@FreeBSD.org
 COMMENT=	Ettus Research UHD driver framework
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \
 		cheetah-analyze:devel/py-cheetah@${PY_FLAVOR} \
 		rst2html:textproc/py-docutils \
Index: comms/usrp/Makefile
===================================================================
--- comms/usrp/Makefile
+++ comms/usrp/Makefile
@@ -12,7 +12,7 @@
 
 BROKEN=		fails to build with boost 1.66, see bug 224088
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \
 		cheetah-analyze:devel/py-cheetah \
 		rst2html:textproc/py-docutils \
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -216,7 +216,6 @@
     SUBDIR += boost-jam
     SUBDIR += boost-libs
     SUBDIR += boost-python-libs
-    SUBDIR += boost-python3-libs
     SUBDIR += boost_build
     SUBDIR += bossa
     SUBDIR += bouml-doc
Index: devel/boost-all/Makefile
===================================================================
--- devel/boost-all/Makefile
+++ devel/boost-all/Makefile
@@ -17,7 +17,7 @@
 
 LIBRARIES_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs
 JAM_RUN_DEPENDS=	${LOCALBASE}/bin/bjam:devel/boost-jam
-PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/libboost_python.so:devel/boost-python-libs
+PYTHON_RUN_DEPENDS=	${LOCALBASE}/lib/${PY_BOOST}
 DOCS_RUN_DEPENDS=	${LOCALBASE}/share/doc/boost/doc/html/index.html:devel/boost-docs
 
 .include <bsd.port.mk>
Index: devel/boost-libs/pkg-descr
===================================================================
--- devel/boost-libs/pkg-descr
+++ devel/boost-libs/pkg-descr
@@ -14,6 +14,6 @@
 libraries are proposed for TR2.
 
 NOTE: This package does not contain Boost.Python, it's in
-devel/boost-python-libs (python 2) and devel/boost-python3-libs (python 3).
+devel/boost-python-libs.
 
 WWW: http://www.boost.org/
Index: devel/boost-python-libs/Makefile
===================================================================
--- devel/boost-python-libs/Makefile
+++ devel/boost-python-libs/Makefile
@@ -1,10 +1,12 @@
 # Created by: Alexander Churanov <churanov.port.maintainer@gmail.com>
 # $FreeBSD$
 
-PORTNAME?=	boost-python-libs
-COMMENT?=	Framework for interfacing Python 2 and C++
+PORTNAME=	boost-libs
+COMMENT=	Framework for interfacing Python 2 and C++
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-USES?=		python:2.7
+USES=		python
+USE_PYTHON=	flavors
 
 OPTIONS_DEFINE=	DEBUG OPTIMIZED_CFLAGS
 
Index: devel/boost-python-libs/pkg-descr
===================================================================
--- devel/boost-python-libs/pkg-descr
+++ devel/boost-python-libs/pkg-descr
@@ -3,7 +3,4 @@
 functions and objects to Python, and vice-versa, using no special
 tools -- just your C++ compiler.
 
-The python 2 port is called boost-python-libs
-The python 3 port is called boost-python3-libs
-
 WWW: http://www.boost.org/
Index: devel/boost-python3-libs/Makefile
===================================================================
--- devel/boost-python3-libs/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	boost-python3-libs
-COMMENT=	Framework for interfacing Python 3 and C++
-
-USES=		python:3.3+
-
-MASTERDIR=	${.CURDIR}/../../devel/boost-python-libs
-
-.include "${MASTERDIR}/Makefile"
Index: devel/eblob/Makefile
===================================================================
--- devel/eblob/Makefile
+++ devel/eblob/Makefile
@@ -33,7 +33,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-LIB_DEPENDS+=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS+=	${PY_BOOST}
 USES+=		python:2.7
 CMAKE_ARGS+=	-DWITH_PYTHON=ON
 PLIST_SUB+=	PYTHON="" PYTHON_VER=${PYTHON_VER}
Index: devel/libarea/Makefile
===================================================================
--- devel/libarea/Makefile
+++ devel/libarea/Makefile
@@ -11,7 +11,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Heeks
Index: devel/luabind/Makefile
===================================================================
--- devel/luabind/Makefile
+++ devel/luabind/Makefile
@@ -13,7 +13,7 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 
 USES=		lua:51
 USE_LDCONFIG=	yes
Index: devel/py-pyopencl/Makefile
===================================================================
--- devel/py-pyopencl/Makefile
+++ devel/py-pyopencl/Makefile
@@ -15,7 +15,7 @@
 BUILD_DEPENDS=	${LOCALBASE}/include/CL/cl.h:devel/opencl \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR}
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \
Index: devel/uatraits/Makefile
===================================================================
--- devel/uatraits/Makefile
+++ devel/uatraits/Makefile
@@ -10,7 +10,7 @@
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	User-Agent detection library
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libpcre.so:devel/pcre \
 		libxml2.so:textproc/libxml2
 
Index: devel/vera++/Makefile
===================================================================
--- devel/vera++/Makefile
+++ devel/vera++/Makefile
@@ -34,7 +34,7 @@
 
 PYTHON_CMAKE_OFF=	-DVERA_PYTHON:BOOL=OFF
 PYTHON_CMAKE_ON=	-DVERA_PYTHON:BOOL=ON
-PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
 LUA_CMAKE_OFF=	-DVERA_LUA:BOOL=OFF
 LUA_CMAKE_ON=	-DVERA_LUA:BOOL=ON
 LUA_LIB_DEPENDS=	libluabind.so:devel/luabind
Index: devel/youcompleteme/Makefile
===================================================================
--- devel/youcompleteme/Makefile
+++ devel/youcompleteme/Makefile
@@ -13,7 +13,7 @@
 
 RUN_DEPENDS=	vim:editors/vim \
 		${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs \
-		${LOCALBASE}/lib/libboost_python.so:devel/boost-python-libs \
+		${LOCALBASE}/lib/${PY_BOOST} \
 		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${PY_FLAVOR} \
Index: games/vegastrike/Makefile
===================================================================
--- games/vegastrike/Makefile
+++ games/vegastrike/Makefile
@@ -15,7 +15,7 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/vegastrike.ico:games/vegastrike-data
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libexpat.so:textproc/expat2 \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg
Index: graphics/caffe/Makefile
===================================================================
--- graphics/caffe/Makefile
+++ graphics/caffe/Makefile
@@ -20,7 +20,7 @@
 		libleveldb.so:databases/leveldb \
 		liblmdb.so:databases/lmdb \
 		libboost_system.so:devel/boost-libs \
-		libboost_python.so:devel/boost-python-libs \
+		${PY_BOOST} \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
Index: graphics/cegui/Makefile
===================================================================
--- graphics/cegui/Makefile
+++ graphics/cegui/Makefile
@@ -46,7 +46,7 @@
 LUA_CMAKE_OFF=		-DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF
 # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below)
 PYTHON_USES=		python:2.7
-PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_CMAKE_ON=	-DCEGUI_BUILD_PYTHON_MODULES=ON
 PYTHON_CMAKE_OFF=	-DCEGUI_BUILD_PYTHON_MODULES=OFF
 FRIBIDI_LIB_DEPENDS=	libfribidi.so:converters/fribidi
Index: graphics/gsculpt/Makefile
===================================================================
--- graphics/gsculpt/Makefile
+++ graphics/gsculpt/Makefile
@@ -14,7 +14,7 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext@${PY_FLAVOR}
 
Index: graphics/luxrender/Makefile
===================================================================
--- graphics/luxrender/Makefile
+++ graphics/luxrender/Makefile
@@ -16,7 +16,7 @@
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libfftw3.so:math/fftw3 \
 		libOpenImageIO.so:graphics/openimageio
 .if ${DISTVERSION} != 1.4
Index: graphics/openimageio/Makefile
===================================================================
--- graphics/openimageio/Makefile
+++ graphics/openimageio/Makefile
@@ -94,7 +94,7 @@
 		-DOIIO_BUILD_TOOLS:BOOL=ON
 .else
 LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
-		libboost_python.so:devel/boost-python-libs
+		${PY_BOOST}
 PLIST=		${PKGDIR}/pkg-plist-pybind
 #while oiio supports py3, ports doesn't have py3 support for boost-python yet
 USES+=		python:2
Index: graphics/py-exiv2/Makefile
===================================================================
--- graphics/py-exiv2/Makefile
+++ graphics/py-exiv2/Makefile
@@ -13,7 +13,7 @@
 COMMENT=	Python bindings for exiv2
 
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2\
-		libboost_python.so:devel/boost-python-libs
+		${PY_BOOST}
 
 USES=		python:2 scons tar:bzip2
 USE_PYTHON=	flavors
Index: graphics/vigra/Makefile
===================================================================
--- graphics/vigra/Makefile
+++ graphics/vigra/Makefile
@@ -49,7 +49,7 @@
 			f2py:math/py-numpy
 NUMPY_RUN_DEPENDS=	nosetests:devel/py-nose \
 			f2py:math/py-numpy
-NUMPY_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+NUMPY_LIB_DEPENDS=	${PY_BOOST}
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
 # defaulting to gnu++14. Force c++11 instead.
Index: math/cadabra2/Makefile
===================================================================
--- math/cadabra2/Makefile
+++ math/cadabra2/Makefile
@@ -14,7 +14,7 @@
 PATCH_DEPENDS=	${NONEXISTENT}:devel/boost-libs:extract \
 		${NONEXISTENT}:devel/websocketpp:extract
 BUILD_DEPENDS=	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
+LIB_DEPENDS=	${PY_BOOST} \
 		libboost_system.so:devel/boost-libs \
 		libpcrecpp.so:devel/pcre \
 		libjsoncpp.so:devel/jsoncpp \
Index: math/kig/Makefile
===================================================================
--- math/kig/Makefile
+++ math/kig/Makefile
@@ -8,7 +8,7 @@
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 interactive geometry application
 
-LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+LIB_DEPENDS=	${PY_BOOST}
 
 USES=		cmake:outsource compiler:c++11-lib kde:4 python:run \
 		shebangfix tar:xz
Index: net-p2p/libtorrent-rasterbar-python/Makefile
===================================================================
--- net-p2p/libtorrent-rasterbar-python/Makefile
+++ net-p2p/libtorrent-rasterbar-python/Makefile
@@ -7,7 +7,7 @@
 COMMENT=	Python bindings for libtorrent-rasterbar
 
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
-		libboost_python.so:devel/boost-python-libs
+		${PY_BOOST}
 
 MASTERDIR=	${.CURDIR}/../libtorrent-rasterbar
 
Index: net/ceph-devel/Makefile
===================================================================
--- net/ceph-devel/Makefile
+++ net/ceph-devel/Makefile
@@ -25,7 +25,7 @@
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
 	gperf:devel/gperf
 LIB_DEPENDS=	\
-	libboost_python.so:devel/boost-python-libs \
+	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libleveldb.so:databases/leveldb \
 	libldap.so:net/openldap24-client \
Index: net/ceph/Makefile
===================================================================
--- net/ceph/Makefile
+++ net/ceph/Makefile
@@ -24,7 +24,7 @@
 	gperf:devel/gperf \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	\
-	libboost_python.so:devel/boost-python-libs \
+	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libleveldb.so:databases/leveldb \
 	libldap.so:net/openldap24-client \
Index: science/avogadro/Makefile
===================================================================
--- science/avogadro/Makefile
+++ science/avogadro/Makefile
@@ -37,7 +37,7 @@
 PYTHON_USES=		python:2
 PYTHON_BUILD_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
-PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON=ON \
Index: science/tfel/Makefile
===================================================================
--- science/tfel/Makefile
+++ science/tfel/Makefile
@@ -22,7 +22,7 @@
 GNUPLOT_BUILD_DEPENDS=	gnuplot:math/gnuplot
 GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 
-PYTHON_LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
 PYTHON_USES=		localbase python:2.7
 PYTHON_CONFIGURE_ARGS=	--enable-python-bindings
 PYTHON_CONFIGURE_WITH=	boost=${LOCALBASE}
Index: sysutils/condor/Makefile
===================================================================
--- sysutils/condor/Makefile
+++ sysutils/condor/Makefile
@@ -20,7 +20,7 @@
 LIB_DEPENDS+=	libkrb5support.so:security/krb5 \
 		libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
-		libboost_python.so:devel/boost-python-libs \
+		${PY_BOOST} \
 		libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/condor-${PORTVERSION}