<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/03be397b6f8f8c508eef6e46b831f7ecf7bb22cd">https://github.com/macports/macports-ports/commit/03be397b6f8f8c508eef6e46b831f7ecf7bb22cd</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 03be397 urbit: update to 0.6.0
</span>03be397 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 03be397b6f8f8c508eef6e46b831f7ecf7bb22cd
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Tue Jun 26 01:22:39 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> urbit: update to 0.6.0
</span>---
net/urbit/Portfile | 32 +++++++++++++-------------------
net/urbit/files/patch-Makefile.diff | 22 ----------------------
net/urbit/files/patch-meson.build.diff | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 41 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 446895f..4480971 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;'>@@ -2,8 +2,9 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup urbit urbit 0.4.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup urbit urbit 0.6.0 urbit-
</span> categories net
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,33 +14,26 @@ description a secure peer-to-peer network of personal servers
</span> long_description Urbit is ${description}, built on a clean-slate system software stack.
homepage https://www.urbit.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1022acd07349c8fc3320ac6d84e07e5e9aa3ac07 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 455adbda42fe453cba9f854aa1d1b2e6bc0cabbb7c07a2fef9aa7244f2ef7ffc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span> port:libsigsegv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libuv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:re2c \
</span> path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/cmake:cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "git submodule update --init"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-meson.build.diff
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/bin/urbit ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 ${workpath}/build/urbit ${destroot}${prefix}/bin
</span> set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} LICENSE.txt README.md ${destroot}${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/urbit/files/patch-Makefile.diff b/net/urbit/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 85246ab..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/urbit/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2016-12-16 20:38:38.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2017-04-09 02:49:21.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS=$(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CLD=c++ $(CFLAGS) -L/usr/local/lib $(OPTLOCALLFLAGS) $(OPENSSLLFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CLD=$(CXX) $(CFLAGS) -L@@PREFIX@@/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),osx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLDOSFLAGS=-bind_at_load
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,9 +108,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DHUSH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS+= $(COSFLAGS) -ffast-math \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -funsigned-char \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -I/usr/local/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(OPTLOCALIFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(OPENSSLIFLAGS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -I@@PREFIX@@/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CURLINC) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I$(INCLUDE) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Ioutside/$(LIBUV_VER)/include \
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e9a7bb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2018-06-26 01:03:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2018-06-26 01:03:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,13 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We expect these libs to supplied with the distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ curl_dep = dependency('libcurl', version: '>=7.35.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if osdet == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- openssl_dep = dependency('openssl', version: '>=1.0.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++openssl_dep = dependency('openssl', version: '>=1.0.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(legacy_meson)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gmp_dep = find_library('gmp')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- subprojects/libh2o/meson.build.orig 2018-06-26 01:09:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ subprojects/libh2o/meson.build 2018-06-26 01:09:30.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,13 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 osdet == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- openssl_dep = dependency('openssl', version: '>=1.0.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++openssl_dep = dependency('openssl', version: '>=1.0.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib = static_library('h2o', sources: lib_src, version: version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories: inc,
</span></pre><pre style='margin:0'>
</pre>