Index: head/devel/boost-libs/Makefile =================================================================== --- head/devel/boost-libs/Makefile (revision 490517) +++ head/devel/boost-libs/Makefile (revision 490518) @@ -1,57 +1,57 @@ # Created by: Alexander Churanov # $FreeBSD$ PORTNAME= boost-libs -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= Free portable C++ libraries (without Boost.Python) BROKEN_sparc64= https://github.com/boostorg/context/commit/f2ef6326b6ed BUILD_DEPENDS+= bjam:devel/boost-jam OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS OPTIONS_MULTI= LOCALE OPTIONS_MULTI_LOCALE= ICONV ICU OPTIONS_DEFAULT= ICONV ICU ICONV_DESC= Boost.Locale with iconv encoding support ICU_DESC= Boost.Regex/Locale with ICU unicode support ICONV_USES= iconv ICONV_MAKE_ARGS= -sICONV_PATH=${ICONV_PREFIX} ICONV_MAKE_ARGS_OFF= boost.locale.iconv=off ICU_LIB_DEPENDS= libicuuc.so:devel/icu ICU_MAKE_ARGS= -sICU_PATH=${LOCALBASE} ICU_MAKE_ARGS_OFF= boost.locale.icu=off .include "${.CURDIR}/../boost-all/common.mk" .include "${.CURDIR}/../boost-all/compiled.mk" MAKE_ARGS+= --without-python MAKE_ARGS+= ${MAKE_ARGS_${CHOSEN_COMPILER_TYPE}} MAKE_ARGS_gcc= xdll-path=${_GCC_RUNTIME} ALL_TARGET= stage do-install: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS:NDESTDIR=*:S,^--prefix=,&${STAGEDIR},} ${INSTALL_TARGET} # For some reasons BJAM forget about the links @cd ${WRKSRC}/stage/ && ${FIND} lib -type l | ${PAX} -rw -p p ${STAGEDIR}${PREFIX} # display pkg-message post-install: @${TOUCH} ${PKGMESSAGE} @${CAT} ${PKG_MESSAGE_FILE_THREADS} >> ${PKGMESSAGE} @${ECHO_CMD} >> ${PKGMESSAGE} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${REINPLACE_CMD} \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ -e "s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|g" \ -e "s|%%PYTHON_LIBDIR%%|${PYTHON_LIBDIR}|g" \ -e "s|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g" ${PKGMESSAGE} .include Index: head/devel/boost-libs/files/patch-libs_locale_src_encoding_iconv_codepage.ipp =================================================================== --- head/devel/boost-libs/files/patch-libs_locale_src_encoding_iconv_codepage.ipp (nonexistent) +++ head/devel/boost-libs/files/patch-libs_locale_src_encoding_iconv_codepage.ipp (revision 490518) @@ -0,0 +1,11 @@ +--- libs/locale/src/encoding/iconv_codepage.ipp.orig 2017-09-02 09:56:14 UTC ++++ libs/locale/src/encoding/iconv_codepage.ipp +@@ -43,7 +43,7 @@ class iconverter_base { (public) + bool open(char const *to,char const *from,method_type how) + { + close(); +- cvt_ = iconv_open(to,from); ++ cvt_ = call_iconv_open(to,from); + how_ = how; + return cvt_ != (iconv_t)(-1); + } Property changes on: head/devel/boost-libs/files/patch-libs_locale_src_encoding_iconv_codepage.ipp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/boost-libs/files/patch-libs_locale_src_posix_codecvt.cpp =================================================================== --- head/devel/boost-libs/files/patch-libs_locale_src_posix_codecvt.cpp (nonexistent) +++ head/devel/boost-libs/files/patch-libs_locale_src_posix_codecvt.cpp (revision 490518) @@ -0,0 +1,20 @@ +--- libs/locale/src/posix/codecvt.cpp.orig 2017-09-02 09:56:14 UTC ++++ libs/locale/src/posix/codecvt.cpp +@@ -38,7 +38,7 @@ namespace impl_posix { + iconv_t d = (iconv_t)(-1); + std::vector first_byte_table; + try { +- d = iconv_open(utf32_encoding(),encoding.c_str()); ++ d = call_iconv_open(utf32_encoding(),encoding.c_str()); + if(d == (iconv_t)(-1)) { + throw std::runtime_error("Unsupported encoding" + encoding); + } +@@ -186,7 +186,7 @@ namespace impl_posix { + { + if(d!=(iconv_t)(-1)) + return; +- d=iconv_open(to,from); ++ d=call_iconv_open(to,from); + } + + static char const *utf32_encoding() Property changes on: head/devel/boost-libs/files/patch-libs_locale_src_posix_codecvt.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/boost-libs/files/patch-libs_locale_src_util_iconv.hpp =================================================================== --- head/devel/boost-libs/files/patch-libs_locale_src_util_iconv.hpp (nonexistent) +++ head/devel/boost-libs/files/patch-libs_locale_src_util_iconv.hpp (revision 490518) @@ -0,0 +1,49 @@ +--- libs/locale/src/util/iconv.hpp.orig 2017-09-02 09:56:14 UTC ++++ libs/locale/src/util/iconv.hpp +@@ -12,27 +12,7 @@ + + namespace boost { + namespace locale { +-#if defined(__ICONV_F_HIDE_INVALID) && defined(__FreeBSD__) + extern "C" { +- typedef size_t (*const_iconv_ptr_type)(iconv_t d,char const **in,size_t *insize,char **out,size_t *outsize,uint32_t,size_t *); +- typedef size_t (*nonconst_iconv_ptr_type)(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize,uint32_t,size_t *); +- } +- inline size_t do_iconv(const_iconv_ptr_type ptr,iconv_t d,char **in,size_t *insize,char **out,size_t *outsize) +- { +- char const **rin = const_cast(in); +- return ptr(d,rin,insize,out,outsize,__ICONV_F_HIDE_INVALID,0); +- } +- inline size_t do_iconv(nonconst_iconv_ptr_type ptr,iconv_t d,char **in,size_t *insize,char **out,size_t *outsize) +- { +- return ptr(d,in,insize,out,outsize,__ICONV_F_HIDE_INVALID,0); +- } +- inline size_t call_iconv(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize) +- { +- char const **rin = const_cast(in); +- return do_iconv(__iconv, d, in,insize,out,outsize); +- } +-#else +- extern "C" { + typedef size_t (*gnu_iconv_ptr_type)(iconv_t d,char const **in,size_t *insize,char **out,size_t *outsize); + typedef size_t (*posix_iconv_ptr_type)(iconv_t d,char **in,size_t *insize,char **out,size_t *outsize); + } +@@ -49,8 +29,17 @@ namespace boost { + { + return do_iconv( iconv, d, in,insize,out,outsize); + } ++ inline iconv_t call_iconv_open(char const *to,char const *from) ++ { ++ iconv_t d = iconv_open(to,from); ++#if defined(ICONV_SET_ILSEQ_INVALID) && defined(__FreeBSD__) ++ if(d != (iconv_t)(-1)) { ++ int ilseq_invalid = 1; ++ iconvctl(d,ICONV_SET_ILSEQ_INVALID,&ilseq_invalid); ++ } + #endif +- ++ return d; ++ } + } // locale + } // boost + Property changes on: head/devel/boost-libs/files/patch-libs_locale_src_util_iconv.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property