<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca6c4cb99413d95753507bfbac95120ce928b8dd">https://github.com/macports/macports-ports/commit/ca6c4cb99413d95753507bfbac95120ce928b8dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca6c4cb99413d95753507bfbac95120ce928b8dd
</span>Author: Andrew L. Moore <slewsys@gmail.com>
AuthorDate: Thu Dec 20 13:39:14 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    mosquitto: Upgrade to version 1.5.5.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Use depends_build-append.
</span><span style='display:block; white-space:pre;color:#404040;'>    Remove revision 0
</span><span style='display:block; white-space:pre;color:#404040;'>    Add `depends_test-append port:python27'.
</span><span style='display:block; white-space:pre;color:#404040;'>    Replace test script shebang with `#!${prefix}/bin/python27'.
</span><span style='display:block; white-space:pre;color:#404040;'>    Replace `${workpath}/build' with `${build.dir}'.
</span>---
 net/mosquitto/Portfile | 54 +++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mosquitto/Portfile b/net/mosquitto/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42f139d..9c51b63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/mosquitto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mosquitto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem          1.0
</span> PortGroup           cmake 1.1
 
 name                mosquitto
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.5.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.5.5
</span> 
 categories          net devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +22,21 @@ long_description    \
</span> homepage            https://mosquitto.org
 master_sites        http://mosquitto.org/files/source/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  91b6695d40742db02d6243716e494ae1044dc3ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3081a998d303a883b1cd064009beabc88aa9159e26f5258a4ae6007160491d10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    425844
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  7c04ab09553a3514c0ff6411ba289ed3a971c757 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  fcdb47e340864c545146681af7253399cc292e41775afd76400fda5b0d23d668 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    431998
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/xsltproc:libxslt
</span> 
 depends_lib         port:c-ares \
                     port:libwebsockets \
                     port:tcp_wrappers \
                     path:lib/libssl.dylib:openssl
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
                     -DUSE_LIBWRAP=yes \
                     -DWITH_EPOLL=no \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,45 +44,48 @@ configure.args-append \
</span>                     -DWITH_WEBSOCKETS=yes
 
 test.run            yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target         -C ${workpath}/build/test test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target         -C ${build.dir}/test test
</span> 
 pre-build {
     reinplace -E "s|\\.so\\.\[^\[:space:\]\]+|.dylib |g" ${worksrcpath}/config.mk
 }
 
 pre-test {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![file exist ${workpath}/build/test]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach f [list config.mk test] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            copy -force ${worksrcpath}/${f} ${workpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![file exist ${build.dir}/test]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach path [list config.mk test] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            copy -force ${worksrcpath}/${path} ${build.dir}
</span>         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        fs-traverse dir ${workpath}/build/test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[file tail ${dir}] eq "Makefile"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -E "s|\\.so\\.\[^\[:space:\]\]+|.dylib|g" $dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -E "s|\\.so\[\[:space:\]\]+|.dylib |g" $dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</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;'>+    fs-traverse path ${build.dir}/test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[file tail ${path}] eq "Makefile"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace -E "s|\\.so\\.\[^\[:space:\]\]+|.dylib|g" $path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace -E "s|\\.so\[\[:space:\]\]+|.dylib |g" $path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif {[string match "*.py" ${path}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            reinplace "s|^#!/usr/bin/env python$|#!${prefix}/bin/python2.7|" $path
</span>         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     # `auth_plugin.c' and `auth_plugin_acl.c' have missing dependencies
     reinplace "s|^all :.*|all : auth_plugin_pwd.dylib auth_plugin_v2.dylib auth_plugin_msg_params.dylib 08|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/broker/c/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/broker/c/Makefile
</span>     # Test target 08 fails due to expired certificate.
     # Test target 09 fails due to I/O error when launching broker.
     reinplace "s|^test :.*|test : test-compile 01 02 03 04 05 06 07 10 11|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/broker/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/broker/Makefile
</span>     # `09-util-utf8-validate.c' fails to compile due to invalid encoding.
     reinplace "s|^09 :.*|09 : 09-util-topic-matching.test 09-util-topic-tokenise.test|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/lib/c/Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/lib/cpp/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/lib/c/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/lib/cpp/Makefile
</span>     # Test target 08 fails due to expired certificate.
     reinplace "s|^all :.*|all : 01 02 03 04 09|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/lib/cpp/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/lib/cpp/Makefile
</span>     # Test targets ./08.* fail due to expired certificate.
     reinplace "s|\\./08|#./08|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/lib/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/lib/Makefile
</span>     # Test target 09-util-utf8-validate fails due to invalid encoding.
     reinplace "s|\\./09-util-utf8|#./09-util-utf8|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${workpath}/build/test/lib/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${build.dir}/test/lib/Makefile
</span> }
 
 set mosquitto_user  mosquitto
</pre><pre style='margin:0'>

</pre>