Hi,
I added ICU flavor for devel/boost to proceed with
porting aegisub, the subtitle editor which requires
it.
Not really tested, just aegisub detects Boost.Regex
is built with ICU now (on AMD64).
I would be happy if more skilled porters could take
the diff and finalize it and commit it.
Thx!
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile 3 Aug 2015 18:29:30 -0000 1.56
+++ Makefile 2 Sep 2015 08:53:59 -0000
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= ${GCC4_ARCHS}
COMMENT= free peer-reviewed portable C++ source libraries
VERSION= 1.58.0
-REVISION= 0
+REVISION= 1
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME= boost-${VERSION}
CATEGORIES= devel
@@ -57,8 +57,8 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c bz2 m pthread stdc++ util z
-MODULES= converters/libiconv \
- lang/python
+MODULES= lang/python
+
MODPY_RUNDEP= No
BUILD_DEPENDS+= lang/python/${MODPY_DEFAULT_VERSION_3}
@@ -66,8 +66,7 @@ LIB_DEPENDS= archivers/bzip2
MAKE_ENV= GCC="${CC}" GXX="${CXX}"
-BJAM_CONFIG= -sICONV_PATH=${LOCALBASE} \
- -sBZIP2_INCLUDE=${LOCALBASE}/include \
+BJAM_CONFIG= -sBZIP2_INCLUDE=${LOCALBASE}/include \
-sBZIP2_LIBPATH=${LOCALBASE}/lib \
-d+2 -q \
-j ${MAKE_JOBS} \
@@ -83,7 +82,6 @@ BJAM_CONFIG= -sICONV_PATH=${LOCALBASE} \
BOOTSTRAP= --with-python=${MODPY_BIN} \
--with-python-root=${LOCALBASE} \
--with-python-version=${MODPY_VERSION} \
- --without-icu \
--without-libraries=context,coroutine
# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
@@ -95,6 +93,18 @@ DPB_PROPERTIES= parallel
NO_TEST= Yes
SUBST_VARS+= SO_VERSION
+
+FLAVORS= icu
+FLAVOR?=
+
+.if ${FLAVOR:Micu}
+LIB_DEPENDS+= textproc/icu4c
+BJAM_CONFIG+= -sICU_PATH=${LOCALBASE}
+.else
+MODULES+= converters/libiconv
+BJAM_CONFIG+= -sICONV_PATH=${LOCALBASE}
+BOOTSTRAP+= --without-icu
+.endif
do-configure:
echo "using python : ${MODPY_DEFAULT_VERSION_3} :
${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3} :
${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3}$$(python${MODPY_DEFAULT_VERSION_3}-config
--abiflags) ;" >> ${WRKSRC}/tools/build/user-config.jam
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/devel/boost/pkg/DESCR,v
retrieving revision 1.5
diff -u -p -r1.5 DESCR
--- pkg/DESCR 1 Jul 2015 08:41:59 -0000 1.5
+++ pkg/DESCR 2 Sep 2015 08:53:59 -0000
@@ -12,3 +12,6 @@ Committee's Library Technical Report (TR
Standard. C++11 also includes several more Boost libraries in addition
to those from TR1. More Boost libraries are proposed for standardization
in C++17.
+
+Flavors:
+ icu - Build Boost.Regex with ICU unicode support
