<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/5e56b1cfccd6c67a5cbf95d6430dd57ab22be28d">https://github.com/macports/macports-ports/commit/5e56b1cfccd6c67a5cbf95d6430dd57ab22be28d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5e56b1c zmq: update release to 4.3.2 and devel to 20190716-184e7a55
</span>5e56b1c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5e56b1cfccd6c67a5cbf95d6430dd57ab22be28d
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jul 17 11:27:47 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> zmq: update release to 4.3.2 and devel to 20190716-184e7a55
</span>---
devel/zmq/Portfile | 20 +++++++-------
devel/zmq/files/patch-c11.devel.diff | 2 +-
devel/zmq/files/patch-c11.release.diff | 2 +-
devel/zmq/files/patch-cxx11.devel.diff | 4 +--
devel/zmq/files/patch-cxx11.release.diff | 47 ++++++++++++--------------------
5 files changed, 31 insertions(+), 44 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 92ab3c5..2107df3 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;'>@@ -22,11 +22,11 @@ long_description \
</span> protocols and more.
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq 4.3.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0401135c351b22e6417e3550aaec88d2b3a8b770 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29f5900c72ad44a34d3162d9b730156879a918172f6850fa8748d8d17c81477a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 789041
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq 4.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6bfdb9378428accf70719bfac23e4f5debe35f42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b1778a6d51944c0394d80e3c708bdc3ce58de44119bab4096b0d7e78348a8cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 836825
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts zmq-devel zmq22 zmq3
configure.args-append --disable-libunwind --disable-cxx11 --disable-c11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,11 +59,11 @@ subport zmq22 {
</span> }
subport zmq-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq 4904bf7177750dc7904a0d038dd9f5ff9083316d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190623-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4554398c69d418ba3ffe683629fd3b9823ab971a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96561f5d7a78c66eb55204610f5883101a8c2b5bc1243df07d5eaf12e1e5b8fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 820419
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq 184e7a55e521397681af13f04807e9c07fc41e8a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190716-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 eb9ee38eb9a7fa6040de4a2781ac04f497c72e99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5aeac6180ba0f8db39290a0646754b8f88c291968d1478cf39831ab99b186402 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 856831
</span> revision 0
conflicts zmq zmq22 zmq3
<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><span style='display:block; white-space:pre;color:#808080;'>index 78e2bf6..3b7b149 100644
</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;'>+++ b/devel/zmq/files/patch-c11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
</span> index 72a134d..2c07a30 100644
--- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,18 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,18 @@
</span>
# Checks for programs.
AC_PROG_CC
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-c11.release.diff b/devel/zmq/files/patch-c11.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6790129..cd447d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-c11.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-c11.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
</span> index 084a04f..5beba99 100644
--- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,18 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,18 @@
</span>
# Checks for programs.
AC_PROG_CC
<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><span style='display:block; white-space:pre;color:#808080;'>index 1d817c7..fdd7dee 100644
</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;'>+++ b/devel/zmq/files/patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/configure.ac b/configure.ac
</span> index 90c042e..b5bf97a 100644
--- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,7 +89,15 @@ if test "x$enable_force_CXX98_compat" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,15 @@
</span> AX_CHECK_COMPILE_FLAG([-Wc++98-compat -Wc++98-compat-pedantic], [CXXFLAGS+=" -Wc++98-compat"], [])
AC_LANG_POP([C++])
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,7 @@ index b591e96..b3c36b5 100644
</span> #include <type_traits>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -294,7 +294,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,7 +305,7 @@
</span> template <typename T>
int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-cxx11.release.diff b/devel/zmq/files/patch-cxx11.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a286c5..76ace4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-cxx11.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-cxx11.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> diff --git a/configure.ac b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 61be86f..084a04f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90c042e..b5bf97a 100644
</span> --- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,7 +86,15 @@ if test "x$enable_force_CXX98_compat" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,15 @@
</span> AX_CHECK_COMPILE_FLAG([-Wc++98-compat -Wc++98-compat-pedantic], [CXXFLAGS+=" -Wc++98-compat"], [])
AC_LANG_POP([C++])
else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,62 +33,49 @@ index efc889c..4cfd4e8 100644
</span> #include "radix_tree.hpp"
#include "trie.hpp"
diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4f2ff58..298283a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3f62f6f..e1c9600 100644
</span> --- a/src/atomic_counter.hpp
+++ b/src/atomic_counter.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined ZMQ_FORCE_MUTEXES
</span> #define ZMQ_ATOMIC_COUNTER_MUTEX
<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;'>- #define ZMQ_ATOMIC_COUNTER_INTRINSIC
</span> -#elif (defined __cplusplus && __cplusplus >= 201103L) \
+#elif defined(ZMQ_USE_CXX11) \
|| (defined _MSC_VER && _MSC_VER >= 1900)
#define ZMQ_ATOMIC_COUNTER_CXX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
</span> diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index e16259f..36a5879 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7b34500..e85c9f8 100644
</span> --- a/src/atomic_ptr.hpp
+++ b/src/atomic_ptr.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined ZMQ_FORCE_MUTEXES
</span> #define ZMQ_ATOMIC_PTR_MUTEX
<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;'>- #define ZMQ_ATOMIC_PTR_INTRINSIC
</span> -#elif (defined __cplusplus && __cplusplus >= 201103L) \
+#elif defined(ZMQ_USE_CXX11) \
|| (defined _MSC_VER && _MSC_VER >= 1900)
#define ZMQ_ATOMIC_PTR_CXX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
</span> diff --git a/src/blob.hpp b/src/blob.hpp
index c14633c..66a5171 100644
--- a/src/blob.hpp
+++ b/src/blob.hpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +38,7 @@
</span> #include <algorithm>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ios>
</span>
-#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
+#if defined(ZMQ_USE_CXX11) || defined(_MSC_VER) && _MSC_VER > 1700
#define ZMQ_HAS_MOVE_SEMANTICS
#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/condition_variable.hpp b/src/condition_variable.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e5c7224..c316037 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/condition_variable.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/condition_variable.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,7 +45,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _SUPPORT_CONDITION_VARIABLE 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</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;'>- #define _SUPPORT_CONDITION_VARIABLE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _SUPPORT_CONDITION_VARIABLE 0
</span> diff --git a/src/ctx.cpp b/src/ctx.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 67acf03..fa168d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e362cfa..27ae764 100644
</span> --- a/src/ctx.cpp
+++ b/src/ctx.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -550,7 +550,7 @@ void zmq::ctx_t::unregister_endpoints (socket_base_t *socket_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -544,7 +544,7 @@
</span> end = _endpoints.end ();
it != end;) {
if (it->second.socket == socket_)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +110,7 @@ index b591e96..b3c36b5 100644
</span> #include <type_traits>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -285,7 +285,7 @@ int do_getsockopt (void *const optval_,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,7 +305,7 @@
</span> template <typename T>
int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
{
</pre><pre style='margin:0'>
</pre>