<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/62d431d198fd74aae55ab644e8ce741ad883f544">https://github.com/macports/macports-ports/commit/62d431d198fd74aae55ab644e8ce741ad883f544</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 62d431d libedit: update version 20170329-3.1->20180525-3.1
</span>62d431d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62d431d198fd74aae55ab644e8ce741ad883f544
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Nov 9 03:45:32 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> libedit: update version 20170329-3.1->20180525-3.1
</span>---
devel/libedit/Portfile | 14 ++++----------
devel/libedit/files/patch-non_ascii.diff | 2 +-
.../files/patch-read_history-save-length.diff | 19 -------------------
devel/libedit/files/readline.c.patch | 18 +++++++++---------
devel/libedit/files/src__Makefile.in.patch | 20 ++++++++++----------
5 files changed, 24 insertions(+), 49 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 b6fc9df..2089515 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;'>@@ -5,8 +5,7 @@ PortGroup muniversal 1.0
</span>
name libedit
epoch 20090923
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170329-3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20180525-3.1
</span> categories devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +20,9 @@ homepage http://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 6a463e0df6a5655cef466c7823ba521c65f9fe2a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2de97f4e6db1fb8fee872de1710134c474677e17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 521999
</span>
depends_lib port:ncurses
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,12 +38,6 @@ patchfiles doc__Makefile.in.patch \
</span> # https://opensource.apple.com/source/libedit/libedit-48/src/el.c.auto.html
patchfiles-append patch-non_ascii.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fixes an issue that calling history_get_history_state() immediately after
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# read_history() results in wrong history length.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The patch is backported from the upstream fix at [1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# [1] http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/readline.c.diff?r1=1.143&r2=1.144&only_with_tag=MAIN&f=u
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-read_history-save-length.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
copy ${filespath}/getline.c ${worksrcpath}/src
}
<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 a08abb6..495c36d 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;'>@@ -4,7 +4,7 @@ diff -ur src/el.c /Users/macports/Fix/libedit-48/src/el.c
</span> @@ -123,7 +123,10 @@
* Initialize all the modules. Order is important!!!
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- el->el_flags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ el->el_flags = flags;
</span> - if (setlocale(LC_CTYPE, NULL) != NULL){
+ char *loc = setlocale(LC_CTYPE, NULL);
+ if (loc != NULL && strcmp(loc, "C") == 0)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/patch-read_history-save-length.diff b/devel/libedit/files/patch-read_history-save-length.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f901aae..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/patch-read_history-save-length.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/readline.c.orig 2017-09-17 00:10:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/readline.c 2017-09-17 00:44:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1355,8 +1355,14 @@ read_history(const char *filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_initialize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (filename == NULL && (filename = _default_history_file()) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return history(h, &ev, H_LOAD, filename) == -1 ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (errno ? errno : EINVAL) : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ errno = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (history(h, &ev, H_LOAD, filename) == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return errno ? errno : EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (history(h, &ev, H_GETSIZE) == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ history_length = ev.num;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (history_length < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 dea7f0a..1b8e27d 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,14 +1,14 @@
</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;'>-@@ -2035,7 +2035,10 @@ rl_callback_read_char(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2076,7 +2076,10 @@
</span> wbuf = NULL;
(*(void (*)(const char *))rl_linefunc)(wbuf);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- el_set(e, EL_UNBUFFERED, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* rl_linefunc might have called rl_callback_handler_remove */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (rl_linefunc != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ el_set(e, EL_UNBUFFERED, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!rl_already_prompted) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- el_set(e, EL_UNBUFFERED, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* rl_linefunc might have called rl_callback_handler_remove */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (rl_linefunc != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ el_set(e, EL_UNBUFFERED, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rl_already_prompted = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/src__Makefile.in.patch b/devel/libedit/files/src__Makefile.in.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 99f2bed..4ff271c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/src__Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libedit/files/src__Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,12 +150,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,12 +151,13 @@
</span> @HAVE_STRLCAT_FALSE@am__objects_2 = strlcat.lo
@HAVE_VIS_FALSE@am__objects_3 = vis.lo
@HAVE_UNVIS_FALSE@am__objects_4 = unvis.lo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,18 +17,18 @@
</span> hist.lo keymacro.lo map.lo chartype.lo parse.lo prompt.lo \
read.lo refresh.lo search.lo sig.lo terminal.lo tty.lo vi.lo \
wcsdup.lo tokenizer.lo tokenizern.lo history.lo historyn.lo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- filecomplete.lo readline.lo $(am__objects_1) $(am__objects_2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__objects_3) $(am__objects_4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__objects_3) $(am__objects_4) $(am__objects_6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ filecomplete.lo readline.lo literal.lo $(am__objects_1) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(am__objects_2) $(am__objects_3) $(am__objects_4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__objects_2) $(am__objects_3) $(am__objects_4) $(am__objects_6)
</span> am__objects_5 =
nodist_libedit_la_OBJECTS = $(am__objects_5)
libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,7 +362,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parse.h prompt.h read.h refresh.h search.h sig.h sys.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- terminal.h tty.h vis.h filecomplete.h editline/readline.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(am__append_1) $(am__append_2) $(am__append_3) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_4) $(am__append_5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -375,7 +377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chartype.h parse.h prompt.h read.h refresh.h search.h sig.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.h terminal.h tty.h vis.h filecomplete.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ editline/readline.h literal.h $(am__append_1) $(am__append_2) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(am__append_3) $(am__append_4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(am__append_3) $(am__append_4) $(am__append_5)
</span> EXTRA_DIST = makelist shlib_version
nobase_include_HEADERS = histedit.h editline/readline.h
nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
</pre><pre style='margin:0'>
</pre>