summaryrefslogtreecommitdiff
path: root/devel/libedit
diff options
context:
space:
mode:
Diffstat (limited to 'devel/libedit')
-rw-r--r--devel/libedit/Makefile5
-rw-r--r--devel/libedit/distinfo5
-rw-r--r--devel/libedit/files/patch-netbsd-pr-5086353
-rw-r--r--devel/libedit/files/patch-src__chartype.h11
-rw-r--r--devel/libedit/files/patch-src_eln.c21
-rw-r--r--devel/libedit/pkg-plist37
6 files changed, 35 insertions, 97 deletions
diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile
index ceab866e517a..cdac55a4c12a 100644
--- a/devel/libedit/Makefile
+++ b/devel/libedit/Makefile
@@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE
USES= libtool ncurses pathfix
EDITVERSION= 3.1
-EDITDATE= 20150325
+EDITDATE= 20170329
WRKSRC= ${WRKDIR}/${PORTNAME}-${EDITDATE}-${EDITVERSION}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@@ -26,4 +26,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFLICTS_INSTALL= editline-*
+post-install:
+ ${MV} ${STAGEDIR}${PREFIX}/man/man3/history.3 ${STAGEDIR}${PREFIX}/man/man3/el_history.3
+
.include <bsd.port.mk>
diff --git a/devel/libedit/distinfo b/devel/libedit/distinfo
index bc19d6fa8149..da3a4854fd76 100644
--- a/devel/libedit/distinfo
+++ b/devel/libedit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libedit-20150325-3.1.tar.gz) = c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5
-SIZE (libedit-20150325-3.1.tar.gz) = 502792
+TIMESTAMP = 1490994397
+SHA256 (libedit-20170329-3.1.tar.gz) = 91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be
+SIZE (libedit-20170329-3.1.tar.gz) = 508504
diff --git a/devel/libedit/files/patch-netbsd-pr-50863 b/devel/libedit/files/patch-netbsd-pr-50863
deleted file mode 100644
index 72383f9c2b12..000000000000
--- a/devel/libedit/files/patch-netbsd-pr-50863
+++ /dev/null
@@ -1,53 +0,0 @@
-http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=50863
-
---- src/tty.c.orig 2014-06-18 19:07:45 UTC
-+++ src/tty.c
-@@ -499,6 +499,9 @@ tty_setup(EditLine *el)
- if (el->el_flags & EDIT_DISABLED)
- return 0;
-
-+ if (el->el_tty.t_initialized)
-+ return -1;
-+
- if (!isatty(el->el_outfd)) {
- #ifdef DEBUG_TTY
- (void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__,
-@@ -558,6 +561,7 @@ tty_setup(EditLine *el)
-
- tty__setchar(&el->el_tty.t_ed, el->el_tty.t_c[ED_IO]);
- tty_bind_char(el, 1);
-+ el->el_tty.t_initialized = 1;
- return 0;
- }
-
-@@ -567,6 +571,7 @@ tty_init(EditLine *el)
-
- el->el_tty.t_mode = EX_IO;
- el->el_tty.t_vdisable = _POSIX_VDISABLE;
-+ el->el_tty.t_initialized = 0;
- (void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
- (void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
- return tty_setup(el);
-@@ -580,6 +585,9 @@ protected void
- /*ARGSUSED*/
- tty_end(EditLine *el)
- {
-+ if (!el->el_tty.t_initialized)
-+ return;
-+
- if (tty_setty(el, TCSAFLUSH, &el->el_tty.t_or) == -1) {
- #ifdef DEBUG_TTY
- (void) fprintf(el->el_errfile,
---- src/tty.h.orig 2014-06-18 16:05:56 UTC
-+++ src/tty.h
-@@ -474,8 +474,9 @@ typedef struct {
- int t_tabs;
- int t_eight;
- speed_t t_speed;
-- int t_mode;
-+ unsigned char t_mode;
- unsigned char t_vdisable;
-+ unsigned char t_initialized;
- } el_tty_t;
-
-
diff --git a/devel/libedit/files/patch-src__chartype.h b/devel/libedit/files/patch-src__chartype.h
deleted file mode 100644
index bfc24ed65fab..000000000000
--- a/devel/libedit/files/patch-src__chartype.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/chartype.h.orig 2015-03-25 21:02:28.000000000 +0100
-+++ src/chartype.h 2015-03-28 11:37:42.072100000 +0100
-@@ -44,7 +44,7 @@
- * supports non-BMP code points without requiring UTF-16, but nothing
- * seems to actually advertise this properly, despite Unicode 3.1 having
- * been around since 2001... */
--#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
- * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/devel/libedit/files/patch-src_eln.c b/devel/libedit/files/patch-src_eln.c
deleted file mode 100644
index 3021c89d94a7..000000000000
--- a/devel/libedit/files/patch-src_eln.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/eln.c.orig 2015-03-25 21:02:28.000000000 +0100
-+++ src/eln.c 2015-03-28 11:42:29.913925000 +0100
-@@ -75,12 +75,17 @@ public const char *
- el_gets(EditLine *el, int *nread)
- {
- const wchar_t *tmp;
-+ int nwread;
-+
-+ *nread = 0;
-
- if (!(el->el_flags & CHARSET_IS_UTF8))
- el->el_flags |= IGNORE_EXTCHARS;
-- tmp = el_wgets(el, nread);
-+ tmp = el_wgets(el, &nwread);
- if (!(el->el_flags & CHARSET_IS_UTF8))
- el->el_flags &= ~IGNORE_EXTCHARS;
-+ for (int i = 0; i < nwread; i++)
-+ *nread += ct_enc_width(tmp[i]);
- return ct_encode_string(tmp, &el->el_lgcyconv);
- }
-
diff --git a/devel/libedit/pkg-plist b/devel/libedit/pkg-plist
index 864459d6231c..294fa25a8e25 100644
--- a/devel/libedit/pkg-plist
+++ b/devel/libedit/pkg-plist
@@ -3,7 +3,7 @@ include/histedit.h
lib/libedit.a
lib/libedit.so
lib/libedit.so.0
-lib/libedit.so.0.0.53
+lib/libedit.so.0.0.56
libdata/pkgconfig/libedit.pc
man/man3/editline.3.gz
man/man3/el_deletestr.3.gz
@@ -11,10 +11,8 @@ man/man3/el_end.3.gz
man/man3/el_get.3.gz
man/man3/el_getc.3.gz
man/man3/el_gets.3.gz
-man/man3/el_history.3.gz
-man/man3/el_history_end.3.gz
-man/man3/el_history_init.3.gz
man/man3/el_init.3.gz
+man/man3/el_init_fd.3.gz
man/man3/el_insertstr.3.gz
man/man3/el_line.3.gz
man/man3/el_parse.3.gz
@@ -23,9 +21,30 @@ man/man3/el_reset.3.gz
man/man3/el_resize.3.gz
man/man3/el_set.3.gz
man/man3/el_source.3.gz
-man/man3/el_tok_end.3.gz
-man/man3/el_tok_init.3.gz
-man/man3/el_tok_line.3.gz
-man/man3/el_tok_reset.3.gz
-man/man3/el_tok_str.3.gz
+man/man3/el_wdeletestr.3.gz
+man/man3/el_wget.3.gz
+man/man3/el_wgetc.3.gz
+man/man3/el_wgets.3.gz
+man/man3/el_winsertstr.3.gz
+man/man3/el_wline.3.gz
+man/man3/el_wparse.3.gz
+man/man3/el_wpush.3.gz
+man/man3/el_wset.3.gz
+man/man3/el_history.3.gz
+man/man3/history_end.3.gz
+man/man3/history_init.3.gz
+man/man3/history_w.3.gz
+man/man3/history_wend.3.gz
+man/man3/history_winit.3.gz
+man/man3/tok_end.3.gz
+man/man3/tok_init.3.gz
+man/man3/tok_line.3.gz
+man/man3/tok_reset.3.gz
+man/man3/tok_str.3.gz
+man/man3/tok_wend.3.gz
+man/man3/tok_winit.3.gz
+man/man3/tok_wline.3.gz
+man/man3/tok_wreset.3.gz
+man/man3/tok_wstr.3.gz
man/man5/editrc.5.gz
+man/man7/editline.7.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 06:59:48 +0000