<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1af340ab9ff35b34938e5d0e8fa58b7c9c3e92c0">https://github.com/macports/macports-ports/commit/1af340ab9ff35b34938e5d0e8fa58b7c9c3e92c0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1af340ab9ff35b34938e5d0e8fa58b7c9c3e92c0
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Wed Jun 8 13:09:46 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    watchman: update to 2022.06.06.00
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The Python package isn't terribly interesting, and the logic for
</span><span style='display:block; white-space:pre;color:#404040;'>    installing it is broken, so I just suppressed it. While at it,
</span><span style='display:block; white-space:pre;color:#404040;'>    suppress using ${prefix}/var/run/watchman for state; it doesn't exist,
</span><span style='display:block; white-space:pre;color:#404040;'>    and may not be writable. Instead, just fall back to $TMPDIR.
</span>---
 sysutils/watchman/Portfile                        | 27 +++++++++++++++--------
 sysutils/watchman/files/cmake-python-destdir.diff | 11 ---------
 2 files changed, 18 insertions(+), 20 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b58b4e81c8..9d8ffabe0e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup           cmake 1.1
</span> PortGroup           boost 1.0
 PortGroup           rust 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        facebook watchman 2022.01.17.00 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        facebook watchman 2022.06.06.00 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> 
 categories          sysutils
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,28 +31,37 @@ depends_lib-append  port:pcre \
</span>                     port:fb303
 
 configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DBoost_INCLUDE_DIR=[boost::include_dir] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DUSE_SYSTEM_PYTHON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DBoost_INCLUDE_DIR=[boost::include_dir]
</span> 
 configure.env-append \
                     NODE_BIN=${prefix}/bin/node \
                     YARN_PATH=${prefix}/bin/yarn \
                     DESTDIR=${destroot}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          cmake-rust-build-target.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    cmake-python-destdir.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          cmake-rust-build-target.diff
</span> 
 post-patch {
     reinplace "s,/usr/bin,${prefix}," CMakeLists.txt
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # ${prefix}/var/run isn't writable, so force fallback to $TMPDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace /WATCHMAN_STATE_DIR/d ${build.dir}/config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # the custom build machinery does something weird with DESTDIR and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # prefixes; just suppress the python binaries instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    file delete -force ${destroot}${prefix}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard \
                     2017
 
 checksums           ${distname}${extract.suffix}  \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  871b9b64dd6f4afe7c5b121b1ffbdaae4ed4edc4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  6cd05b177746d07da3f58a1c499d41b57cbde7e44ea7718f9ed7144f7a34e0e9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    3768308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  f172dae7f2d6f182bac266359ba14089af66ccd8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  d24548e0c4d5c692c15b5a8eaf46b02cb59d9fb228d611c31b6c8e81e7a4cb2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    3775957
</span> 
 
 cargo.crates \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/cmake-python-destdir.diff b/sysutils/watchman/files/cmake-python-destdir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 04f41203c0e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/files/cmake-python-destdir.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;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ #<buffer CMakeLists.txt>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -409,7 +409,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       ${CMAKE_COMMAND} -E env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ${Python3_EXECUTABLE} ${SETUP_PY} install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        --root $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        --root $ENV{DESTDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       RESULT_VARIABLE STATUS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     if (NOT STATUS STREQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       message(FATAL_ERROR \"pywatchman install failed\")
</span></pre><pre style='margin:0'>

</pre>