<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/360205c7847d3ca34bdf79640c5030918c708a50">https://github.com/macports/macports-ports/commit/360205c7847d3ca34bdf79640c5030918c708a50</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 360205c7847d3ca34bdf79640c5030918c708a50
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Oct 27 09:56:33 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libedit: update version 20190324-3.1->20191025-3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59477
</span>---
devel/libedit/Portfile | 22 ++++------------------
devel/libedit/files/patch-history.diff | 2 +-
devel/libedit/files/patch-no_escaping.diff | 4 ++--
devel/libedit/files/patch-non_ascii.diff | 2 +-
devel/libedit/files/readline.c.patch | 2 +-
5 files changed, 9 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/Portfile b/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0880ba..78af4c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup clang_dependency 1.0
</span>
name libedit
epoch 20090923
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20190324-3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20191025-3.1
</span> categories devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,17 +21,12 @@ homepage https://thrysoee.dk/editline/
</span> master_sites ${homepage} \
http://download.openpkg.org/components/cache/libedit/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 213fb25fe0546ff99690b3d0f1f32bfd0ee08826 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ac8f0f51c1cf65492e4d1e3ed2be360bda41e54633444666422fbf393bba1bae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 521999
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1dcd74cb66d00ba56a2654a635bc9ec6dd03be5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6dff036660d478bfaa14e407fc5de26d22da1087118c897b1a3ad2e90cb7bf39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 516599
</span>
depends_lib port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# To clean up xattrs in the source files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_patch bin:xattr:xattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict xattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_skip_archcheck xattr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${os.platform} eq "darwin" && ${os.major} < 11 && ${cxx_stdlib} eq "libc++"} {
# This port is required by clang 3.7 and later
clang_dependency.extra_versions 3.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +59,6 @@ patchfiles-append patch-no_escaping.diff
</span>
post-patch {
copy ${filespath}/getline.c ${worksrcpath}/src
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # source contains Time Machine xattrs, which can confuse libarchive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xattr on leopard or earlier does not support -r so do the recursion manually
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "xattr -r -d com.apple.metadata:_kTimeMachineOldestSnapshot ${worksrcpath}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "xattr -r -d com.apple.metadata:_kTimeMachineNewestSnapshot ${worksrcpath}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "find . -type f -print0 | xargs -0 xattr -d com.apple.metadata:_kTimeMachineOldestSnapshot"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "find . -type f -print0 | xargs -0 xattr -d com.apple.metadata:_kTimeMachineNewestSnapshot"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
configure.args --disable-silent-rules --disable-examples
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/patch-history.diff b/devel/libedit/files/patch-history.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bbb761a..1858814 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/patch-history.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/patch-history.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/readline.c.orig 2018-05-25 11:09:38.000000000 -0700
+++ src/readline.c 2018-11-17 08:13:35.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2098,9 +2098,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2102,9 +2102,8 @@
</span> void
rl_callback_handler_remove(void)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/patch-no_escaping.diff b/devel/libedit/files/patch-no_escaping.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index be43cad..6a2f9d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/patch-no_escaping.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/patch-no_escaping.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/filecomplete.c.orig 2018-05-25 11:09:38.000000000 -0700
+++ src/filecomplete.c 2018-11-17 08:17:12.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,34 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,34 +129,7 @@
</span> static int
needs_escaping(char c)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,4 +34,4 @@
</span> - }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/patch-non_ascii.diff b/devel/libedit/files/patch-non_ascii.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9be7658..39b884a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/patch-non_ascii.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/patch-non_ascii.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> diff -ur src/el.c /Users/macports/Fix/libedit-48/src/el.c
--- src/el.c 2012-12-13 13:01:25.000000000 -0700
+++ src/el.c.orig 2013-02-07 11:05:15.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,6 +122,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,6 +120,10 @@
</span> /*
* Initialize all the modules. Order is important!!!
*/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/readline.c.patch b/devel/libedit/files/readline.c.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index daf15ab..07b18e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/readline.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/readline.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/readline.c.orig 2017-03-30 05:15:04.000000000 +1100
+++ src/readline.c 2017-09-12 19:37:40.000000000 +1000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2077,7 +2077,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2081,7 +2081,10 @@
</span> } else
wbuf = NULL;
(*(void (*)(const char *))rl_linefunc)(wbuf);
</pre><pre style='margin:0'>
</pre>