Index: branches/2018Q2/audio/ncmpcpp/Makefile =================================================================== --- branches/2018Q2/audio/ncmpcpp/Makefile (revision 466432) +++ branches/2018Q2/audio/ncmpcpp/Makefile (revision 466433) @@ -1,56 +1,57 @@ # $FreeBSD$ PORTNAME= ncmpcpp PORTVERSION= 0.8.1 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://ncmpcpp.rybczak.net/stable/ MAINTAINER= yamagi@yamagi.org COMMENT= Ncurses mpd client, clone of ncmpc with some new features LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmpdclient.so:audio/libmpdclient \ libfftw3.so:math/fftw3 \ libicudata.so:devel/icu \ libicuuc.so:devel/icu \ libboost_filesystem.so:devel/boost-libs \ libcurl.so:ftp/curl BROKEN_powerpc64= fails to compile: tags.cpp: undefined reference to TagLib::String::to8Bit USES= compiler:c++14-lang iconv libtool localbase ncurses:port pkgconfig readline tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= glib20 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 LDFLAGS+= -lpthread CONFIGURE_ENV= BOOST_LIB_SUFFIX="" OPTIONS_DEFINE= CLOCK DOCS OUTPUTS TAGLIB UTF8 VISUALIZER OPTIONS_DEFAULT= CLOCK OUTPUTS TAGLIB UTF8 VISUALIZER CLOCK_DESC= clock-screen support TAGLIB_DESC= taglib support OUTPUTS_DESC= Enable outputs screen VISUALIZER_DESC= Enable music visualizer screen PLIST_FILES= bin/ncmpcpp \ man/man1/ncmpcpp.1.gz PORTDOCS= AUTHORS COPYING NEWS bindings config CLOCK_CONFIGURE_ENABLE= clock UTF8_CONFIGURE_ENABLE= unicode TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CONFIGURE_WITH= taglib OUTPUTS_CONFIGURE_ENABLE= outputs VISUALIZER_BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 VISUALIZER_CONFIGURE_ENABLE= visualizer post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/ncmpcpp ${STAGEDIR}${PREFIX}/bin/ .include Index: branches/2018Q2/databases/evolution-data-server/files/patch-icu61 =================================================================== --- branches/2018Q2/databases/evolution-data-server/files/patch-icu61 (nonexistent) +++ branches/2018Q2/databases/evolution-data-server/files/patch-icu61 (revision 466433) @@ -0,0 +1,31 @@ +--- src/libedataserver/e-alphabet-index-private.cpp.orig 2017-05-08 12:04:10 UTC ++++ src/libedataserver/e-alphabet-index-private.cpp +@@ -76,7 +76,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex *alph + const gchar *word) + { + UErrorCode status = U_ZERO_ERROR; +- UnicodeString string; ++ icu::UnicodeString string; + gint index; + + g_return_val_if_fail (alphabet_index != NULL, -1); +@@ -129,7 +129,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex *alp + + for (i = 0; alphabet_index->priv->nextBucket (status); i++) { + UAlphabeticIndexLabelType label_type; +- UnicodeString ustring; ++ icu::UnicodeString ustring; + std::string string; + + label_type = alphabet_index->priv->getBucketLabelType (); +--- src/libedataserver/e-transliterator-private.cpp.orig 2017-05-08 12:04:10 UTC ++++ src/libedataserver/e-transliterator-private.cpp +@@ -74,7 +74,7 @@ gchar * + _e_transliterator_cxx_transliterate (ETransliterator *transliterator, + const gchar *str) + { +- UnicodeString transform; ++ icu::UnicodeString transform; + std::string sourceUTF8; + std::string targetUTF8; + Property changes on: branches/2018Q2/databases/evolution-data-server/files/patch-icu61 ___________________________________________________________________ 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: branches/2018Q2/devel/pecl-intl/Makefile =================================================================== --- branches/2018Q2/devel/pecl-intl/Makefile (revision 466432) +++ branches/2018Q2/devel/pecl-intl/Makefile (revision 466433) @@ -1,20 +1,22 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= intl PORTVERSION= 3.0.0 PORTREVISION= 12 CATEGORIES= devel pear MAINTAINER= sunpoet@FreeBSD.org COMMENT= PECL extension to support Internationalization(ICU) LICENSE= PHP301 LIB_DEPENDS= libicui18n.so:devel/icu IGNORE_WITH_PHP=70 71 72 USES= compiler:c++11-lib php:pecl USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include Index: branches/2018Q2/devel/php70-intl/Makefile =================================================================== --- branches/2018Q2/devel/php70-intl/Makefile (revision 466432) +++ branches/2018Q2/devel/php70-intl/Makefile (revision 466433) @@ -1,13 +1,15 @@ # Created by: Alex Dupre # $FreeBSD$ CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Index: branches/2018Q2/devel/php71-intl/Makefile =================================================================== --- branches/2018Q2/devel/php71-intl/Makefile (revision 466432) +++ branches/2018Q2/devel/php71-intl/Makefile (revision 466433) @@ -1,12 +1,14 @@ # $FreeBSD$ CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php71 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Index: branches/2018Q2/devel/php72-intl/Makefile =================================================================== --- branches/2018Q2/devel/php72-intl/Makefile (revision 466432) +++ branches/2018Q2/devel/php72-intl/Makefile (revision 466433) @@ -1,12 +1,14 @@ # $FreeBSD$ CATEGORIES= devel MASTERDIR= ${.CURDIR}/../../lang/php72 PKGNAMESUFFIX= -intl USES= compiler:c++11-lib USE_CXXSTD= gnu++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 + .include "${MASTERDIR}/Makefile" Index: branches/2018Q2/editors/libreoffice/files/patch-icu61 =================================================================== --- branches/2018Q2/editors/libreoffice/files/patch-icu61 (nonexistent) +++ branches/2018Q2/editors/libreoffice/files/patch-icu61 (revision 466433) @@ -0,0 +1,283 @@ +https://cgit.freedesktop.org/libreoffice/core/commit/?id=f7961456d81c3ee6ee4c13eac9ef7add6c7ea6b5 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=7c46e0086802c22f5a5040d9161d4d2b3b2a3aff +https://cgit.freedesktop.org/libreoffice/core/commit/?id=8960ecc689ce41cfaa40b65d75830d7491b06463 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=f240332f8e965ea17b70b0ccaa9990ce0a53cfc6 +https://cgit.freedesktop.org/libreoffice/core/commit/?id=ad3b7c27cdc957a8a38876c040e86a81c3cf7003 + +--- i18npool/inc/collator_unicode.hxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/inc/collator_unicode.hxx +@@ -63,7 +63,7 @@ class Collator_Unicode final : public cppu::WeakImplHe + + private: + const sal_Char *implementationName; +- RuleBasedCollator *uca_base, *collator; ++ icu::RuleBasedCollator *uca_base, *collator; + #ifndef DISABLE_DYNLOADING + oslModule hModule; + #endif +--- i18npool/source/breakiterator/breakiterator_unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/breakiterator/breakiterator_unicode.cxx +@@ -56,14 +56,14 @@ BreakIterator_Unicode::~BreakIterator_Unicode() + } + + /* +- Wrapper class to provide public access to the RuleBasedBreakIterator's ++ Wrapper class to provide public access to the icu::RuleBasedBreakIterator's + setbreakType method. + */ +-class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator ++class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator + { + public: + #if (U_ICU_VERSION_MAJOR_NUM < 58) +- // RuleBasedBreakIterator::setBreakType() is private as of ICU 58. ++ // icu::RuleBasedBreakIterator::setBreakType() is private as of ICU 58. + void publicSetBreakType(int32_t type) + { + setBreakType(type); +@@ -71,7 +71,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBrea + #endif + OOoRuleBasedBreakIterator(UDataMemory* image, + UErrorCode &status) +- : RuleBasedBreakIterator(image, status) ++ : icu::RuleBasedBreakIterator(image, status) + { }; + + }; +@@ -334,7 +334,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacte + icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); + for (nDone = 0; nDone < nCount; nDone++) { + nStartPos = pBI->following(nStartPos); +- if (nStartPos == BreakIterator::DONE) ++ if (nStartPos == icu::BreakIterator::DONE) + return Text.getLength(); + } + } else { // for CHARACTER mode +@@ -353,7 +353,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousChar + icu::BreakIterator* pBI = character.mpValue->mpBreakIterator.get(); + for (nDone = 0; nDone < nCount; nDone++) { + nStartPos = pBI->preceding(nStartPos); +- if (nStartPos == BreakIterator::DONE) ++ if (nStartPos == icu::BreakIterator::DONE) + return 0; + } + } else { // for BS to delete one char and CHARACTER mode. +@@ -371,7 +371,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( con + + Boundary rv; + rv.startPos = icuBI->mpValue->mpBreakIterator->following(nStartPos); +- if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE ) ++ if( rv.startPos >= Text.getLength() || rv.startPos == icu::BreakIterator::DONE ) + rv.endPos = result.startPos; + else { + if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || +@@ -380,7 +380,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( con + rv.startPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); + + rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); +- if(rv.endPos == BreakIterator::DONE) ++ if(rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + } + return rv; +@@ -394,7 +394,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord( + + Boundary rv; + rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(nStartPos); +- if( rv.startPos < 0 || rv.startPos == BreakIterator::DONE) ++ if( rv.startPos < 0 || rv.startPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + else { + if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || +@@ -403,7 +403,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord( + rv.startPos = icuBI->mpValue->mpBreakIterator->preceding(rv.startPos); + + rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos); +- if(rv.endPos == BreakIterator::DONE) ++ if(rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + } + return rv; +@@ -435,9 +435,9 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBounda + rv.endPos = icuBI->mpValue->mpBreakIterator->following(nPos); + } + } +- if (rv.startPos == BreakIterator::DONE) ++ if (rv.startPos == icu::BreakIterator::DONE) + rv.startPos = rv.endPos; +- else if (rv.endPos == BreakIterator::DONE) ++ else if (rv.endPos == icu::BreakIterator::DONE) + rv.endPos = rv.startPos; + + return rv; +@@ -502,7 +502,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLi + lbr.breakIndex = nStartPos; + lbr.breakType = BreakType::WORDBOUNDARY; + } else if (hOptions.rHyphenator.is()) { //Hyphenation break +- sal_Int32 boundary_with_punctuation = (pLineBI->next() != BreakIterator::DONE) ? pLineBI->current() : 0; ++ sal_Int32 boundary_with_punctuation = (pLineBI->next() != icu::BreakIterator::DONE) ? pLineBI->current() : 0; + pLineBI->preceding(nStartPos + 1); // reset to check correct hyphenation of "word-word" + + sal_Int32 nStartPosWordEnd = nStartPos; +--- i18npool/source/collator/collator_unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/collator/collator_unicode.cxx +@@ -138,7 +138,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + UErrorCode status = U_ZERO_ERROR; + OUString rule = LocaleDataImpl::get()->getCollatorRuleByAlgorithm(rLocale, rAlgorithm); + if (!rule.isEmpty()) { +- collator = new RuleBasedCollator(reinterpret_cast(rule.getStr()), status); ++ collator = new icu::RuleBasedCollator(reinterpret_cast(rule.getStr()), status); + if (! U_SUCCESS(status)) throw RuntimeException(); + } + if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) { +@@ -343,7 +343,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + size_t ruleImageSize = funclen(); + + #if (U_ICU_VERSION_MAJOR_NUM == 4) && (U_ICU_VERSION_MINOR_NUM <= 2) +- uca_base = new RuleBasedCollator(static_cast(NULL), status); ++ uca_base = new icu::RuleBasedCollator(static_cast(NULL), status); + #else + // Not only changed ICU 53.1 the API behavior that a negative + // length (ruleImageSize) now leads to failure, but also that +@@ -354,11 +354,11 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + // The default collator of the en-US locale would also fulfill + // the requirement. The collator of the actual locale or the + // NULL (default) locale does not. +- uca_base = static_cast(icu::Collator::createInstance( ++ uca_base = static_cast(icu::Collator::createInstance( + icu::Locale::getRoot(), status)); + #endif + if (! U_SUCCESS(status)) throw RuntimeException(); +- collator = new RuleBasedCollator( ++ collator = new icu::RuleBasedCollator( + reinterpret_cast(ruleImage), ruleImageSize, uca_base, status); + if (! U_SUCCESS(status)) throw RuntimeException(); + } +@@ -372,17 +372,17 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString + */ + icu::Locale icuLocale( LanguageTagIcu::getIcuLocale( LanguageTag( rLocale), rAlgorithm)); + // load ICU collator +- collator = static_cast( icu::Collator::createInstance(icuLocale, status) ); ++ collator = static_cast( icu::Collator::createInstance(icuLocale, status) ); + if (! U_SUCCESS(status)) throw RuntimeException(); + } + } + + if (options & CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT) +- collator->setStrength(Collator::PRIMARY); ++ collator->setStrength(icu::Collator::PRIMARY); + else if (options & CollatorOptions::CollatorOptions_IGNORE_CASE) +- collator->setStrength(Collator::SECONDARY); ++ collator->setStrength(icu::Collator::SECONDARY); + else +- collator->setStrength(Collator::TERTIARY); ++ collator->setStrength(icu::Collator::TERTIARY); + + return 0; + } +--- i18npool/source/collator/gencoll_rule.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/collator/gencoll_rule.cxx +@@ -113,7 +113,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) + //UCollator *coll = ucol_openRules(Obuf.getStr(), Obuf.getLength(), UCOL_OFF, + // UCOL_DEFAULT_STRENGTH, &parseError, &status); + +- auto coll = o3tl::make_unique(reinterpret_cast(Obuf.getStr()), status); ++ auto coll = o3tl::make_unique(reinterpret_cast(Obuf.getStr()), status); + + if (U_SUCCESS(status)) { + std::vector data; +--- i18npool/source/ordinalsuffix/ordinalsuffix.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/ordinalsuffix/ordinalsuffix.cxx +@@ -79,7 +79,7 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffixServic + if (!U_SUCCESS(nCode)) + return retValue; + +- std::unique_ptr xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode)); ++ std::unique_ptr xNumberFormat(icu::NumberFormat::createInstance(aIcuLocale, nCode)); + if (!U_SUCCESS(nCode)) + return retValue; + +--- i18npool/source/transliteration/ignoreDiacritics_CTL.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +@@ -35,7 +35,7 @@ ignoreDiacritics_CTL::transliterateChar2Char(sal_Unico + if (!m_transliterator) + throw css::uno::RuntimeException(); + +- UnicodeString aChar(nInChar); ++ icu::UnicodeString aChar(nInChar); + m_transliterator->transliterate(aChar); + + if (aChar.isEmpty()) +@@ -68,7 +68,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, + { + sal_Int32 nIndex = nPosition; + UChar32 nChar = rInStr.iterateCodePoints(&nIndex); +- UnicodeString aUStr(nChar); ++ icu::UnicodeString aUStr(nChar); + m_transliterator->transliterate(aUStr); + + if (nOffset + aUStr.length() > rOffset.getLength()) +@@ -87,7 +87,7 @@ ignoreDiacritics_CTL::folding(const OUString& rInStr, + } + else + { +- UnicodeString aUStr(reinterpret_cast(rInStr.getStr()) + nStartPos, nCount); ++ icu::UnicodeString aUStr(reinterpret_cast(rInStr.getStr()) + nStartPos, nCount); + m_transliterator->transliterate(aUStr); + return OUString(reinterpret_cast(aUStr.getBuffer()), aUStr.length()); + } +--- i18nutil/source/utility/unicode.cxx.orig 2018-02-22 17:45:41 UTC ++++ i18nutil/source/utility/unicode.cxx +@@ -750,15 +750,15 @@ OUString SAL_CALL unicode::formatPercent(double dNumbe + + icu::Locale aLocale = LanguageTagIcu::getIcuLocale(aLangTag); + +- std::unique_ptr xF( +- NumberFormat::createPercentInstance(aLocale, errorCode)); ++ std::unique_ptr xF( ++ icu::NumberFormat::createPercentInstance(aLocale, errorCode)); + if(U_FAILURE(errorCode)) + { +- SAL_WARN("i18n", "NumberFormat::createPercentInstance failed"); ++ SAL_WARN("i18n", "icu::NumberFormat::createPercentInstance failed"); + return OUString::number(dNumber) + "%"; + } + +- UnicodeString output; ++ icu::UnicodeString output; + xF->format(dNumber/100, output); + OUString aRet(reinterpret_cast(output.getBuffer()), + output.length()); +--- lotuswordpro/source/filter/localtime.cxx.orig 2018-02-22 17:45:41 UTC ++++ lotuswordpro/source/filter/localtime.cxx +@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm) + + if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC)) + { +- TimeZone* pLocalZone = TimeZone::createDefault(); ++ icu::TimeZone* pLocalZone = icu::TimeZone::createDefault(); + long offset = (pLocalZone->getRawOffset())/1000; + delete pLocalZone; + long ltime = rtime + offset; +--- opencl/source/openclconfig.cxx.orig 2018-02-22 17:45:41 UTC ++++ opencl/source/openclconfig.cxx +@@ -119,7 +119,7 @@ bool match(const OUString& rPattern, const OUString& r + UErrorCode nIcuError(U_ZERO_ERROR); + icu::UnicodeString sIcuPattern(reinterpret_cast(rPattern.getStr()), rPattern.getLength()); + icu::UnicodeString sIcuInput(reinterpret_cast(rInput.getStr()), rInput.getLength()); +- RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError); ++ icu::RegexMatcher aMatcher(sIcuPattern, sIcuInput, 0, nIcuError); + + return U_SUCCESS(nIcuError) && aMatcher.matches(nIcuError) && U_SUCCESS(nIcuError); + } +--- vcl/inc/scrptrun.h.orig 2018-02-22 17:45:41 UTC ++++ vcl/inc/scrptrun.h +@@ -58,7 +58,7 @@ struct ParenStackEntry + } + }; + +-class ScriptRun : public UObject { ++class ScriptRun : public icu::UObject { + public: + + ScriptRun(const UChar chars[], int32_t length); Property changes on: branches/2018Q2/editors/libreoffice/files/patch-icu61 ___________________________________________________________________ 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: branches/2018Q2/games/0ad/Makefile =================================================================== --- branches/2018Q2/games/0ad/Makefile (revision 466432) +++ branches/2018Q2/games/0ad/Makefile (revision 466433) @@ -1,88 +1,89 @@ # $FreeBSD$ PORTNAME= 0ad PORTVERSION= 0.0.22 PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://releases.wildfiregames.com/ \ SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ ${PORTNAME}-${PORTVERSION}-alpha-unix-data.tar.xz MAINTAINER= madpilot@FreeBSD.org COMMENT= Real-time strategy (RTS) game of ancient warfare BUILD_DEPENDS= zip:archivers/zip \ cmake:devel/cmake LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libcurl.so:ftp/curl \ libgloox.so:net-im/gloox \ libminiupnpc.so:net/miniupnpc \ libnspr4.so:devel/nspr \ libenet.so:net/enet \ libtiff.so:graphics/tiff WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 USES= compiler:c++11-lib dos2unix gmake iconv jpeg openal:al \ pkgconfig python:build tar:xz USE_GNOME= libxml2 gtk20 USE_GL= gl USE_SDL= sdl2 USE_XORG= x11 xcursor BUNDLE_LIBS= yes DOS2UNIX_REGEX= .*\.([ch]p{0,2}|make) BINARY_ALIAS= python=${PYTHON_CMD} USE_WX= 2.8+ WX_COMPS= wx:lib MAKE_ENV+= JOBS=${_MAKE_JOBS} BROKEN_aarch64= fails to compile: no member named verifyHeapAccessDisassembly BROKEN_armv6= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_armv7= fails to link: fatal error: conftest: Unknown error: -1 BROKEN_powerpc64= fails to compile: _psutil_bsd.c: error: 'struct xtcpcb' has no member named 'xt_tp' PORTDATA= * .include post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ ${WRKSRC}/build/premake/premake4.lua .if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc @${REINPLACE_CMD} -e '1055,1251s/-rdynamic/-lssp_nonshared &/' \ -e '1441s/"execinfo",/& "ssp_nonshared",/' \ ${WRKSRC}/build/premake/premake4.lua .endif @${REINPLACE_CMD} 's,^\(Exec=\)/usr/local,\1${PREFIX},' \ ${WRKSRC}/build/resources/0ad.desktop @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/build/resources/0ad.sh @${CP} ${FILESDIR}/psutil.diff ${WRKSRC}/libraries/source/spidermonkey/ pre-build: (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh ${0ADSDLARG} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libmozjs38-ps-release.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/binaries/data && ${COPYTREE_SHARE} "config l10n tests tools" ${STAGEDIR}${DATADIR}) ${MKDIR} ${STAGEDIR}${DATADIR}/mods/public ${STAGEDIR}${DATADIR}/mods/mod ${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${STAGEDIR}${DATADIR}/mods/public --no-same-permissions ${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${STAGEDIR}${DATADIR}/mods/mod --no-same-permissions .include Index: branches/2018Q2/games/openttd/Makefile =================================================================== --- branches/2018Q2/games/openttd/Makefile (revision 466432) +++ branches/2018Q2/games/openttd/Makefile (revision 466433) @@ -1,129 +1,130 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= openttd DISTVERSION= 1.7.2 PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://de.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://fr.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${DISTVERSION}/ \ http://uk.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://us.binaries.openttd.org/binaries/releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 USES= cpe gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" MAKE_ARGS= VERBOSE=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS SUB_FILES= pkg-message PORTDOCS= HOWTO_compile_lang_files.txt admin_network.txt \ elrail.svg elrail_tile.png elrail_track.png landscape.html \ landscape_externals.html landscape_grid.html multiplayer.txt \ obg_format.txt obm_format.txt obs_format.txt \ ottd-colourtext-palette.png tileh.png DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false .if defined(WITH_MIDI_PLAYER) CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" .endif .if defined(WITH_MIDI_PLAYER_ARGS) CONFIGURE_ARGS+= --with-midi-arg="${WITH_MIDI_PLAYER_ARGS}" .endif .if defined(WITH_DEDICATED_SERVER_ONLY) CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= ${PORTNAME} .else USES+= compiler:c++11-lib USE_CXXSTD= gnu++11 +CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libicui18n.so:devel/icu \ libicu-le-hb.so:devel/icu-le-hb \ libiculx.so:devel/icu-lx \ libfontconfig.so:x11-fonts/fontconfig USE_SDL= sdl INSTALLS_ICONS= yes .endif .if defined(WITH_OPEN_GAME_FILES) RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:games/opengfx \ ${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:games/openmsx \ ${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:games/opensfx .endif .if defined(WITH_SAVE_PASSWORDS) EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords .endif .include pre-everything:: .if !defined(WITH_MIDI_PLAYER) @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player" .endif .if !defined(WITH_MIDI_PLAYER_ARGS) @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player" .endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" .endif .if !defined(WITH_OPEN_GAME_FILES) @${ECHO_MSG} "Define WITH_OPEN_GAME_FILES to install with libre graphics, music, and sounds" .endif .if !defined(WITH_SAVE_PASSWORDS) @${ECHO_MSG} "Define WITH_SAVE_PASSWORDS to save passwords between server restarts" .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ ${STAGEDIR}${DATADIR}/lang ${STAGEDIR}${DATADIR}/scripts ${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${STAGEDIR}${DATADIR}/ai ${INSTALL_DATA} ${WRKSRC}/bin/baseset/* ${STAGEDIR}${DATADIR}/baseset ${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ ${STAGEDIR}${MANPREFIX}/man/man6 .if !defined(WITH_DEDICATED_SERVER_ONLY) ${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps . for n in 16 32 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps ${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png . endfor .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} post-install: .if defined(WITH_DEDICATED_SERVER_ONLY) @${REINPLACE_CMD} -E '/icons|pixmaps/d' ${TMPPLIST} .endif .include Index: branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h =================================================================== --- branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h (nonexistent) +++ branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h (revision 466433) @@ -0,0 +1,13 @@ +https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/8641 + +--- src/graphic/text/bidi.h.orig 2016-11-10 07:28:01 UTC ++++ src/graphic/text/bidi.h +@@ -40,7 +40,7 @@ bool has_rtl_character(std::vector input) + // True if a string contains a character from the script's code blocks + bool has_script_character(const char* input, UI::FontSets::Selector script); + UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets); +-std::string icustring2string(const UnicodeString& convertme); ++std::string icustring2string(const icu::UnicodeString& convertme); + std::string icuchar2string(const UChar& convertme); + bool cannot_start_line(const UChar& c); + bool cannot_end_line(const UChar& c); Property changes on: branches/2018Q2/games/widelands/files/patch-src_graphic_text_bidi.h ___________________________________________________________________ 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: branches/2018Q2/graphics/mapnik/Makefile =================================================================== --- branches/2018Q2/graphics/mapnik/Makefile (revision 466432) +++ branches/2018Q2/graphics/mapnik/Makefile (revision 466433) @@ -1,111 +1,114 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= mapnik PORTVERSION= 3.0.9 DISTVERSIONPREFIX= v PORTREVISION= 16 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ +PATCH_SITES= https://github.com/mapnik/mapnik/commit/ +PATCHFILES= 1ddfe6c31548.patch:-p1 + MAINTAINER= littlesavage@rambler.ru COMMENT= Free Toolkit For Developing Mapping Applications LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicuuc.so:devel/icu \ libboost_system.so:devel/boost-libs \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz BROKEN_powerpc= fails to install: runs out of virtual memory BROKEN_powerpc64= fails to link: libmapnik.so: undefined reference to boost::match_results USES= compiler:c++11-lib pkgconfig python scons tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes MAKE_ARGS= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" \ CUSTOM_CFLAGS="${CFLAGS}" CUSTOM_CXXFLAGS="${CXXFLAGS}" \ CUSTOM_LDFLAGS="${LDFLAGS}" PORTDOCS= * INPUT_PLUGINS= csv raster shape geojson topojson OPTIONS_DEFINE= CAIRO JPEG PNG TIFF WEBP PROJ OPTIONS_DEFAULT=CAIRO GDAL OGR POSTGIS PGRASTER SQLITE3 JPEG PNG TIFF PROJ WEBP OPTIONS_GROUP= INPUT OPTIONS_GROUP_INPUT= GDAL OGR POSTGIS PGRASTER SQLITE3 OPTIONS_SUB= yes INPUT_DESC= Input plugins GDAL_DESC= GDAL input plugin OGR_DESC= OGR input plugin POSTGIS_DESC= PostGIS input plugin PGRASTER_DESC= PGraster input plugin SQLITE3_DESC= SQLite input plugin PROJ_DESC= proj4 support CAIRO_DESC= Enable cairo rendering GDAL_VARS= INPUT_PLUGINS+=gdal GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal OGR_VARS= INPUT_PLUGINS+=ogr OGR_LIB_DEPENDS= libgdal.so:graphics/gdal POSTGIS_VARS= INPUT_PLUGINS+=postgis POSTGIS_USES= pgsql PGRASTER_VARS= INPUT_PLUGINS+=pgraster PGRASTER_USES= pgsql SQLITE3_VARS= INPUT_PLUGINS+=sqlite SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MAKE_ARGS_OFF= PNG=False JPEG_USES= jpeg JPEG_MAKE_ARGS_OFF= JPEG=False TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MAKE_ARGS_OFF= TIFF=False WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_MAKE_ARGS_OFF= WEBP=False PROJ_LIB_DEPENDS= libproj.so:graphics/proj PROJ_MAKE_ARGS_OFF= PROJ=False CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR} CAIRO_MAKE_ARGS_OFF= CAIRO=False .include .if ${CHOSEN_COMPILER_TYPE} == gcc CXXFLAGS+= -D_GLIBCXX_USE_C99 # gcc c++11 support is broken on FreeBSD .endif pre-configure-SQLITE3-on: @if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \ ${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi post-patch: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ -e 's#/usr/include#${LOCALBASE}/include#g' \ ${WRKSRC}/SConstruct post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapnik-index \ ${STAGEDIR}${PREFIX}/bin/mapnik-render \ ${STAGEDIR}${PREFIX}/bin/shapeindex @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mapnik/input/*.input post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS.md CHANGELOG.md README.md docs" \ ${STAGEDIR}${DOCSDIR} .include Index: branches/2018Q2/graphics/mapnik/distinfo =================================================================== --- branches/2018Q2/graphics/mapnik/distinfo (revision 466432) +++ branches/2018Q2/graphics/mapnik/distinfo (revision 466433) @@ -1,2 +1,5 @@ +TIMESTAMP = 1448548335 SHA256 (mapnik-v3.0.9.tar.bz2) = 3a3f67532b05f8a527a5bab32effd7dd5aa59165c7e24505268f6d827955d3da SIZE (mapnik-v3.0.9.tar.bz2) = 75213927 +SHA256 (1ddfe6c31548.patch) = fab754996485dc607108a4fd69d0df82414928eb5a210b329a84f47e90da0c8a +SIZE (1ddfe6c31548.patch) = 2148 Index: branches/2018Q2/misc/sword/Makefile =================================================================== --- branches/2018Q2/misc/sword/Makefile (revision 466432) +++ branches/2018Q2/misc/sword/Makefile (revision 466433) @@ -1,57 +1,58 @@ # Created by: Willem van Engen # $FreeBSD$ PORTNAME= sword PORTVERSION= 1.8.0 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \ http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= Framework for manipulating Bible texts LICENSE= GPLv2 BUILD_DEPENDS= cppunit-config:devel/cppunit GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-conf --with-zlib +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig USE_LDCONFIG= yes SUB_FILES= pkg-message PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CURL CLUCENE CLUCENE_DESC= Include indexing capability OPTIONS_DEFAULT=CURL CLUCENE .include .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS= libcurl.so:ftp/curl CONFIGURE_ARGS+= --with-curl .else CONFIGURE_ARGS+= --without-curl .endif .if ${PORT_OPTIONS:MCLUCENE} USES+= compiler:c++11-lib USE_CXXSTD= gnu++11 LIB_DEPENDS+= libclucene-core.so:textproc/clucene \ libicudata.so:devel/icu CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu .else CONFIGURE_ARGS+= --without-clucene --without-icu .endif post-patch: @${REINPLACE_CMD} 's|-O3||' ${WRKSRC}/configure post-install: @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install_config) ${MV} ${STAGEDIR}${PREFIX}/etc/sword.conf \ ${STAGEDIR}${PREFIX}/etc/sword.conf.sample .include Index: branches/2018Q2/multimedia/aegisub/Makefile =================================================================== --- branches/2018Q2/multimedia/aegisub/Makefile (revision 466432) +++ branches/2018Q2/multimedia/aegisub/Makefile (revision 466433) @@ -1,90 +1,91 @@ # Created by: Leinier Cruz Salfran # $FreeBSD$ PORTNAME= aegisub PORTVERSION= 3.2.2 PORTREVISION= 25 CATEGORIES= multimedia MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp.aegisub.org/pub/archives/releases/source/ \ ftp://ftp2.aegisub.org/pub/archives/releases/source/ MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform subtitle editor LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENCE LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libicui18n.so:devel/icu \ libass.so:multimedia/libass \ libfontconfig.so:x11-fonts/fontconfig USES= compiler:c++11-lib desktop-file-utils gettext gmake iconv \ localbase pkgconfig tar:xz USE_GNOME= intltool USE_WX= 3.0 WX_CONF_ARGS= absolute USE_GL= gl USE_CSTD= c99 USE_CXXSTD= c++11 +CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # freetype GNU_CONFIGURE= yes CONFIGURE_ENV= ICONV_LIBS="${ICONV_LIB}" PTHREAD_LIBS="-pthread" \ agi_cv_with_iconv=yes CONFIGURE_ARGS= --disable-compiler-flags \ --disable-gcc-prec \ --disable-sanity-checks \ --disable-update-checker \ --without-libc++ \ ${ICONV_CONFIGURE_ARG} INSTALLS_ICONS= yes PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= ALSA DOCS FFMPEG FFTW HUNSPELL OPENAL PORTAUDIO \ PULSEAUDIO OPTIONS_DEFAULT= FFMPEG FFTW HUNSPELL PULSEAUDIO ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_OFF= --without-alsa FFMPEG_LIB_DEPENDS= libffms2.so:multimedia/ffms2 FFMPEG_CONFIGURE_OFF= --without-ffms FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell OPENAL_USES= openal OPENAL_CONFIGURE_OFF= --without-openal PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CONFIGURE_OFF=\ --without-portaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_OFF=\ --without-libpulse BROKEN_aarch64= Fails to compile: no support for this architecture (yet) # src/audio_display.o: undefined reference to symbol '__atomic_load_8@@LIBATOMIC_1.0' .if empty(CFLAGS:M-march=*) CFLAGS+= ${CFLAGS_${ARCH}_${CHOSEN_COMPILER_TYPE}} CFLAGS_i386_gcc= -march=pentium .endif post-patch: @${REINPLACE_CMD} -e \ 's| -O3||' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|".*build/|"./build/|' ${WRKSRC}/build/version.sh @${REINPLACE_CMD} -e \ 's|^CC=|CC?=| ; \ /^CCOPT_/s|=.*|=| ; \ /^CCDEBUG/s|=.*|=|' ${WRKSRC}/vendor/luajit/src/Makefile post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ automation/v4-docs ${STAGEDIR}${DOCSDIR}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aegisub-* .include Index: branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile =================================================================== --- branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile (revision 466432) +++ branches/2018Q2/textproc/rubygem-charlock_holmes/Makefile (revision 466433) @@ -1,22 +1,25 @@ # $FreeBSD$ PORTNAME= charlock_holmes DISTVERSION= 0.7.5 PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG +PATCH_SITES= https://github.com/brianmario/charlock_holmes/commit/ +PATCHFILES= 018be8532670.patch:-p1 + MAINTAINER= kuriyama@FreeBSD.org COMMENT= Gems for character encoding detection LICENSE= MIT LIB_DEPENDS= libicui18n.so:devel/icu \ libunwind.so:devel/libunwind USES= gem USE_RUBY= yes CONFIGURE_ARGS= --with-icu-include=${LOCALBASE}/include .include Index: branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo =================================================================== --- branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo (revision 466432) +++ branches/2018Q2/textproc/rubygem-charlock_holmes/distinfo (revision 466433) @@ -1,3 +1,5 @@ TIMESTAMP = 1504489308 SHA256 (rubygem/charlock_holmes-0.7.5.gem) = 9e942575e702c96e3747f494756a72eee008a185d6c7ebd1049c4dd0b529b625 SIZE (rubygem/charlock_holmes-0.7.5.gem) = 10752 +SHA256 (rubygem/018be8532670.patch) = f54871c047f27ad057720c1f3ef7578bb87edc2c9e5ee3623a3d26b9dde40f13 +SIZE (rubygem/018be8532670.patch) = 2324 Index: branches/2018Q2/textproc/zorba/Makefile =================================================================== --- branches/2018Q2/textproc/zorba/Makefile (revision 466432) +++ branches/2018Q2/textproc/zorba/Makefile (revision 466433) @@ -1,112 +1,113 @@ # Created by: gahr # $FreeBSD$ PORTNAME= zorba PORTVERSION= 2.7.0 PORTREVISION= 19 CATEGORIES= textproc java MASTER_SITES= https://launchpadlibrarian.net/119058962/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= General purpose C++ XQuery processor LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \ libicudata.so:devel/icu \ libcurl.so:ftp/curl \ libtidy.so:www/tidy-lib \ libuuid.so:misc/e2fsprogs-libuuid RUN_DEPENDS= fop:textproc/fop WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS DOXYGEN OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS+= doxygen:devel/doxygen DOXYGEN_IMPLIES= DOCS PHP_CMAKE_BOOL= WITH_PHP5 PYTHON_CMAKE_BOOL= WITH_PYTHON RUBY_CMAKE_BOOL= WITH_RUBY JAVA_CMAKE_BOOL= WITH_JAVA # Both install include/xqc.h CONFLICTS= xqilla-[0-9]* CONFLICTS_BUILD= bison USES= cmake:outsource compiler:c++11-lib libedit USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes USE_CXXSTD= c++11 +CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 CXXFLAGS+= -I${LOCALBASE}/include -O1 # compiler hangs with -O2 on CURRENT LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ -DLOCALBASE:STRING=${LOCALBASE} MAKE_JOBS_UNSAFE= yes # due to consistent failures in bison-generated code compilation DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} PLIST_SUB+= FULLVERSION=${PORTVERSION} \ MIDVERSION=${PORTVERSION:R} \ MINVERSION=${PORTVERSION:R:R} .include .if ${PORT_OPTIONS:MPHP} USE_PHP= tokenizer USES+= php:build WITH_SWIG= yes CMAKE_ARGS+= -DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}" PLIST_SUB+= PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}" .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python WITH_SWIG= yes CMAKE_ARGS+= -DPYTHON_SWIG_INSTALL_DIR:FILEPATH=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///} PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///} BROKEN= Does not stage .endif .if ${PORT_OPTIONS:MRUBY} USE_RUBY= yes WITH_SWIG= yes .endif .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes CONFIGURE_ENV+= JAVA_HOME=${JAVA_HOME} CATEGORIES+= java WITH_SWIG= yes CMAKE_ARGS+= -DJAVA_LIBDIR:PATH=${JAVALIBDIR} .endif .if defined(WITH_SWIG) BUILD_DEPENDS+= swig3.0:devel/swig30 BINARY_ALIAS= swig=swig3.0 .endif post-patch: ${REINPLACE_CMD} \ -e 's|FreeBSD|${OPSYS}|g' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/cmake_modules/FindPHP5.cmake .if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(doc)/d' \ ${WRKSRC}/CMakeLists.txt .endif post-install: ${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R} .if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN} cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba .endif test: build cd ${BUILD_WRKSRC} && ${MAKE} test .include Index: branches/2018Q2/www/node8/Makefile =================================================================== --- branches/2018Q2/www/node8/Makefile (revision 466432) +++ branches/2018Q2/www/node8/Makefile (revision 466433) @@ -1,109 +1,112 @@ # $FreeBSD$ PORTNAME= node PORTVERSION= 8.11.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 8 +PATCH_SITES= https://github.com/nodejs/node/commit/ +PATCHFILES= b8f47b27571f.patch:-p1 + MAINTAINER= bhughes@FreeBSD.org COMMENT= V8 JavaScript for client and server (8.x LTS) LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE OPTIONS_DEFAULT=DTRACE OPTIONS_SUB= yes OPTIONS_DEFAULT_FreeBSD_10= BUNDLED_SSL OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE .endif OPTIONS_EXCLUDE_FreeBSD_10= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented OPTIONS_EXCLUDE_armv6= DTRACE OPTIONS_EXCLUDE_armv7= DTRACE BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation BUNDLED_SSL_USES_OFF= ssl BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss NLS_CONFIGURE_ON= --with-intl=system-icu NLS_LIB_DEPENDS= libicui18n.so:devel/icu DTRACE_CONFIGURE_ON= --with-dtrace USES= compiler:c++11-lib gmake python:2.7,build pkgconfig \ localbase shebangfix HAS_CONFIGURE= yes CONFLICTS_INSTALL= node[456]-[0-9]* node-[0-9]* CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --without-npm \ --shared-cares \ --shared-libuv \ --shared-zlib SHEBANG_FILES= tools/specialize_node_d.py tools/genv8constants.py PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} REINPLACE_ARGS= -i '' MAKE_ENV+= CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX} LIB_DEPENDS+= libcares.so:dns/c-ares\ libuv.so:devel/libuv .include .if empty(PORT_OPTIONS:MBUNDLED_SSL) .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base IGNORE= node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option .endif .if !empty(SSL_DEFAULT:Mlibressl*) IGNORE= cannot build node.js with LibreSSL. You must enable BUNDLED_SSL .endif .endif .include .if ${ARCH} == armv6 || ${ARCH} == armv7 CONFIGURE_ARGS+=--openssl-no-asm .endif .if ${COMPILER_TYPE} == gcc # GCC does not expose std::snprintf() without this define CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/deps/v8/src/v8.gyp post-configure: # Post-process Makefile and *.mk files created by node-gyp and remove # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this # before all -I../deps/* for bundled code. This can cause build # breakages if the dependency is installed in ${LOCALBASE}. The # USES+=localbase # above will ensure that we pick up includes for real # external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node .include Index: branches/2018Q2/www/node8/distinfo =================================================================== --- branches/2018Q2/www/node8/distinfo (revision 466432) +++ branches/2018Q2/www/node8/distinfo (revision 466433) @@ -1,3 +1,5 @@ TIMESTAMP = 1522526743 SHA256 (node-v8.11.1.tar.gz) = 86678028f13b26ceed08efc4b838921ca1bf514c0b7e8151bfec8ba15c5e66ad SIZE (node-v8.11.1.tar.gz) = 31030225 +SHA256 (b8f47b27571f.patch) = b0b22c490c4b4e7ed4bad46d1989e980a0ba30299855ec0164ff3d11384833c7 +SIZE (b8f47b27571f.patch) = 4763 Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 466432) +++ branches/2018Q2 (revision 466433) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r466396-466400,466409-466412,466414-466416,466431