5 files changed, 26 insertions, 32 deletions

diff --git a/devel/libedit/Makefile b/devel/libedit/Makefile
index fd18de73fc12..0a4684fcd44d 100644
--- a/devel/libedit/Makefile
+++ b/devel/libedit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libedit
-PORTVERSION=	2.6.9
-PORTREVISION=	2
+PORTVERSION=	2.6.10
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.astron.com/pub/libedit/ \
 		http://www.canonware.com/download/libedit/
diff --git a/devel/libedit/distinfo b/devel/libedit/distinfo
index 9719f809ba53..33d5d1f0fc8b 100644
--- a/devel/libedit/distinfo
+++ b/devel/libedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (libedit-2.6.9.tar.gz) = a007a8134d9daf4340c985085441ca6d
-SHA256 (libedit-2.6.9.tar.gz) = 140cc16da71d4dfec200625cb960ec2341a04016f81c935cba1d5012fd1651c6
-SIZE (libedit-2.6.9.tar.gz) = 156318
+MD5 (libedit-2.6.10.tar.gz) = b7b332b2db3ea11c1c457d610aa0bbeb
+SHA256 (libedit-2.6.10.tar.gz) = 57507d1329158979e31807065e026ebc93f65600e18ed41fb355a1142d2a649b
+SIZE (libedit-2.6.10.tar.gz) = 182917
diff --git a/devel/libedit/files/patch-history.c b/devel/libedit/files/patch-history.c
deleted file mode 100644
index a035eec96202..000000000000
--- a/devel/libedit/files/patch-history.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- history.c.orig	Tue Nov 23 01:41:41 2004
-+++ history.c	Tue Nov 23 01:43:09 2004
-@@ -728,10 +728,10 @@
- 	for (i = 0, retval = HLAST(h, &ev);
- 	    retval != -1;
- 	    retval = HPREV(h, &ev), i++) {
--		len = strlen(ev.str) * 4;
--		if (len >= max_size) {
-+		len = strlen(ev.str) * 4 + 1;
-+		if (len > max_size) {
- 			char *nptr;
--			max_size = (len + 1023) & 1023;
-+			max_size = (len + 1023) & ~1023;
- 			nptr = h_realloc(ptr, max_size);
- 			if (nptr == NULL) {
- 				i = -1;
diff --git a/devel/libedit/files/patch-makelist b/devel/libedit/files/patch-makelist
deleted file mode 100644
index da82137a8109..000000000000
--- a/devel/libedit/files/patch-makelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- makelist.orig	Tue Sep 13 00:37:41 2005
-+++ makelist	Tue Sep 13 00:38:08 2005
-@@ -145,7 +145,7 @@
- #
- -fh)
-     cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
--    sort | tr '[a-z]' '[A-Z]' | $AWK '
-+    sort | tr '[:lower:]' '[:upper:]' | $AWK '
- 	BEGIN {
- 	    printf("/* Automatically generated file, do not edit */\n");
- 	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
diff --git a/devel/libedit/files/patch-vi.c b/devel/libedit/files/patch-vi.c
new file mode 100644
index 000000000000..b6dbc2adfe3e
--- /dev/null
+++ b/devel/libedit/files/patch-vi.c
@@ -0,0 +1,22 @@
+--- vi.c.orig	Sun Feb  4 11:49:12 2007
++++ vi.c	Sun Feb  4 11:51:31 2007
+@@ -915,16 +915,15 @@
+  * NB: posix implies that we should enter insert mode, however
+  * this is against historical precedent...
+  */
+-#ifdef __weak_reference
+-extern char *get_alias_text(const char *) __weak_reference(get_alias_text);
+-#endif
+ protected el_action_t
+ /*ARGSUSED*/
+ vi_alias(EditLine *el, int c)
+ {
+-#ifdef __weak_reference
++#ifdef __weak_extern
+ 	char alias_name[3];
+ 	char *alias_text;
++	extern char *get_alias_text(const char *);
++	__weak_extern(get_alias_text);
+ 
+ 	if (get_alias_text == 0) {
+ 		return CC_ERROR;