<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8bc35d78111857851ef813bb0447e86b0dc2ce95">https://github.com/macports/macports-ports/commit/8bc35d78111857851ef813bb0447e86b0dc2ce95</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8bc35d78111857851ef813bb0447e86b0dc2ce95
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Sun Apr 1 04:03:19 2018 +0200

<span style='display:block; white-space:pre;color:#404040;'>    hexchat: Do not use header of installed port
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/52384
</span>---
 irc/hexchat/Portfile                               |  3 +-
 .../files/patch-build-perl-as-a-dependency.diff    | 43 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/Portfile b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0d14cf..ffd26ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,8 @@ checksums           rmd160  87f0aadaaeb4fd16650b3622a45510bd470c32d1 \
</span> 
 patchfiles          patch-meson-post-install.diff \
                     patch-build-scripts-python3.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-build-Add-option-to-specify-path-to-perl-binary.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-build-Add-option-to-specify-path-to-perl-binary.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-build-perl-as-a-dependency.diff
</span> patch.post_args     -p1
 
 post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/files/patch-build-perl-as-a-dependency.diff b/irc/hexchat/files/patch-build-perl-as-a-dependency.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3dfd251
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/files/patch-build-perl-as-a-dependency.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Accepted [https://github.com/hexchat/hexchat/commit/111441302c4eb0c719088526c5b8c4be3df6a0dc]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 111441302c4eb0c719088526c5b8c4be3df6a0dc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Rainer=20M=C3=BCller?= <raimue@codingfarm.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 26 Mar 2018 16:53:02 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] build: perl as a dependency in meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+With the switch to meson, the problem previously fixed in #1822 came
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+back. The build system might pick up the installed hexchat-config.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+instead of using the header in the source directory, as the compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+arguments would be in the order of "-I${prefix}/include -I..".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It seems that the c_args in meson are always put to the front of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler arguments, in order to be able to override any include paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+from dependencies. However, this was not the intention here, so perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+should also be modeled as a dependency. This ensures that the arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with local include directories come first.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plugins/perl/meson.build | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/perl/meson.build b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3779a35cd..06ffd54b6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/perl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,11 +76,14 @@ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   error('found perl not suitable for plugin')
</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;'>++perl_dep = declare_dependency(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  compile_args: perl_cflags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  link_args: perl_ldflags
</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;'>+ shared_module('perl',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   sources: ['perl.c', hexchat_perl_module, irc_perl_module],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  dependencies: [libgio_dep, hexchat_plugin_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  c_args: perl_cflags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  link_args: perl_ldflags,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  dependencies: [libgio_dep, hexchat_plugin_dep, perl_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   install_dir: plugindir,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   install_rpath: perl_rpath,
</span></pre><pre style='margin:0'>

</pre>