<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9fd095f8139245050aa905b21373b2855bb4709f">https://github.com/macports/macports-ports/commit/9fd095f8139245050aa905b21373b2855bb4709f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9fd095f8139245050aa905b21373b2855bb4709f
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Feb 1 09:29:39 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> zmq-devel: use c11 and c++11, drop related patches
</span>---
devel/zmq/Portfile | 4 +-
devel/zmq/files/patch-c11.devel.diff | 24 ------
devel/zmq/files/patch-cxx11.devel.diff | 147 ---------------------------------
3 files changed, 2 insertions(+), 173 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/Portfile b/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6439323d027..cfb3541f4de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,11 +126,11 @@ subport zmq-devel {
</span>
patch.pre_args -p1
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cxx11.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-c11.devel.diff \
</span> patch-fix-docs-dir.devel.diff \
patch-fix-no-librt-APPLE.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span> }
# override github information
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-c11.devel.diff b/devel/zmq/files/patch-c11.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9cedbe78cab..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-c11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 72a134d..2c07a30 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Checks for programs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_ARG_ENABLE([c11],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AS_HELP_STRING([--enable-c11],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [enable C11 for C compiler [default=no]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [zmq_enable_c11=$enableval],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [zmq_enable_c11="no"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$zmq_enable_c11" != "xno"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CHECK_COMPILE_FLAG([-std=gnu11],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [CFLAGS+=" -std=gnu11"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AC_MSG_ERROR([C11 requested but not supported by the compiler.])])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_PROG_CC_C99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CXX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_CODE_COVERAGE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_PROG_CC_C_O
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-cxx11.devel.diff b/devel/zmq/files/patch-cxx11.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cae0cc75562..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,147 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 800171f..337a266 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,7 +94,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AX_CHECK_COMPILE_FLAG([-Wc++98-compat -Wc++98-compat-pedantic], [CXXFLAGS+=" -Wc++98-compat"], [])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_LANG_POP([C++])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AX_CXX_COMPILE_STDCXX_11([ext], [optional])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_ARG_ENABLE([cxx11],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [AS_HELP_STRING([--enable-cxx11],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [enable C++11 for C++ compiler [default=no]])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [zmq_enable_cxx11=$enableval],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [zmq_enable_cxx11="no"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "x$zmq_enable_cxx11" != "xno"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AX_CXX_COMPILE_STDCXX_11([ext], [mandatory])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(ZMQ_USE_CXX11, 1, [Enable C++11])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check whether to build a with debug symbols
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/perf/benchmark_radix_tree.cpp b/perf/benchmark_radix_tree.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 432d535..e5f097b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/perf/benchmark_radix_tree.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/perf/benchmark_radix_tree.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- along with this program. If not, see <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "radix_tree.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "trie.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d05837a..8a1c7ad 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/atomic_counter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/atomic_counter.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined ZMQ_FORCE_MUTEXES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_ATOMIC_COUNTER_MUTEX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif (defined __cplusplus && __cplusplus >= 201103L) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(ZMQ_USE_CXX11) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (defined _MSC_VER && _MSC_VER >= 1900)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_ATOMIC_COUNTER_CXX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fa8bc7c..51b8058 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/atomic_ptr.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/atomic_ptr.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined ZMQ_FORCE_MUTEXES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_ATOMIC_PTR_MUTEX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif (defined __cplusplus && __cplusplus >= 201103L) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(ZMQ_USE_CXX11) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (defined _MSC_VER && _MSC_VER >= 1900)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_ATOMIC_PTR_CXX11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/blob.hpp b/src/blob.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5422161..9106bbc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/blob.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/blob.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <algorithm>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ios>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) || defined(_MSC_VER) && _MSC_VER > 1700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_HAS_MOVE_SEMANTICS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ctx.cpp b/src/ctx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2b64c51..6dec399 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/ctx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ctx.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -732,7 +732,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end = _endpoints.end ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it != end;) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (it->second.socket == socket_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it = _endpoints.erase (it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _endpoints.erase (it++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/mtrie.hpp b/src/mtrie.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b5ca3ac..52cdeaa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/mtrie.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/mtrie.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "generic_mtrie.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER > 1600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) || (defined(_MSC_VER) && _MSC_VER > 1600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_HAS_EXTERN_TEMPLATE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ZMQ_HAS_EXTERN_TEMPLATE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/options.hpp b/src/options.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 556eea4..8803711 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/options.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/options.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/ucred.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <type_traits>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -334,7 +334,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ > 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) && (!defined(__GNUC__) || __GNUC__ > 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static_assert (std::is_trivially_copyable<T>::value,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "invalid use of do_getsockopt");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/radio.cpp b/src/radio.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index aa9f100..538ad89 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/radio.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/radio.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end = _subscriptions.end ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it != end;) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (it->second == pipe_) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) || (defined _MSC_VER && _MSC_VER >= 1700)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it = _subscriptions.erase (it);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _subscriptions.erase (it++);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/random.cpp b/src/random.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 17c3537..8f8cfc0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/random.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/random.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // configurable via config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // TODO this should probably be done via config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __cplusplus >= 201103L \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(ZMQ_USE_CXX11) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (defined(__cpp_threadsafe_static_init) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && __cpp_threadsafe_static_init >= 200806) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (defined(_MSC_VER) && _MSC_VER >= 1900)
</span></pre><pre style='margin:0'>
</pre>