<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/e7bd1d25b8a45123ff899c654549c2ecbefa54bd">https://github.com/macports/macports-ports/commit/e7bd1d25b8a45123ff899c654549c2ecbefa54bd</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 e7bd1d25b8a zmq-devel: update to 20210106-2bf998f7
</span>e7bd1d25b8a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7bd1d25b8a45123ff899c654549c2ecbefa54bd
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jan 7 11:08:22 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> zmq-devel: update to 20210106-2bf998f7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + fix opportunistic linking to libsodium
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + disable libbsd just in case of opportunistic linking
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + add patch to allow using "clock_gettime" on macOS
</span>---
devel/zmq/Portfile | 24 ++++++++++++++--------
devel/zmq/files/patch-c11.devel.diff | 2 +-
devel/zmq/files/patch-cxx11.devel.diff | 4 ++--
devel/zmq/files/patch-fix-docs-dir.devel.diff | 2 +-
.../zmq/files/patch-fix-no-librt-APPLE.devel.diff | 20 ++++++++++++++++++
5 files changed, 39 insertions(+), 13 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 8fafb7a035b..3b998e66d12 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;'>@@ -92,23 +92,29 @@ subport zmq22 {
</span> subport zmq-devel {
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup zeromq libzmq 04f5bbedee58c538934374dc45182d8fc5926fa3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200902-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 05efc7ae86d5385890b30eb2be1f499aec0eb107 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 23d2a88d8b0ea5782f07052284ec67406c54c2f8262d402b70b78b19f22a8cf9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 915352
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup zeromq libzmq 2bf998f7e0aa19e89918627d386d526e4f2e25dd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210106-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3fa90b0dc514f2744971b76fde55e82a375b74d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2bca39d97746ec4647b63a1ca94fd28ed8ce112e060ae507edeb89fa79d2f186 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 917782
</span> revision 0
conflicts zmq zmq22 zmq3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsodium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DWITH_PERF_TOOL=OFF \
-DZMQ_BUILD_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_CPACK=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CPACK=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_LIBBSD=OFF
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cxx11.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-c11.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-docs-dir.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cxx11.devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-c11.devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-docs-dir.devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-no-librt-APPLE.devel.diff
</span>
}
<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 92d36b37151..e752b65a368 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;'>-@@ -63,7 +63,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,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 7714d4c996a..2505343765d 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 800171f..337a266 100644
--- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,7 +92,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,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 556eea4..8803711 100644
</span> #include <type_traits>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,7 +324,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,7 +327,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-fix-docs-dir.devel.diff b/devel/zmq/files/patch-fix-docs-dir.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b722df969d9..9fbf2525727 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/zmq/files/patch-fix-docs-dir.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-fix-docs-dir.devel.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;'>-@@ -1646,7 +1646,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1658,7 +1658,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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..01a81c33649
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/zmq/files/patch-fix-no-librt-APPLE.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af22903..01ddba7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -581,9 +581,13 @@ if(WIN32 AND NOT CYGWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_REQUIRED_LIBRARIES rt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_REQUIRED_LIBRARIES rt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_REQUIRED_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_REQUIRED_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_symbol_exists(fork unistd.h HAVE_FORK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_cxx_symbol_exists(gethrtime sys/time.h HAVE_GETHRTIME)
</span></pre><pre style='margin:0'>
</pre>