<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b7244420bd677891c805dbb395ffeba53f5efa0f">https://github.com/macports/macports-ports/commit/b7244420bd677891c805dbb395ffeba53f5efa0f</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 b7244420bd6 zmq: update to 4.3.5; zmq-devel: update to 20240906
</span>b7244420bd6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b7244420bd677891c805dbb395ffeba53f5efa0f
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Sep 18 05:51:09 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> zmq: update to 4.3.5; zmq-devel: update to 20240906
</span>---
devel/zmq/Portfile | 27 ++++++++++------------
devel/zmq/files/patch-c11.release.diff | 4 ++--
devel/zmq/files/patch-cxx11.release.diff | 19 +++------------
devel/zmq/files/patch-fix-docs-dir.release.diff | 2 +-
.../zmq/files/patch-fix-no-librt-APPLE.devel.diff | 20 ----------------
.../files/patch-fix-no-librt-APPLE.release.diff | 2 +-
devel/zmq/files/patch-tests.diff | 11 ---------
7 files changed, 19 insertions(+), 66 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 99f9634bb95..77771bc6c7e 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;'>@@ -6,7 +6,6 @@ PortGroup legacysupport 1.1
</span>
name zmq
categories devel sysutils net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-3+
maintainers {stromnov @stromnov} {michaelld @michaelld} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,11 +23,11 @@ long_description \
</span> if {${name} eq ${subport}} {
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq 4.3.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 540c9bc003266579d84985c52cc27fe6cbb098cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5aa12435d152435a441ecfa8ad49b56eb845829b9bde22f90ea232cebaff055f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 918351
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq 4.3.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b26b2c2368d76e93b67607e0e8703714f8c0c4eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5c7ec9f212ff04e196c126464661764d3f054107e0ceac3b030f748106d53424 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 875612
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts zmq-devel zmq22 zmq3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +47,7 @@ if {${name} eq ${subport}} {
</span> patch-cxx11.release.diff \
patch-c11.release.diff \
patch-fix-docs-dir.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-no-librt-APPLE.release.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-no-librt-APPLE.release.diff
</span>
# https://github.com/zeromq/libzmq/issues/4595
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,11 +106,11 @@ subport zmq22 {
</span> subport zmq-devel {
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq b30a19ebde6a1b2490749c754be2818901a00587
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20231013-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ec42c268475dc45c4e6a7b68fc9ca3106b8a25fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe39446005b668d731cc51828ba556127497937f23beba698a966e9cb9c04267 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 876691
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq 64db7d28fea695132834f6d2c5949cfea2f22d01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20240906-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 df863572089bb89e4894ea978c458f9c5f015d33 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 08196cf55fa59d15e4413095936e0be4d2925fba9c8beb0fb7b938ddefaccc5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 880003
</span> revision 0
conflicts zmq zmq22 zmq3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,8 +131,7 @@ subport zmq-devel {
</span>
patch.pre_args-replace -p0 -p1
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-docs-dir.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-no-librt-APPLE.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-docs-dir.devel.diff
</span>
# https://github.com/zeromq/libzmq/issues/4595
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<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 e752b65a368..9cedbe78cab 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,11 +2,11 @@ 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;'>-@@ -64,7 +64,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,7 +65,18 @@
</span>
# Checks for programs.
AC_PROG_CC
<span style='display:block; white-space:pre;background:#ffe0e0;'>--AX_CHECK_COMPILE_FLAG([-std=gnu11], [CFLAGS+=" -std=gnu11"], [AC_PROG_CC_C99])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99])
</span> +AC_ARG_ENABLE([c11],
+ [AS_HELP_STRING([--enable-c11],
+ [enable C11 for C compiler [default=no]])],
<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 2505343765d..22efa08fe6a 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;'>@@ -23,15 +23,15 @@ diff --git a/perf/benchmark_radix_tree.cpp b/perf/benchmark_radix_tree.cpp
</span> index 432d535..e5f097b 100644
--- a/perf/benchmark_radix_tree.cpp
+++ b/perf/benchmark_radix_tree.cpp
<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:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* SPDX-License-Identifier: MPL-2.0 */
</span>
-#if __cplusplus >= 201103L
+#if defined(ZMQ_USE_CXX11)
#include "radix_tree.hpp"
#include "trie.hpp"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git a/src/atomic_counter.hpp b/src/atomic_counter.hpp
index d05837a..8a1c7ad 100644
--- a/src/atomic_counter.hpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,16 +132,3 @@ index aa9f100..538ad89 100644
</span> it = _subscriptions.erase (it);
#else
_subscriptions.erase (it++);
<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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-fix-docs-dir.release.diff b/devel/zmq/files/patch-fix-docs-dir.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9fbf2525727..460e5c98b5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-fix-docs-dir.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-fix-docs-dir.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1658,7 +1658,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1719,7 +1719,7 @@
</span> if(NOT ZMQ_BUILD_FRAMEWORK)
install(
FILES ${html-docs}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-fix-no-librt-APPLE.devel.diff b/devel/zmq/files/patch-fix-no-librt-APPLE.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bbcd8352c48..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-fix-no-librt-APPLE.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,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af22903..01ddba7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -597,9 +597,13 @@
</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(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_REQUIRED_LIBRARIES rt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_REQUIRED_LIBRARIES rt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_REQUIRED_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_REQUIRED_LIBRARIES)
</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;'>- check_cxx_symbol_exists(fork unistd.h HAVE_FORK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_cxx_symbol_exists(gethrtime sys/time.h HAVE_GETHRTIME)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-fix-no-librt-APPLE.release.diff b/devel/zmq/files/patch-fix-no-librt-APPLE.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 01a81c33649..8224a89aed4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-fix-no-librt-APPLE.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-fix-no-librt-APPLE.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
</span> index af22903..01ddba7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -581,9 +581,13 @@ if(WIN32 AND NOT CYGWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,9 +593,13 @@
</span> endif()
if(NOT MSVC)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/zmq/files/patch-tests.diff b/devel/zmq/files/patch-tests.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 59acf99e969..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tests/CMakeLists.txt.orig 2021-01-17 20:01:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tests/CMakeLists.txt 2023-02-01 06:21:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -248,7 +248,7 @@
</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;'>- # per-test directories not generated on OS X / Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>