<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[149803] trunk/dports/devel/libedit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/149803">149803</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2016-06-30 02:02:15 -0700 (Thu, 30 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>libedit: add a getline implementation for older systems</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibeditPortfile">trunk/dports/devel/libedit/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibeditfilesconfigurepatch">trunk/dports/devel/libedit/files/configure.patch</a></li>
<li><a href="#trunkdportsdevellibeditfilesgetlinec">trunk/dports/devel/libedit/files/getline.c</a></li>
<li><a href="#trunkdportsdevellibeditfilessrc__Makefileinpatch">trunk/dports/devel/libedit/files/src__Makefile.in.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibeditPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libedit/Portfile (149802 => 149803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libedit/Portfile 2016-06-30 07:33:46 UTC (rev 149802)
+++ trunk/dports/devel/libedit/Portfile 2016-06-30 09:02:15 UTC (rev 149803)
</span><span class="lines">@@ -25,8 +25,15 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:ncurses
</span><span class="cx">
</span><del>-patchfiles doc__Makefile.in.patch src__sys.h.patch
</del><ins>+patchfiles doc__Makefile.in.patch \
+ src__Makefile.in.patch \
+ src__sys.h.patch \
+ configure.patch
</ins><span class="cx">
</span><ins>+post-patch {
+ copy ${filespath}/getline.c ${worksrcpath}/src
+}
+
</ins><span class="cx"> configure.args --disable-silent-rules --disable-examples
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsdevellibeditfilesconfigurepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libedit/files/configure.patch (0 => 149803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libedit/files/configure.patch (rev 0)
+++ trunk/dports/devel/libedit/files/configure.patch 2016-06-30 09:02:15 UTC (rev 149803)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+--- configure.orig 2016-06-18 22:35:29.000000000 +1000
++++ configure 2016-06-30 18:41:02.000000000 +1000
+@@ -13623,6 +13623,23 @@
+ fi
+
+
++# getline
++ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
++if test "x$ac_cv_func_getline" = xyes; then :
++ found_getline=yes
++else
++ found_getline=no
++fi
++
++ if test "x$found_getline" = xyes; then
++ HAVE_GETLINE_TRUE=
++ HAVE_GETLINE_FALSE='#'
++else
++ HAVE_GETLINE_TRUE='#'
++ HAVE_GETLINE_FALSE=
++fi
++
++
+ # vis
+ ac_fn_c_check_func "$LINENO" "vis" "ac_cv_func_vis"
+ if test "x$ac_cv_func_vis" = xyes; then :
</ins></span></pre></div>
<a id="trunkdportsdevellibeditfilesgetlinec"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libedit/files/getline.c (0 => 149803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libedit/files/getline.c (rev 0)
+++ trunk/dports/devel/libedit/files/getline.c 2016-06-30 09:02:15 UTC (rev 149803)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/* CC0, from https://github.com/digilus/getline */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#define GETLINE_MINSIZE 16
+ssize_t getline(char **lineptr, size_t *n, FILE *fp) {
+ int ch;
+ int i = 0;
+ char free_on_err = 0;
+ char *p;
+
+ errno = 0;
+ if (lineptr == NULL || n == NULL || fp == NULL) {
+ errno = EINVAL;
+ return -1;
+ }
+ if (*lineptr == NULL) {
+ *n = GETLINE_MINSIZE;
+ *lineptr = (char *)malloc( sizeof(char) * (*n));
+ if (*lineptr == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+ free_on_err = 1;
+ }
+
+ for (i=0; ; i++) {
+ ch = fgetc(stream);
+ while (i >= (*n) - 2) {
+ *n *= 2;
+ p = realloc(*lineptr, sizeof(char) * (*n));
+ if (p == NULL) {
+ if (free_on_err)
+ free(*lineptr);
+ errno = ENOMEM;
+ return -1;
+ }
+ *lineptr = p;
+ }
+ if (ch == EOF) {
+ if (i == 0) {
+ if (free_on_err)
+ free(*lineptr);
+ return -1;
+ }
+ (*lineptr)[i] = '\0';
+ *n = i;
+ return i;
+ }
+
+ if (ch == '\n') {
+ (*lineptr)[i] = '\n';
+ (*lineptr)[i+1] = '\0';
+ *n = i+1;
+ return i+1;
+ }
+ (*lineptr)[i] = (char)ch;
+ }
+}
</ins></span></pre></div>
<a id="trunkdportsdevellibeditfilessrc__Makefileinpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libedit/files/src__Makefile.in.patch (0 => 149803)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libedit/files/src__Makefile.in.patch (rev 0)
+++ trunk/dports/devel/libedit/files/src__Makefile.in.patch 2016-06-30 09:02:15 UTC (rev 149803)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+--- src/Makefile.in.orig 2016-06-18 22:35:31.000000000 +1000
++++ src/Makefile.in 2016-06-30 18:37:25.000000000 +1000
+@@ -93,6 +93,7 @@
+ @HAVE_STRLCAT_FALSE@am__append_2 = strlcat.c
+ @HAVE_VIS_FALSE@am__append_3 = vis.c
+ @HAVE_UNVIS_FALSE@am__append_4 = unvis.c
++@HAVE_GETLINE_FALSE@am__append_5 = getline.c
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+@@ -149,12 +150,13 @@
+ @HAVE_STRLCAT_FALSE@am__objects_2 = strlcat.lo
+ @HAVE_VIS_FALSE@am__objects_3 = vis.lo
+ @HAVE_UNVIS_FALSE@am__objects_4 = unvis.lo
++@HAVE_GETLINE_FALSE@am__objects_6 = getline.lo
+ am_libedit_la_OBJECTS = chared.lo common.lo el.lo eln.lo emacs.lo \
+ 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 \
+ filecomplete.lo readline.lo $(am__objects_1) $(am__objects_2) \
+- $(am__objects_3) $(am__objects_4)
++ $(am__objects_3) $(am__objects_4) $(am__objects_6)
+ am__objects_5 =
+ nodist_libedit_la_OBJECTS = $(am__objects_5)
+ libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
+@@ -360,7 +362,7 @@
+ parse.h prompt.h read.h refresh.h search.h sig.h sys.h \
+ terminal.h tty.h vis.h filecomplete.h editline/readline.h \
+ $(am__append_1) $(am__append_2) $(am__append_3) \
+- $(am__append_4)
++ $(am__append_4) $(am__append_5)
+ EXTRA_DIST = makelist shlib_version
+ nobase_include_HEADERS = histedit.h editline/readline.h
+ nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
</ins></span></pre>
</div>
</div>
</body>
</html>