Index: icu/Makefile =================================================================== diff --git a/head/devel/icu/Makefile b/head/devel/icu/Makefile --- a/head/devel/icu/Makefile (revision 322214) +++ b/head/devel/icu/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= icu -PORTVERSION= 50.1.2 +PORTVERSION= 51.2 CATEGORIES= devel MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/ \ SF/${PORTNAME}/ICU4C/${PORTVERSION}/ @@ -22,6 +22,10 @@ OPTIONS_DEFAULT= THREADS THREADS_DESC= Build thread-safe version of the library +# This builds thread-safe, but not the thread-using version: +THREADS_CONFIGURE_ON= --enable-weak-threads +THREADS_CONFIGURE_OFF= --enable-threads=no + USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/icu/source @@ -56,19 +60,12 @@ ICUMAJOR= ${PORTVERSION:C/\..*//} PLIST_SUB+= ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION} -.include +.include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif -.if ${PORT_OPTIONS:MTHREADS} -# This builds thread-safe, but not the thread-using version: -CONFIGURE_ARGS+= --enable-weak-threads -.else -CONFIGURE_ARGS+= --enable-threads=no -.endif - post-patch: @${REINPLACE_CMD} -e '/CXXFLAGS=/s/-ansi//' \ ${WRKSRC}/configure @@ -86,4 +83,4 @@ test regression-test: iotest cintltst intltest -.include +.include Index: icu/distinfo =================================================================== diff --git a/head/devel/icu/distinfo b/head/devel/icu/distinfo --- a/head/devel/icu/distinfo (revision 322214) +++ b/head/devel/icu/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (icu4c-50_1_2-src.tgz) = cb68067dcc60d682f8e037bf0961bdd5169cb4652ef8aa136e893780047dafd3 -SIZE (icu4c-50_1_2-src.tgz) = 21189361 +SHA256 (icu4c-51_2-src.tgz) = deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc +SIZE (icu4c-51_2-src.tgz) = 21841928 Index: icu/files/patch-layout_LookupProcessor.cpp =================================================================== diff --git a/head/devel/icu/files/patch-layout_LookupProcessor.cpp b/head/devel/icu/files/patch-layout_LookupProcessor.cpp deleted file mode 10644 --- a/head/devel/icu/files/patch-layout_LookupProcessor.cpp (revision 322214) +++ /dev/null (working copy) @@ -1,13 +0,0 @@ ---- layout/LookupProcessor.cpp -+++ layout/LookupProcessor.cpp -@@ -201,7 +201,9 @@ - - if (requiredFeatureIndex != 0xFFFF) { - requiredFeatureTable = featureListTable->getFeatureTable(requiredFeatureIndex, &requiredFeatureTag); -- featureReferences += SWAPW(featureTable->lookupCount); -+ if (requiredFeatureTable) { -+ featureReferences += SWAPW(requiredFeatureTable->lookupCount); -+ } - } - - lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences); Index: boost-all/common.mk =================================================================== diff --git a/head/devel/boost-all/common.mk b/head/devel/boost-all/common.mk --- a/head/devel/boost-all/common.mk (revision 322214) +++ b/head/devel/boost-all/common.mk (working copy) @@ -1,5 +1,5 @@ -PORTVERSION= 1.52.0 +PORTVERSION= 1.54.0 PORTVERSUFFIX= ${PORTVERSION:C/\.[0-9]+$//} DISTNAME= boost_${PORTVERSION:S/./_/g} Index: boost-all/compiled.mk =================================================================== diff --git a/head/devel/boost-all/compiled.mk b/head/devel/boost-all/compiled.mk --- a/head/devel/boost-all/compiled.mk (revision 322214) +++ b/head/devel/boost-all/compiled.mk (working copy) @@ -1,10 +1,9 @@ USE_LDCONFIG= yes -BOOST_SHARED_LIB_VER= 5 PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_JOBS_SAFE= yes BJAM= bjam -PLIST_SUB+= BOOST_SHARED_LIB_VER=${BOOST_SHARED_LIB_VER} +PLIST_SUB+= BOOST_SHARED_LIB_VER=${PORTVERSION} PKG_MESSAGE_FILE_THREADS= ${PORTSDIR}/devel/boost-all/pkg-message.threads PKG_MESSAGE_FILE_PYTHON= ${PORTSDIR}/devel/boost-all/pkg-message.python @@ -60,9 +59,9 @@ BJAM_ARGS+= inlining=full .endif +# @${REINPLACE_CMD} -e 's|${PORTVERSION}|${BOOST_SHARED_LIB_VER}|g' \ +# ${WRKSRC}/Jamroot post-patch: - @${REINPLACE_CMD} -e 's|${PORTVERSION}|${BOOST_SHARED_LIB_VER}|g' \ - ${WRKSRC}/Jamroot .if ${BOOST_TOOLSET} == gcc @${ECHO} "using gcc : : ${CXX} ;" >> ${WRKSRC}/tools/build/v2/user-config.jam .endif Index: boost-docs/distinfo =================================================================== diff --git a/head/devel/boost-docs/distinfo b/head/devel/boost-docs/distinfo --- a/head/devel/boost-docs/distinfo (revision 322214) +++ b/head/devel/boost-docs/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (boost_1_52_0.tar.bz2) = 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 -SIZE (boost_1_52_0.tar.bz2) = 54421709 +SHA256 (boost_1_54_0.tar.bz2) = 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d +SIZE (boost_1_54_0.tar.bz2) = 57873778 Index: boost-jam/Makefile =================================================================== diff --git a/head/devel/boost-jam/Makefile b/head/devel/boost-jam/Makefile --- a/head/devel/boost-jam/Makefile (revision 322214) +++ b/head/devel/boost-jam/Makefile (working copy) @@ -4,8 +4,6 @@ PORTNAME= boost-jam COMMENT= Build tool from the boost.org -PORTREVISION= 1 - PLIST_FILES= bin/bjam EXTRACT_AFTER_ARGS= ${DISTNAME}/tools/build/v2/engine Index: boost-jam/distinfo =================================================================== diff --git a/head/devel/boost-jam/distinfo b/head/devel/boost-jam/distinfo --- a/head/devel/boost-jam/distinfo (revision 322214) +++ b/head/devel/boost-jam/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (boost_1_52_0.tar.bz2) = 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 -SIZE (boost_1_52_0.tar.bz2) = 54421709 +SHA256 (boost_1_54_0.tar.bz2) = 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d +SIZE (boost_1_54_0.tar.bz2) = 57873778 Index: boost-libs/Makefile =================================================================== diff --git a/head/devel/boost-libs/Makefile b/head/devel/boost-libs/Makefile --- a/head/devel/boost-libs/Makefile (revision 322214) +++ b/head/devel/boost-libs/Makefile (working copy) @@ -13,15 +13,16 @@ VERBOSE_BUILD_DESC= Show compiler messages ICU_DESC= Boost.Regex with ICU unicode support +ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu + .include "${.CURDIR}/../boost-all/common.mk" -.include +.include .include "${.CURDIR}/../boost-all/compiled.mk" BJAM_ARGS+= --without-python .if ${PORT_OPTIONS:MICU} -LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu BJAM_ARGS+= -sICU_PATH=${LOCALBASE} .else USES+= iconv @@ -61,4 +62,4 @@ ${CAT} ${PKGMESSAGE}; \ fi -.include +.include Index: boost-libs/distinfo =================================================================== diff --git a/head/devel/boost-libs/distinfo b/head/devel/boost-libs/distinfo --- a/head/devel/boost-libs/distinfo (revision 322214) +++ b/head/devel/boost-libs/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (boost_1_52_0.tar.bz2) = 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 -SIZE (boost_1_52_0.tar.bz2) = 54421709 +SHA256 (boost_1_54_0.tar.bz2) = 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d +SIZE (boost_1_54_0.tar.bz2) = 57873778 Index: boost-libs/files/patch-boost-locale-utf =================================================================== diff --git a/head/devel/boost-libs/files/patch-boost-locale-utf b/head/devel/boost-libs/files/patch-boost-locale-utf deleted file mode 10644 --- a/head/devel/boost-libs/files/patch-boost-locale-utf (revision 322214) +++ /dev/null (working copy) @@ -1,52 +0,0 @@ -Index: boost/locale/utf.hpp -=================================================================== ---- boost/locale/utf.hpp (revision 81589) -+++ boost/locale/utf.hpp (revision 81590) -@@ -219,16 +219,22 @@ - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 2: - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 1: - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - } - -Index: libs/locale/test/test_codepage_converter.cpp -=================================================================== ---- libs/locale/test/test_codepage_converter.cpp (revision 81589) -+++ libs/locale/test/test_codepage_converter.cpp (revision 81590) -@@ -140,6 +140,20 @@ - TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000 - TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff - -+ std::cout << "-- Invalid trail" << std::endl; -+ TEST_TO("\xC2\x7F",illegal); -+ TEST_TO("\xdf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xf0\x7F\x80\x80",illegal); -+ TEST_TO("\xf4\x7f\xbf\xbf",illegal); -+ TEST_TO("\xf0\x90\x7F\x80",illegal); -+ TEST_TO("\xf4\x8f\x7F\xbf",illegal); -+ TEST_TO("\xf0\x90\x80\x7F",illegal); -+ TEST_TO("\xf4\x8f\xbf\x7F",illegal); -+ - std::cout << "-- Invalid length" << std::endl; - - /// Test that this actually works Index: boost-python-libs/distinfo =================================================================== diff --git a/head/devel/boost-python-libs/distinfo b/head/devel/boost-python-libs/distinfo --- a/head/devel/boost-python-libs/distinfo (revision 322214) +++ b/head/devel/boost-python-libs/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (boost_1_52_0.tar.bz2) = 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 -SIZE (boost_1_52_0.tar.bz2) = 54421709 +SHA256 (boost_1_54_0.tar.bz2) = 047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d +SIZE (boost_1_54_0.tar.bz2) = 57873778