Date: Wed, 15 Feb 2006 00:00:12 GMT From: "Pedro F. Giffuni" <giffunip@asme.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/93367: devel/libedit needs an update (almost complete patch) Message-ID: <200602150000.k1F00C3x009887@www.freebsd.org> Resent-Message-ID: <200602150010.k1F0A8LJ070878@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93367
>Category: ports
>Synopsis: devel/libedit needs an update (almost complete patch)
>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: Wed Feb 15 00:10:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Pedro F. Giffuni
>Release: 6.0-Release (amd64)
>Organization:
>Environment:
etoile.cable.net.co 6.0-RELEASE FreeBSD 6.0-RELEASE #12: Sat Feb 11 13:45:47 COT 2006 root@etoile.cable.net.co:/usr/src/sys/amd64/compile/DIMENSION amd64
>Description:
libedit has received many updates on NetBSD's tree, in fact it seems like it now a complete replacement of it's GNU counterpart. the cad/ngspice port can not use GNU Readline because of license restrictions so it has the option of using an updated version of libedit.
>How-To-Repeat:
This update seems complete, EXCEPT for the fact that I haven't been able to cleanly change the version number of the resulting library.
>Fix:
patch follows:
diff -ruN libedit.orig/Makefile libedit/Makefile
--- libedit.orig/Makefile Tue Feb 7 21:36:11 2006
+++ libedit/Makefile Tue Feb 14 18:58:04 2006
@@ -6,43 +6,43 @@
#
PORTNAME= libedit
-PORTVERSION= 2.6.9
-PORTREVISION= 2
+DISTVERSION= ${P_VERSION}-${P_DATE}
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.astron.com/pub/libedit/ \
- http://www.canonware.com/download/libedit/
+MASTER_SITES= http://www.thrysoee.dk/editline/
+DISTNAME= ${PORTNAME}-${P_DATE}-${P_VERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Command line editing library
+COMMENT= Command line editing library from NetBSD
-USE_REINPLACE= yes
+P_VERSION= 2.9
+P_DATE= 20060213
+
+USE_AUTOTOOLS= libtool:15
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --disable-readline
MAN3= editline.3
MAN5= editrc.5
-MLINKS= editline.3 el_init.3 \
- editline.3 el_end.3 \
- editline.3 el_reset.3 \
- editline.3 el_gets.3 \
- editline.3 el_getc.3 \
- editline.3 el_push.3 \
- editline.3 el_parse.3 \
- editline.3 el_set.3 \
- editline.3 el_get.3 \
- editline.3 el_source.3 \
- editline.3 el_resize.3 \
- editline.3 el_line.3 \
- editline.3 el_insertstr.3 \
- editline.3 el_deletestr.3 \
- editline.3 history_init.3 \
- editline.3 history_end.3 \
- editline.3 history.3
-MANCOMPRESSED= no
-
-post-patch:
- @${REINPLACE_CMD} -e 's|CFLAGS -O|CFLAGS|g ; \
- s|MAJOR="2"|MAJOR="6"|g' ${WRKSRC}/configure
+MLINKS= editline.3 el_init.3 \
+ editline.3 el_end.3 \
+ editline.3 el_reset.3 \
+ editline.3 el_gets.3 \
+ editline.3 el_getc.3 \
+ editline.3 el_push.3 \
+ editline.3 el_parse.3 \
+ editline.3 el_set.3 \
+ editline.3 el_get.3 \
+ editline.3 el_source.3 \
+ editline.3 el_resize.3 \
+ editline.3 el_line.3 \
+ editline.3 el_insertstr.3 \
+ editline.3 el_deletestr.3 \
+ editline.3 history_init.3 \
+ editline.3 history_end.3 \
+ editline.3 el_tok_init.3 \
+ editline.3 el_tok_end.3 \
+ editline.3 el_tok_reset.3 \
+ editline.3 el_tok_line.3 \
+ editline.3 el_tok_str.3
.include <bsd.port.mk>
diff -ruN libedit.orig/distinfo libedit/distinfo
--- libedit.orig/distinfo Tue Feb 7 21:36:11 2006
+++ libedit/distinfo Tue Feb 14 18:54:08 2006
@@ -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-20060213-2.9.tar.gz) = adda2335413c044ae89af8b0a4bd3b69
+SHA256 (libedit-20060213-2.9.tar.gz) = cf68b17aa5bb695537e1abdab4f0a6e22f5cfc087deaaa4e07559ff9b5b3237d
+SIZE (libedit-20060213-2.9.tar.gz) = 446610
diff -ruN libedit.orig/files/patch-history.c libedit/files/patch-history.c
--- libedit.orig/files/patch-history.c Tue Feb 7 21:36:11 2006
+++ libedit/files/patch-history.c Wed Dec 31 19:00:00 1969
@@ -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 -ruN libedit.orig/files/patch-makelist libedit/files/patch-makelist
--- libedit.orig/files/patch-makelist Tue Feb 7 21:36:11 2006
+++ libedit/files/patch-makelist Wed Dec 31 19:00:00 1969
@@ -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 -ruN libedit.orig/pkg-descr libedit/pkg-descr
--- libedit.orig/pkg-descr Tue Feb 7 21:36:11 2006
+++ libedit/pkg-descr Tue Feb 7 21:56:12 2006
@@ -1,3 +1,10 @@
+This is an autotool- and libtoolized port of the NetBSD Editline library
+(libedit). This Berkeley-style licensed command line editor library
+provides generic line editing, history, and tokenization functions,
+similar to those found in GNU Readline.
+
libedit provides command line editing functionality. Both emacs and vi key
bindings are supported. Note that the base system also includes libedit, but
this port is generally more current.
+
+WWW: http://www.thrysoee.dk/editline/
diff -ruN libedit.orig/pkg-plist libedit/pkg-plist
--- libedit.orig/pkg-plist Tue Feb 7 21:36:11 2006
+++ libedit/pkg-plist Tue Feb 7 22:29:52 2006
@@ -1,4 +1,7 @@
+include/editline/readline.h
include/histedit.h
lib/libedit.a
-lib/libedit.so.6
+lib/libedit.la
lib/libedit.so
+lib/libedit.so.0
+@dirrm include/editline
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602150000.k1F00C3x009887>