<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31372fa005db54a76bae99a4ba785db031cb84ed">https://github.com/macports/macports-ports/commit/31372fa005db54a76bae99a4ba785db031cb84ed</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 31372fa005db54a76bae99a4ba785db031cb84ed
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Thu Mar 16 15:57:24 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    libhttpseverywhere: fix build with meson 0.39.1
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * include_directories now accepts only relative path
</span><span style='display:block; white-space:pre;color:#404040;'>    * adjust Portfile to allow patching of meson.build
</span><span style='display:block; white-space:pre;color:#404040;'>    * add test phase
</span><span style='display:block; white-space:pre;color:#404040;'>    * no change in installed content
</span>---
 www/libhttpseverywhere/Portfile                     | 15 +++++++++++----
 www/libhttpseverywhere/files/patch-meson.build.diff | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/libhttpseverywhere/Portfile b/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d93faa4..8fcf8b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/libhttpseverywhere/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,16 +42,23 @@ depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>                     port:libxml2 \
                     port:vala
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# meson requires builds be in build subdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir          ${distname}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-meson.build.diff
</span> 
 configure.cmd       meson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args . build
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# meson requires builds be in build subdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir           ${worksrcpath}/build
</span> build.cmd           ninja
 build.target
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run            yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.dir            ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd            ./httpseverywhere_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # DESTDIR must come before ninja command rather than after
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.dir        ${worksrcpath}/build
</span> destroot.cmd        DESTDIR=${destroot} ninja
 destroot.destdir
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +67,7 @@ destroot.destdir
</span> post-destroot {
     set libname ${prefix}/lib/${name}-0.2.dylib
     system "install_name_tool -id ${libname} ${destroot}${libname}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "install_name_tool -delete_rpath ${worksrcpath}/ ${destroot}${libname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "install_name_tool -delete_rpath ${worksrcpath}/build/ ${destroot}${libname}"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/libhttpseverywhere/files/patch-meson.build.diff b/www/libhttpseverywhere/files/patch-meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..388d846
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/libhttpseverywhere/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig       2016-12-21 00:51:59.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build    2017-03-16 15:42:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ httpseverywhere_test = executable('httpseverywhere_test', httpseverywhere_test_source,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   dependencies: [glib, gobject, gio, gee, libxml],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                                  include_directories: include_directories('@0@/httpseverywhere-@1@'.format(meson.current_build_dir(), api)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  include_directories: include_directories('build/httpseverywhere-'+api),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                   link_with: httpseverywhere_lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_ir_compiler = find_program('g-ir-compiler')
</span></pre><pre style='margin:0'>

</pre>