ports/108752: [UPDATE] devel/libedit 2.6.9 -> 2.6.10

[Martin Matuska]

>Number:         108752
>Category:       ports
>Synopsis:       [UPDATE] devel/libedit 2.6.9 -> 2.6.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 04 12:20:17 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
Update of devel/libedit from 2.6.9 to 2.6.10

Removed files/patch-history.c
Reason: already in source
http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/history.c.diff?r1=1.27&r2=1.25&sortby=date

Removed files/patch-makelist
Reason: already in source
http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/makelist.diff?r1=1.10&r2=1.11&sortby=date

Added files/patch-vi.c
Reason: 
reverts vi.c 1.27 -> 1.25
http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/vi.c.diff?r1=1.25&r2=1.27
FreeBSD's __weak_reference is not equal to NetBSD's in sys/cdefs.h, more to __weak_alias
http://fxr.watson.org/fxr/source/sys/cdefs_aout.h?v=NETBSD
http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/cdefs.h?rev=1.93&content-type=text/x-cvsweb-markup

Tested with portlint & tinderbox.

Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/libedit-2.6.10.log

>How-To-Repeat:
>Fix:
diff -Nbur libedit.orig/Makefile libedit/Makefile
--- libedit.orig/Makefile	Sun Feb  4 12:57:39 2007
+++ libedit/Makefile	Sun Feb  4 12:57:47 2007
@@ -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 -Nbur libedit.orig/distinfo libedit/distinfo
--- libedit.orig/distinfo	Sun Feb  4 12:57:39 2007
+++ libedit/distinfo	Sun Feb  4 12:57:47 2007
@@ -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 -Nbur libedit.orig/files/patch-history.c libedit/files/patch-history.c
--- libedit.orig/files/patch-history.c	Sun Feb  4 12:57:39 2007
+++ libedit/files/patch-history.c	Thu Jan  1 01:00:00 1970
@@ -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 -Nbur libedit.orig/files/patch-makelist libedit/files/patch-makelist
--- libedit.orig/files/patch-makelist	Sun Feb  4 12:57:39 2007
+++ libedit/files/patch-makelist	Thu Jan  1 01:00:00 1970
@@ -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 -Nbur libedit.orig/files/patch-vi.c libedit/files/patch-vi.c
--- libedit.orig/files/patch-vi.c	Thu Jan  1 01:00:00 1970
+++ libedit/files/patch-vi.c	Sun Feb  4 12:57:47 2007
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted: