<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/121a4b4218ee42d4664c20b3b5c87f6570c861a5">https://github.com/macports/macports-ports/commit/121a4b4218ee42d4664c20b3b5c87f6570c861a5</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 121a4b4 s-nail: changes after discussing with upstream devs
</span>121a4b4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 121a4b4218ee42d4664c20b3b5c87f6570c861a5
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Thu Sep 26 22:14:39 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> s-nail: changes after discussing with upstream devs
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Notably fix compatibility with Apple awk, and thus GNU awk is no longer
</span><span style='display:block; white-space:pre;color:#404040;'> needed.
</span>---
mail/s-nail/Portfile | 14 ++++++-----
.../files/patch-apple-awk-compatibility.diff | 29 ++++++++++++++++++++++
2 files changed, 37 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/s-nail/Portfile b/mail/s-nail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c2bea30..4257cec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/s-nail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/s-nail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,14 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO(pending): s-nail will be renamed to s-mailx in version 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://lists.sdaoden.eu/pipermail/s-mailx/2019-September/001286.html
</span> name s-nail
version 14.9.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories mail
license {BSD-old BSD}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {yan12125 @yan12125} openmaintainer
</span> description Steffen Nurpmeso's nail, fork of Heirloom mailx
long_description \
S-nail provides a simple and friendly environment for sending and \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +29,10 @@ depends_lib-append port:kerberos5 \
</span> port:libidn2 \
path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gawk needed for generating correct makefiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gawk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Backported from https://repo.or.cz/s-mailx.git/commit/0076f8f6695cd4579dfb4aab4403ac7a5f08a0a0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Allow generating correct makefile with Apple awk; see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://lists.sdaoden.eu/pipermail/s-mailx/2019-September/001289.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-apple-awk-compatibility.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +40,6 @@ build.args VAL_PREFIX=${prefix} \
</span> VAL_MAIL=${prefix}/var/spool/mail \
VAL_SID= \
VAL_MAILX=mail \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- awk=${prefix}/bin/gawk \
</span> VERBOSE=yes
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/s-nail/files/patch-apple-awk-compatibility.diff b/mail/s-nail/files/patch-apple-awk-compatibility.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ddafdec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/s-nail/files/patch-apple-awk-compatibility.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0076f8f6695cd4579dfb4aab4403ac7a5f08a0a0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Steffen Nurpmeso <steffen@sdaoden.eu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 24 Sep 2019 18:48:24 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] mk/make-rules.sh: close() C source files (Martin Neitzel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (Alexander Harm))
</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;'>+ mk/make-rules.sh | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mk/make-rules.sh mk/make-rules.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 406677a..3b7ccc6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mk/make-rules.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mk/make-rules.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,8 +99,10 @@ printf '%s\n' "${@}" | ${sort} | ${awk} -v COUNT_MODE=${COUNT_MODE} '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Parse the file and generate dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(any = 0;;){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ po_i = getline < farr[no]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(po_i == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(po_i == 0){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ close(farr[no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(po_i == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(1)
</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;'>+2.10.5.GIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>