<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/72e1fb7f5464b2be99443dea5bcf7c07f9191949">https://github.com/macports/macports-ports/commit/72e1fb7f5464b2be99443dea5bcf7c07f9191949</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 72e1fb7f546 libedit: Fix build with enabled getline
</span>72e1fb7f546 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 72e1fb7f5464b2be99443dea5bcf7c07f9191949
</span>Author: Vadim-Valdis Yudaev <judaew@macports.org>
AuthorDate: Wed Nov 10 01:46:00 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> libedit: Fix build with enabled getline
</span>---
devel/libedit/Portfile | 10 ++++++---
devel/libedit/files/configure.patch | 34 -----------------------------
devel/libedit/files/src__Makefile.in.patch | 35 ------------------------------
3 files changed, 7 insertions(+), 72 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 1329c9b806a..e7e9fd66cc1 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;'>@@ -7,6 +7,7 @@ PortGroup clang_dependency 1.0
</span> name libedit
epoch 20090923
version 20210910-3.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +41,7 @@ patchfiles doc__Makefile.in.patch \
</span> wcsdup.patch
# add a getline implementation for older systems
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append src__Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src__sys.h.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append src__sys.h.patch \
</span>
# see https://trac.macports.org/ticket/52866
# this patch is taken from
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +54,11 @@ patchfiles-append patch-no_escaping.diff
</span>
configure.args --disable-silent-rules --disable-examples
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# If ccache is enabled, ncurses.h is not found during configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure: error: ncurses.h, curses.h, or termcap.h is required!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ccache no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex "${name}-(\\d+-\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libedit/files/configure.patch b/devel/libedit/files/configure.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90eb537e8cc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libedit/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2016-06-18 22:35:29.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-06-30 21:15:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -640,6 +640,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRLCAT_TRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRLCPY_FALSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HAVE_STRLCPY_TRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+HAVE_GETLINE_FALSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBOBJS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENABLE_EXAMPLES_FALSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENABLE_EXAMPLES_TRUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13623,6 +13624,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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;'>-+# getline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_func_getline" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ found_getline=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ found_getline=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "x$found_getline" = xyes; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_GETLINE_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_GETLINE_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_GETLINE_TRUE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HAVE_GETLINE_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</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;'>- # vis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_func "$LINENO" "vis" "ac_cv_func_vis"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$ac_cv_func_vis" = xyes; then :
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b8d1881ea8..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2021-10-30 01:56:58.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2021-10-30 02:02:03.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,6 +94,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_GETLINE_FALSE@am__append_3 = getline.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_VIS_FALSE@am__append_4 = vis.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_UNVIS_FALSE@am__append_5 = unvis.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_GETLINE_FALSE@am__append_6 = getline.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir = src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,13 +153,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_GETLINE_FALSE@am__objects_3 = getline.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_VIS_FALSE@am__objects_4 = vis.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @HAVE_UNVIS_FALSE@am__objects_5 = unvis.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@HAVE_GETLINE_FALSE@am__objects_7 = getline.lo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_libedit_la_OBJECTS = chared.lo common.lo el.lo eln.lo emacs.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hist.lo keymacro.lo map.lo chartype.lo parse.lo prompt.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- read.lo refresh.lo search.lo sig.lo terminal.lo tty.lo vi.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wcsdup.lo tokenizer.lo tokenizern.lo history.lo historyn.lo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filecomplete.lo readline.lo literal.lo $(am__objects_1) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(am__objects_2) $(am__objects_3) $(am__objects_4) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__objects_5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__objects_5) $(am__objects_7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am__objects_6 =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_libedit_la_OBJECTS = $(am__objects_6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +384,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chartype.h parse.h prompt.h read.h refresh.h search.h sig.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.h terminal.h tty.h vis.h filecomplete.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- editline/readline.h literal.h $(am__append_1) $(am__append_2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(am__append_3) $(am__append_4) $(am__append_5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(am__append_3) $(am__append_4) $(am__append_5) $(am__append_6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_DIST = makelist shlib_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nobase_include_HEADERS = histedit.h editline/readline.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
</span></pre><pre style='margin:0'>
</pre>