<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7907e978c09e813520ee5c93aff8e6a542bc46ad">https://github.com/macports/macports-ports/commit/7907e978c09e813520ee5c93aff8e6a542bc46ad</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 7907e97 yaws: fix build without /usr/include
</span>7907e97 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7907e978c09e813520ee5c93aff8e6a542bc46ad
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jan 26 01:24:32 2020 +1100
<span style='display:block; white-space:pre;color:#404040;'> yaws: fix build without /usr/include
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also disable silent rules. Maintainer timeout.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57697
</span>---
www/yaws/Portfile | 10 +++++++++-
www/yaws/files/configure.ac.patch | 11 +++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/yaws/Portfile b/www/yaws/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b79372..c68946d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/yaws/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/yaws/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,18 @@ patchfiles patch-man-yaws.1 \
</span> patch-scripts-yaws.conf.template \
patch-scripts-regular-install
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix for systems without /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/57697
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|__PREFIX|${prefix}|g" \
${worksrcpath}/man/yaws.1 \
${worksrcpath}/man/yaws.conf.5 \
${worksrcpath}/man/yaws_api.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # insert SDK path, goes with ticket #57697 patch above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__SDKROOT|${configure.sdkroot}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure.ac
</span> }
default_variants +yapp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +51,8 @@ default_variants +yapp
</span> use_autoreconf yes
configure.args --sysconfdir=${prefix}/etc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --localstatedir=${prefix}/var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --localstatedir=${prefix}/var \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules
</span>
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/yaws/files/configure.ac.patch b/www/yaws/files/configure.ac.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c69b07b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/yaws/files/configure.ac.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-06-30 23:20:53.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2020-01-26 01:19:18.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,7 +296,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$enable_pam" != "xno"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([security/pam_appl.h pam/pam_appl.h pam_appl.h],[break])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EPAM_CFLAGS="-I/usr/include/security"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EPAM_CFLAGS="-I__SDKROOT/usr/include/security"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test "x$ac_cv_header_pam_pam_appl_h" = "xyes" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EPAM_CFLAGS="-I/usr/include/pam"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test "x$ac_cv_header_pam_appl_h" = "xno" ; then
</span></pre><pre style='margin:0'>
</pre>