Index: head/devel/boost-all/compiled.mk =================================================================== --- head/devel/boost-all/compiled.mk (revision 483807) +++ head/devel/boost-all/compiled.mk (revision 483808) @@ -1,54 +1,47 @@ USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_CMD= bjam MAKEFILE= # MAKE_FLAGS= # ALL_TARGET= stage -# XXX Drop conditional after 10.4 EOL as both libstdc++ 7 and libc++ 6 -# have near complete C++17 support. -.if exists(/usr/lib/libstdc++.so) || exists(/usr/include/c++/v1/__undef_macros) USES+= compiler:c++17-lang USE_CXXSTD= gnu++17 -.else -USES+= compiler:c++14-lang -USE_CXXSTD= gnu++14 -.endif 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 MAKE_ARGS= --layout=system \ --prefix=${PREFIX} \ -d2 # Our compiler-flags will be added AFTER those set by bjam. We remove # the optimization level, because Boost sets it itself (to -O3 in case # of gcc/g++): MAKE_ARGS+= cxxflags="${CXXFLAGS:N-O*}" cflags="${CFLAGS:N-O*}" MAKE_ARGS+= --toolset=${CHOSEN_COMPILER_TYPE} \ ${_MAKE_JOBS} DEBUG_MAKE_ARGS= debug DEBUG_MAKE_ARGS_OFF= release MAKE_ARGS+= threading=multi \ link=shared,static MAKE_ARGS+= optimization=speed OPTIMIZED_CFLAGS_MAKE_ARGS= inlining=full # ccache build fails when using precompiled headers, on a cached build. # # base gcc 4.2.1 fails when using precompiled headers on 11.0+ kernel. # https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html MAKE_ARGS+= pch=off post-patch: .if defined(USE_BINUTILS) @${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} : -B${LOCALBASE}/bin ;" >> ${WRKSRC}/tools/build/src/user-config.jam .else @${ECHO} "using ${CHOSEN_COMPILER_TYPE} : : ${CXX} ;" >> ${WRKSRC}/tools/build/src/user-config.jam .endif Index: head/games/keeperrl/files/patch-stack__printer.cpp =================================================================== --- head/games/keeperrl/files/patch-stack__printer.cpp (revision 483807) +++ head/games/keeperrl/files/patch-stack__printer.cpp (revision 483808) @@ -1,20 +1,20 @@ https://svnweb.freebsd.org/changeset/base/294930 stack_printer.cpp:329:18: error: assigning to 'char *' from incompatible type 'void *' ss.ss_sp = (void*)alternate_stack; ^~~~~~~~~~~~~~~~~~~~~~ --- stack_printer.cpp.orig 2017-10-24 09:45:42 UTC +++ stack_printer.cpp @@ -326,7 +326,11 @@ int printStacktraceWithGdb() { stack_t ss = {}; /* malloc is usually used here, I'm not 100% sure my static allocation is valid but it seems to work just fine. */ -+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ < 11) ++#if defined(__DragonFly__) + ss.ss_sp = (char*)alternate_stack; +#else ss.ss_sp = (void*)alternate_stack; +#endif ss.ss_size = SIGSTKSZ; ss.ss_flags = 0; Index: head/graphics/mesa-dri/files/patch-src_util_futex.h =================================================================== --- head/graphics/mesa-dri/files/patch-src_util_futex.h (revision 483807) +++ head/graphics/mesa-dri/files/patch-src_util_futex.h (revision 483808) @@ -1,48 +1,45 @@ - Implement futex_wake() and futex_wait() via _umtx_op() ---- src/util/futex.h.orig 2018-01-23 18:08:50 UTC +--- src/util/futex.h.orig 2018-09-24 16:00:57 UTC +++ src/util/futex.h -@@ -29,10 +29,35 @@ +@@ -29,10 +29,32 @@ #include #include #include +#if defined(__FreeBSD__) +#include -+# if __FreeBSD__ < 11 -+# include -+# endif +#include +#else #include #include +#endif #include +#if defined(__FreeBSD__) +static inline int futex_wake(uint32_t *addr, int count) +{ + return _umtx_op(addr, UMTX_OP_WAKE, (uint32_t)count, NULL, NULL) == -1 ? errno : 0; +} + +static inline int futex_wait(uint32_t *addr, int32_t value, struct timespec *timeout) +{ + void *uaddr = NULL, *uaddr2 = NULL; + if (timeout != NULL) { + const struct _umtx_time tmo = { ._timeout = *timeout, ._flags = UMTX_ABSTIME, ._clockid = CLOCK_MONOTONIC }; + uaddr = (void *)(uintptr_t)sizeof(tmo); + uaddr2 = (void *)&tmo; + } + return _umtx_op(addr, UMTX_OP_WAIT_UINT, (uint32_t)value, uaddr, uaddr2) == -1 ? errno : 0; +} +#else static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3) { return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); -@@ -50,6 +75,7 @@ static inline int futex_wait(uint32_t *addr, int32_t v +@@ -50,6 +72,7 @@ static inline int futex_wait(uint32_t *addr, int32_t v return sys_futex(addr, FUTEX_WAIT_BITSET, value, timeout, NULL, FUTEX_BITSET_MATCH_ANY); } +#endif #endif Index: head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro =================================================================== --- head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro (revision 483807) +++ head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro (nonexistent) @@ -1,17 +0,0 @@ -Fixes build on FreeBSD 10.* with ICU >= 59 - -In file included from icu.cpp:34: -In file included from /usr/local/include/unicode/utypes.h:38: -/usr/local/include/unicode/umachine.h:347:13: error: unknown type name 'char16_t' - typedef char16_t UChar; - ^ - ---- src/qt/qtbase/config.tests/unix/icu/icu.pro.orig 2015-12-12 12:58:05 UTC -+++ src/qt/qtbase/config.tests/unix/icu/icu.pro -@@ -1,5 +1,5 @@ - SOURCES = icu.cpp --CONFIG += console -+CONFIG += c++11 console - CONFIG -= qt dylib - - include($$PWD/../../../src/3rdparty/icu_dependency.pri) Property changes on: head/lang/phantomjs/files/patch-src_qt_qtbase_config.tests_unix_icu_icu.pro ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/thunderbird/files/patch-ipc_glue_MessageChannel.cpp =================================================================== --- head/mail/thunderbird/files/patch-ipc_glue_MessageChannel.cpp (revision 483807) +++ head/mail/thunderbird/files/patch-ipc_glue_MessageChannel.cpp (nonexistent) @@ -1,16 +0,0 @@ -To be removed after FreeBSD 10.* EOL - ---- ipc/glue/MessageChannel.cpp.orig 2017-11-02 16:16:32 UTC -+++ ipc/glue/MessageChannel.cpp -@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop() - mWorkerLoop = nullptr; - } - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 -+// Work around UB in __tree crashing mPendingPromises.clear() -+// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 -+[[clang::optnone]] -+#endif - void - MessageChannel::Clear() - { Property changes on: head/mail/thunderbird/files/patch-ipc_glue_MessageChannel.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/aom/files/patch-av1_encoder_rd.h =================================================================== --- head/multimedia/aom/files/patch-av1_encoder_rd.h (revision 483807) +++ head/multimedia/aom/files/patch-av1_encoder_rd.h (nonexistent) @@ -1,31 +0,0 @@ - isn't bootlegged via gtest.h on FreeBSD 10.* leading to - -In file included from test/horz_superres_test.cc:14: -In file included from av1/encoder/encoder.h:36: -av1/encoder/rd.h:304:26: error: use of undeclared identifier 'INT64_MAX' - rd_stats->ref_rdcost = INT64_MAX; - ^ -av1/encoder/rd.h:325:20: error: use of undeclared identifier 'INT64_MAX' - rd_stats->dist = INT64_MAX; - ^ -av1/encoder/rd.h:326:22: error: use of undeclared identifier 'INT64_MAX' - rd_stats->rdcost = INT64_MAX; - ^ -av1/encoder/rd.h:327:19: error: use of undeclared identifier 'INT64_MAX' - rd_stats->sse = INT64_MAX; - ^ -av1/encoder/rd.h:331:26: error: use of undeclared identifier 'INT64_MAX' - rd_stats->ref_rdcost = INT64_MAX; - ^ -5 errors generated. - ---- av1/encoder/rd.h.orig 2018-06-25 14:54:59 UTC -+++ av1/encoder/rd.h -@@ -13,6 +13,7 @@ - #define AV1_ENCODER_RD_H_ - - #include -+#include - - #include "av1/common/blockd.h" - Property changes on: head/multimedia/aom/files/patch-av1_encoder_rd.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c =================================================================== --- head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c (revision 483807) +++ head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/freebsd_sysctl.c.orig 2017-03-20 18:26:59 UTC -+++ src/freebsd_sysctl.c -@@ -1,3 +1,8 @@ -+#if __FreeBSD__ < 11 || __FreeBSD_version < 1100000 -+#define _IFI_OQDROPS -+#define _IN_NET_RTSOCK_C -+#endif -+ - #include "common.h" - - #include Property changes on: head/net-mgmt/netdata/files/patch-src_freebsd__sysctl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/harfbuzz/files/patch-src_test-ot-color.cc =================================================================== --- head/print/harfbuzz/files/patch-src_test-ot-color.cc (revision 483807) +++ head/print/harfbuzz/files/patch-src_test-ot-color.cc (nonexistent) @@ -1,15 +0,0 @@ -Drop once FreeBSD 10.* is EOL as USE_GCC defaultso to >= 6 since 2017-09-10. - -https://github.com/harfbuzz/harfbuzz/issues/1338 - ---- src/test-ot-color.cc.orig 2018-10-30 05:40:14 UTC -+++ src/test-ot-color.cc -@@ -23,7 +23,7 @@ - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - --#include "hb.h" -+#include "hb.hh" - #include "hb-ot.h" - - #include "hb-ft.h" Property changes on: head/print/harfbuzz/files/patch-src_test-ot-color.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/lyx/files/patch-src_TexRow.cpp =================================================================== --- head/print/lyx/files/patch-src_TexRow.cpp (revision 483807) +++ head/print/lyx/files/patch-src_TexRow.cpp (nonexistent) @@ -1,39 +0,0 @@ -Fixes the build on 10.4 with clang 3.4.1. - - TexRow.cpp:271:6: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type - return text_none; - ^ - TexRow.cpp:273:3: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type - return text_none; - ^ - TexRow.cpp:288:6: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return last_pos; - ^ - TexRow.cpp:290:6: error: return type 'struct TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return entry.text; - ^ - TexRow.cpp:293:3: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return last_pos; - ^ - -Not upstreamable, this seems to be a workaround for a compiler bug. ---- src/TexRow.cpp.orig 2018-02-25 00:11:18 UTC -+++ src/TexRow.cpp -@@ -260,7 +260,7 @@ TexRow::getEntriesFromRow(int const row) const - return {text_none, text_none}; - - // find the start entry -- TextEntry const start = [&]() { -+ TextEntry const start = [&]() -> TextEntry const { - for (size_t j = i; j > 0; --j) { - if (!isNone(rowlist_[j].getTextEntry())) - return rowlist_[j].getTextEntry(); -@@ -274,7 +274,7 @@ TexRow::getEntriesFromRow(int const row) const - } (); - - // find the end entry -- TextEntry end = [&]() { -+ TextEntry end = [&]() -> TextEntry const { - if (isNone(start)) - return text_none; - // select up to the last position of the starting paragraph as a Property changes on: head/print/lyx/files/patch-src_TexRow.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in =================================================================== --- head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in (revision 483807) +++ head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in (nonexistent) @@ -1,11 +0,0 @@ -Can be removed when 10.4 goes out of support. - ---- plugins/node.d/ping_.in.orig 2018-03-28 19:36:43 UTC -+++ plugins/node.d/ping_.in -@@ -91,5 +91,5 @@ fi - - - # shellcheck disable=SC2086 --"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:-} \ -+"${ping:-$PING}" ${ping_args:-'-c 2'} "${host}" ${ping_args2:- } \ - | perl -n -e 'print "ping.value ", $1 / 1000, "\n" if m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@; print "packetloss.value $1\n" if /(\d+)% packet loss/;' Property changes on: head/sysutils/munin-common/files/patch-plugins_node.d_ping__.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/firefox-esr/files/patch-ipc_glue_MessageChannel.cpp =================================================================== --- head/www/firefox-esr/files/patch-ipc_glue_MessageChannel.cpp (revision 483807) +++ head/www/firefox-esr/files/patch-ipc_glue_MessageChannel.cpp (nonexistent) @@ -1,16 +0,0 @@ -To be removed after FreeBSD 10.* EOL - ---- ipc/glue/MessageChannel.cpp.orig 2017-11-02 16:16:32 UTC -+++ ipc/glue/MessageChannel.cpp -@@ -685,6 +685,11 @@ MessageChannel::WillDestroyCurrentMessageLoop() - mWorkerLoop = nullptr; - } - -+#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000 -+// Work around UB in __tree crashing mPendingPromises.clear() -+// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003 -+[[clang::optnone]] -+#endif - void - MessageChannel::Clear() - { Property changes on: head/www/firefox-esr/files/patch-ipc_glue_MessageChannel.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property