zmq: update release to 4.2.4 and devel to 0b997109 (20180321).

devel/zmq/Portfile

@@ -21,10 +21,11 @@ long_description    \
     protocols and more.
 
 if {${name} eq ${subport}} {
-    github.setup        zeromq libzmq 4.2.3 v
+    github.setup        zeromq libzmq 4.2.4 v
 
-    checksums           rmd160 fb34afb5d30a1b76d03f933b2607816126c9176e \
-                        sha256 57988a1142b50151b81d7b1580adb824b9244d9d01269f52ff2c5b886fe021a1
+    checksums           rmd160 91f4b056aff9fca1b1ddacaafcfd1311c8d65af7 \
+                        sha256 20f4d5f66e41042f0d25b4ac53ee43acd81c6b397f234d88bcdef419d00f17e4 \
+                        size   714024
 
     conflicts           zmq-devel zmq22 zmq3
     configure.args-append --disable-libunwind --disable-cxx11
@@ -53,11 +54,11 @@ subport zmq22 {
 }
 
 subport zmq-devel {
-    github.setup        zeromq libzmq a415ede398553ba4ae86391e32352a712b0439a8
-    version             20180320
-    checksums           rmd160 23f75db4aba0fa3c0412c2dbf4911fd919bdd737 \
-                        sha256 cea9a1aacfa36c949f4ec17bab1eeae425547d1f64d198f591ea72950ee8a53f \
-                        size   713010
+    github.setup        zeromq libzmq 0b997109493f3e9df668bb1031c95b2b4ea81fd1
+    version             20180321
+    checksums           rmd160 9cf794985499351078c8e77cbbbc3dbcc7d70695 \
+                        sha256 40db1d43e8261e14c5fcc8459ce920db5d90dc608155b9ce2d80534d17b9089a \
+                        size   714062
 
     conflicts           zmq zmq22 zmq3
     configure.args-append --disable-libunwind --disable-cxx11

devel/zmq/files/patch-cxx11.devel.diff

@@ -1,6 +1,6 @@
 --- configure.ac.orig
 +++ configure.ac
-@@ -55,8 +55,19 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
+@@ -56,8 +56,19 @@
  # Checks for programs.
  AC_PROG_CC
  AX_CHECK_COMPILE_FLAG([-std=gnu11], [CFLAGS+=" -std=gnu11"], [AC_PROG_CC_C99])

devel/zmq/files/patch-cxx11.release.diff

@@ -1,6 +1,6 @@
 --- configure.ac.orig
 +++ configure.ac
-@@ -54,8 +54,19 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
+@@ -55,8 +55,19 @@ ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
  # Checks for programs.
  AC_PROG_CC
  AX_CHECK_COMPILE_FLAG([-std=gnu11], [CFLAGS+=" -std=gnu11"], [AC_PROG_CC_C99])
@@ -21,38 +21,40 @@
  AX_CODE_COVERAGE
  AM_PROG_CC_C_O
  AC_PROG_SED
+diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
+index 23a7c50..2fc2fe4 100644
 --- src/atomic_counter.hpp.orig
 +++ src/atomic_counter.hpp
 @@ -36,7 +36,7 @@
  #define ZMQ_ATOMIC_COUNTER_MUTEX
  #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
  #define ZMQ_ATOMIC_COUNTER_INTRINSIC
--#elif (defined __cplusplus && __cplusplus >= 201103L)
-+#elif (defined __cplusplus && defined ZMQ_USE_CXX11)
+-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
++#elif (defined __cplusplus && defined ZMQ_USE_CXX11)                          \
+   || (defined _MSC_VER && _MSC_VER >= 1900)
  #define ZMQ_ATOMIC_COUNTER_CXX11
  #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
- #define ZMQ_ATOMIC_COUNTER_X86
 --- src/atomic_ptr.hpp.orig
 +++ src/atomic_ptr.hpp
 @@ -34,7 +34,7 @@
  #define ZMQ_ATOMIC_PTR_MUTEX
  #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
  #define ZMQ_ATOMIC_PTR_INTRINSIC
--#elif (defined __cplusplus && __cplusplus >= 201103L)
-+#elif (defined __cplusplus && defined ZMQ_USE_CXX11)
+-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
++#elif (defined __cplusplus && defined ZMQ_USE_CXX11)                          \
+   || (defined _MSC_VER && _MSC_VER >= 1900)
  #define ZMQ_ATOMIC_PTR_CXX11
  #elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
- #define ZMQ_ATOMIC_PTR_X86
 --- src/blob.hpp.orig
 +++ src/blob.hpp
 @@ -34,7 +34,7 @@
  #include <string.h>
  #include <algorithm>
 
--#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER >= 1700
-+#if ZMQ_USE_CXX11 || (defined(_MSC_VER) && _MSC_VER >= 1700)
+-#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_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
  #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
 --- src/condition_variable.hpp.orig
 +++ src/condition_variable.hpp