<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/972e0545e607620f51f6cd06218adb1e7874dcbe">https://github.com/macports/macports-ports/commit/972e0545e607620f51f6cd06218adb1e7874dcbe</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 972e054 urbit: update to 0.7.0
</span>972e054 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 972e0545e607620f51f6cd06218adb1e7874dcbe
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Jan 23 02:44:49 2019 +0000
<span style='display:block; white-space:pre;color:#404040;'> urbit: update to 0.7.0
</span>---
net/urbit/Portfile | 2 +-
net/urbit/files/patch-meson.build.diff | 34 +++++++++++++++++++---------------
2 files changed, 20 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/urbit/Portfile b/net/urbit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4480971..169237a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/urbit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/urbit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup urbit urbit 0.6.0 urbit-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup urbit urbit 0.7.0 v
</span> categories net
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/urbit/files/patch-meson.build.diff b/net/urbit/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e9a7bb7..55978b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/urbit/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/urbit/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2018-06-26 01:03:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2018-06-26 01:03:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,13 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2019-01-23 02:00:20.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2019-01-23 02:25:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,14 +298,7 @@
</span> # We expect these libs to supplied with the distribution
<span style='display:block; white-space:pre;background:#ffe0e0;'>- curl_dep = dependency('libcurl', version: '>=7.35.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl_dep = dependency('libcurl', version: '>=7.19.0')
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if osdet == 'darwin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (osdet == 'darwin' and not get_option('nix') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- run_command('test', '-d', '/usr/local/opt/openssl/lib').returncode() == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libcrypto = cc.find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libssl = cc.find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span> - openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include'))
-else
- openssl_dep = dependency('openssl', version: '>=1.0.0')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,20 +16,23 @@
</span>
if(legacy_meson)
gmp_dep = find_library('gmp')
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- subprojects/libh2o/meson.build.orig 2018-06-26 01:09:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ subprojects/libh2o/meson.build 2018-06-26 01:09:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,13 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/libh2o/meson.build.orig 2019-01-23 02:00:20.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subprojects/libh2o/meson.build 2019-01-23 02:25:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,16 +137,7 @@
</span>
endif
-if osdet == 'darwin'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libcrypto = cc.find_library('crypto', dirs: ['/usr/local/opt/openssl/lib/'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libssl = cc.find_library('ssl', dirs: ['/usr/local/opt/openssl/lib/'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- openssl_dep = declare_dependency(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dependencies: [libcrypto, libssl],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories: include_directories('/usr/local/opt/openssl/include')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span> -else
- openssl_dep = dependency('openssl', version: '>=1.0.0')
-endif
+openssl_dep = dependency('openssl', version: '>=1.0.0')
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lib = static_library('h2o', sources: lib_src, version: version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories: inc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib = static_library('h2o', sources: lib_src, version: version, install: false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: inc,
</span></pre><pre style='margin:0'>
</pre>