boost with ICU support

Hi!
I'm aware of previous discussions about ICU support in boost [1] and [2]/
This time it's a complete switch not flavored one.
Runtime was tested with libreoffice and new wesnoth on amd64, wesnoth
on macppc. Building of some random ports using boost_locale also
went fine on macppc and amd64.
Without ICU support in boost, wesnoth is crashing when one opens
preferences dialog or add-ons list.

Comments?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.73
diff -u -p -u -r1.73 Makefile
--- Makefile 31 Jan 2018 21:54:49 -0000 1.73
+++ Makefile 22 Jun 2018 03:44:57 -0000
@@ -5,12 +5,13 @@ COMMENT= free peer-reviewed portable C++
VERSION= 1.66.0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME= boost-${VERSION}
+REVISION= 0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/}
EXTRACT_SUFX= .tar.bz2
FIX_EXTRACT_PERMISSIONS = Yes

-SO_VERSION= 8.0
+SO_VERSION= 9.0
BOOST_LIBS= boost_atomic-mt \
boost_chrono-mt boost_chrono \
boost_container-mt boost_container \
@@ -56,7 +57,7 @@ MAINTAINER= Brad Smith <brad@comstyle.co
# Boost
PERMIT_PACKAGE_CDROM= Yes

-WANTLIB += ${COMPILER_LIBCXX} bz2 c iconv m z
+WANTLIB += ${COMPILER_LIBCXX} bz2 c icudata icui18n icuuc m z

COMPILER= base-clang ports-gcc

@@ -68,7 +69,7 @@ BUILD_DEPENDS+= lang/python/${MODPY_DEFA
math/py-numpy

LIB_DEPENDS= archivers/bzip2 \
- converters/libiconv
+ textproc/icu4c

.include <bsd.port.arch.mk>
.if ${PROPERTIES:Mclang}
@@ -79,7 +80,7 @@ TOOLSET= gcc

MAKE_ENV= GCC="${CC}" GXX="${CXX}"

-BJAM_CONFIG= -sICONV_PATH=${LOCALBASE} \
+BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
-sBZIP2_INCLUDE=${LOCALBASE}/include \
-sBZIP2_LIBPATH=${LOCALBASE}/lib \
-q \
@@ -94,8 +95,7 @@ BJAM_CONFIG= -sICONV_PATH=${LOCALBASE} \

BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
--with-toolset=${TOOLSET} \
- --with-python-root=${LOCALBASE} \
- --without-icu
+ --with-python-root=${LOCALBASE}

# 'context' and 'coroutine' use MD bits and miss support for Alpha,
# PA-RISC, SPARC and SuperH. The author does not care
Index: patches/patch-libs_locale_build_Jamfile_v2
===================================================================
RCS file: patches/patch-libs_locale_build_Jamfile_v2
diff -N patches/patch-libs_locale_build_Jamfile_v2
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libs_locale_build_Jamfile_v2 22 Jun 2018 03:44:57 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Index: libs/locale/build/Jamfile.v2
+--- libs/locale/build/Jamfile.v2.orig
++++ libs/locale/build/Jamfile.v2
+@@ -65,8 +65,8 @@ ICU_LINK = [ modules.peek : ICU_LINK ] ;
+
+ if $(ICU_LINK)
+ {
+- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK)
<dll-path>$(ICU_PATH)/bin <runtime-link>shared ;
+- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK)
<dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ;
++ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK)
<runtime-link>shared ;
++ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK)
<runtime-link>shared ;
+ }
+ else
+ {
+@@ -124,7 +124,6 @@ else
+ <library>icuuc/<link>shared/<runtime-link>shared
+ <library>icudt/<link>shared/<runtime-link>shared
+ <library>icuin/<link>shared/<runtime-link>shared
+- <dll-path>$(ICU_PATH)/bin
+ <runtime-link>shared ;
+
+
+@@ -183,7 +182,6 @@ else
+ <library>icuuc_64/<link>shared/<runtime-link>shared
+ <library>icudt_64/<link>shared/<runtime-link>shared
+ <library>icuin_64/<link>shared/<runtime-link>shared
+- <dll-path>$(ICU_PATH)/bin64
+ <runtime-link>shared ;
+
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/boost/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -r1.18 PLIST
--- pkg/PLIST 31 Jan 2018 21:54:49 -0000 1.18
+++ pkg/PLIST 22 Jun 2018 03:44:58 -0000
@@ -10326,8 +10326,8 @@ include/boost/python/converter/implicit.
include/boost/python/converter/obj_mgr_arg_from_python.hpp
include/boost/python/converter/object_manager.hpp
include/boost/python/converter/pointer_type_id.hpp
-include/boost/python/converter/${MODPY_PYOEXTENSION}bject_traits.hpp
-include/boost/python/converter/${MODPY_PYOEXTENSION}bject_type.hpp
+include/boost/python/converter/pyobject_traits.hpp
+include/boost/python/converter/pyobject_type.hpp
include/boost/python/converter/pytype_function.hpp
include/boost/python/converter/pytype_object_mgr_traits.hpp
include/boost/python/converter/registered.hpp
@@ -10390,7 +10390,7 @@ include/boost/python/detail/prefix.hpp
include/boost/python/detail/preprocessor.hpp
include/boost/python/detail/python22_fixed.h
include/boost/python/detail/python_type.hpp
-include/boost/python/detail/raw_${MODPY_PYOEXTENSION}bject.hpp
+include/boost/python/detail/raw_pyobject.hpp
include/boost/python/detail/referent_storage.hpp
include/boost/python/detail/result.hpp
include/boost/python/detail/scope.hpp

[1] https://marc.info/?l=openbsd-ports&m=144120909505095&w=2
[2] https://marc.info/?l=openbsd-ports&m=145019819611160&w=2