<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d48f12bbb091700c1955d3f8e89d45e0f28b5e01">https://github.com/macports/macports-ports/commit/d48f12bbb091700c1955d3f8e89d45e0f28b5e01</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d48f12bbb091700c1955d3f8e89d45e0f28b5e01
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 14 00:21:50 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    yara: Use patchfile to remove Homebrew paths
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also remove hardcoded /opt/local path.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/59627
</span>---
 security/yara/Portfile                              |  4 ++--
 security/yara/files/no-opt-local-or-usr-local.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yara/Portfile b/security/yara/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54fc8ebae17..715188bcad6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/yara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yara/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ if {${subport} eq ${name}} {
</span>                         port:pcre \
                         port:protobuf-c
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles          no-opt-local-or-usr-local.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|/usr/local/opt/openssl/include|${prefix}/include/openssl|" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|/usr/local/opt/openssl/lib|${prefix}/lib|" ${worksrcpath}/configure.ac
</span>         system -W ${worksrcpath} "./bootstrap.sh"
     }
     # If previous yara is installed, this build will fail since
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/yara/files/no-opt-local-or-usr-local.patch b/security/yara/files/no-opt-local-or-usr-local.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3eea08c287a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/yara/files/no-opt-local-or-usr-local.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not look for OpenSSL in /usr/local/opt/openssl.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not assume the MacPorts prefix is /opt/local.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/VirusTotal/yara/issues/1160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig      2022-03-09 03:09:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac   2022-04-14 00:20:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,11 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    darwin*) CFLAGS="$CFLAGS -I/opt/local/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             # Starting with Mac OS X 10.11 (El Capitan) the OpenSSL headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             # are in /usr/local/opt/openssl/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             CFLAGS="$CFLAGS -DUSE_MACH_PROC -I/usr/local/opt/openssl/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-             LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    darwin*) CFLAGS="$CFLAGS -DUSE_MACH_PROC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              posix=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              proc_interface=mach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              jemalloc_prefix=je_ ;;
</span></pre><pre style='margin:0'>

</pre>