pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/readline Update to 6.3:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f300f872de84
branches:  trunk
changeset: 631670:f300f872de84
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 12 10:04:50 2014 +0000

description:
Update to 6.3:

This is a terse description of the new features added to readline-6.3 since
the release of readline-6.2.

New Features in Readline

a.  Readline is now more responsive to SIGHUP and other fatal signals when
    reading input from the terminal or performing word completion but no
    longer attempts to run any not-allowable functions from a signal handler
    context.

b.  There are new bindable commands to search the history for the string of
    characters between the beginning of the line and the point
    (history-substring-search-forward, history-substring-search-backward)

c.  Readline allows quoted strings as the values of variables when setting
    them with `set'.  As a side effect, trailing spaces and tabs are ignored
    when setting a string variable's value.

d.  The history library creates a backup of the history file when writing it
    and restores the backup on a write error.

e.  New application-settable variable: rl_filename_stat_hook: a function called
    with a filename before using it in a call to stat(2).  Bash uses it to
    expand shell variables so things like $HOME/Downloads have a slash
    appended.

f.  New bindable function `print-last-kbd-macro', prints the most-recently-
    defined keyboard macro in a reusable format.

g.  New user-settable variable `colored-stats', enables use of colored text
    to denote file types when displaying possible completions (colored analog
    of visible-stats).

h.  New user-settable variable `keyseq-timout', acts as an inter-character
    timeout when reading input or incremental search strings.

i.  New application-callable function: rl_clear_history. Clears the history list
    and frees all readline-associated private data.

j.  New user-settable variable, show-mode-in-prompt, adds a characters to the
    beginning of the prompt indicating the current editing mode.

k.  New application-settable variable: rl_input_available_hook; function to be
    called when readline detects there is data available on its input file
    descriptor.

l.  Readline calls an application-set event hook (rl_event_hook) after it gets
    a signal while reading input (read returns -1/EINTR but readline does not
    handle the signal immediately) to allow the application to handle or
    otherwise note it.

m.  If the user-settable variable `history-size' is set to a value less than
    0, the history list size is unlimited.

n.  New application-settable variable: rl_signal_event_hook; function that is
    called when readline is reading terminal input and read(2) is interrupted
    by a signal.  Currently not called for SIGHUP or SIGTERM.

diffstat:

 devel/readline/Makefile                           |   5 +-
 devel/readline/PLIST                              |   5 +-
 devel/readline/distinfo                           |  13 +--
 devel/readline/patches/patch-ae                   |  16 ++--
 devel/readline/patches/patch-examples_Makefile.in |  22 ++++-
 devel/readline/patches/patch-vi_mode.c            |  79 -----------------------
 6 files changed, 37 insertions(+), 103 deletions(-)

diffs (252 lines):

diff -r 573f3682f525 -r f300f872de84 devel/readline/Makefile
--- a/devel/readline/Makefile   Wed Mar 12 09:59:37 2014 +0000
+++ b/devel/readline/Makefile   Wed Mar 12 10:04:50 2014 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2014/01/12 13:30:25 chopps Exp $
+# $NetBSD: Makefile,v 1.56 2014/03/12 10:04:50 wiz Exp $
 
-READLINE_VERSION=      6.2
+READLINE_VERSION=      6.3
 
 DISTNAME=       readline-${READLINE_VERSION}
-PKGREVISION=    1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=readline/}
 
diff -r 573f3682f525 -r f300f872de84 devel/readline/PLIST
--- a/devel/readline/PLIST      Wed Mar 12 09:59:37 2014 +0000
+++ b/devel/readline/PLIST      Wed Mar 12 10:04:50 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:49:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/03/12 10:04:50 wiz Exp $
 include/readline/chardefs.h
 include/readline/history.h
 include/readline/keymaps.h
@@ -14,3 +14,6 @@
 lib/libreadline.la
 man/man3/history.3
 man/man3/readline.3
+share/doc/readline/CHANGES
+share/doc/readline/INSTALL
+share/doc/readline/README
diff -r 573f3682f525 -r f300f872de84 devel/readline/distinfo
--- a/devel/readline/distinfo   Wed Mar 12 09:59:37 2014 +0000
+++ b/devel/readline/distinfo   Wed Mar 12 10:04:50 2014 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.20 2014/01/12 13:30:25 chopps Exp $
+$NetBSD: distinfo,v 1.21 2014/03/12 10:04:50 wiz Exp $
 
-SHA1 (readline-6.2.tar.gz) = a9761cd9c3da485eb354175fcc2fe35856bc43ac
-RMD160 (readline-6.2.tar.gz) = 5e7fb934e7c83cd0cd37463f7865bc257c3ea743
-Size (readline-6.2.tar.gz) = 2277926 bytes
-SHA1 (patch-ae) = 04c9ee5f4c0e32002c1a24667c308552ae2f5058
+SHA1 (readline-6.3.tar.gz) = 017b92dc7fd4e636a2b5c9265a77ccc05798c9e1
+RMD160 (readline-6.3.tar.gz) = 986262d811d9dbe1e38bc9d714853272967dca7e
+Size (readline-6.3.tar.gz) = 2468560 bytes
+SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
-SHA1 (patch-examples_Makefile.in) = eead87e4ddf005e12ab762ecb6154c9ad17b25c5
-SHA1 (patch-vi_mode.c) = 7ee6f06ec260d1d1b92ef6c963eed7f88d6f8cb1
+SHA1 (patch-examples_Makefile.in) = d8268b7de6d548f673b23eb0718394245e56ab1f
diff -r 573f3682f525 -r f300f872de84 devel/readline/patches/patch-ae
--- a/devel/readline/patches/patch-ae   Wed Mar 12 09:59:37 2014 +0000
+++ b/devel/readline/patches/patch-ae   Wed Mar 12 10:04:50 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.16 2013/07/26 13:13:12 ryoon Exp $
+$NetBSD: patch-ae,v 1.17 2014/03/12 10:04:50 wiz Exp $
 
 Pass -no-undefined to libtool for building shared library.
 
---- Makefile.in.orig   2010-10-11 15:53:52.000000000 +0000
+--- Makefile.in.orig   2014-01-27 14:52:00.000000000 +0000
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -14,7 +14,7 @@
  PACKAGE = @PACKAGE_NAME@
  VERSION = @PACKAGE_VERSION@
  
-@@ -74,6 +77,7 @@ CTAGS = ctags -tw
+@@ -78,6 +81,7 @@ CTAGS = ctags -tw
  CFLAGS = @CFLAGS@
  LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
  CPPFLAGS = @CPPFLAGS@
@@ -22,7 +22,7 @@
  
  DEFS = @DEFS@ @CROSS_COMPILE@
  LOCAL_DEFS = @LOCAL_DEFS@
-@@ -96,9 +100,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
+@@ -100,9 +104,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
        ${RM} $@
        $(CC) -c $(CCFLAGS) $<
  
@@ -38,7 +38,7 @@
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -150,6 +160,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
+@@ -160,6 +170,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
  
  all: $(TARGETS)
  
@@ -47,7 +47,7 @@
  everything: all examples
  
  static: $(STATIC_LIBS)
-@@ -159,17 +171,33 @@ libreadline.a: $(OBJECTS)
+@@ -169,17 +181,33 @@ libreadline.a: $(OBJECTS)
        $(AR) $(ARFLAGS) $@ $(OBJECTS)
        -test -n "$(RANLIB)" && $(RANLIB) $@
  
@@ -81,7 +81,7 @@
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
        $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB}
  
-@@ -254,6 +282,12 @@ install-examples: installdirs install-he
+@@ -264,6 +292,12 @@ install-examples: installdirs install-he
  uninstall-examples: maybe-uninstall-headers
        -( cd examples; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
  
@@ -92,5 +92,5 @@
 +      $(LIBTOOL) --mode=install $(INSTALL) libhistory.la $(DESTDIR)$(libdir)
 +
  install-doc:  installdirs
+       $(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir)
        -( if test -d doc ; then \
-               cd doc && \
diff -r 573f3682f525 -r f300f872de84 devel/readline/patches/patch-examples_Makefile.in
--- a/devel/readline/patches/patch-examples_Makefile.in Wed Mar 12 09:59:37 2014 +0000
+++ b/devel/readline/patches/patch-examples_Makefile.in Wed Mar 12 10:04:50 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-examples_Makefile.in,v 1.1 2014/01/12 13:30:25 chopps Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.2 2014/03/12 10:04:50 wiz Exp $
 
 Patch to link correctly against libtool built libs.
 
---- examples/Makefile.in.orig  2010-12-28 20:55:32.000000000 +0000
+--- examples/Makefile.in.orig  2013-10-03 16:57:31.000000000 +0000
 +++ examples/Makefile.in
 @@ -58,8 +58,8 @@ LDFLAGS = -g -L.. @LDFLAGS@
  
@@ -15,7 +15,7 @@
  
  TERMCAP_LIB = @TERMCAP_LIB@
  
-@@ -96,28 +96,28 @@ uninstall:
+@@ -104,37 +104,37 @@ uninstall:
        -rmdir $(DESTDIR)$(installdir)
  
  rl$(EXEEXT): rl.o $(READLINE_LIB)
@@ -38,6 +38,10 @@
 -      $(PURIFY) $(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
 +      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rltest.o $(READLINE_LIB) $(TERMCAP_LIB)
  
+ rl-callbacktest$(EXEEXT): rl-callbacktest.o $(READLINE_LIB)
+-      $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl-callbacktest.o $(READLINE_LIB) $(TERMCAP_LIB)
++      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl-callbacktest.o $(READLINE_LIB) $(TERMCAP_LIB)
+ 
  rlptytest$(EXEEXT): rlptytest.o $(READLINE_LIB)
 -      $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlptytest.o $(READLINE_LIB) $(TERMCAP_LIB)
 +      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlptytest.o $(READLINE_LIB) $(TERMCAP_LIB)
@@ -48,7 +52,15 @@
  
  histexamp$(EXEEXT): histexamp.o $(HISTORY_LIB)
 -      $(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
-+      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o $(HISTORY_LIB) $(TERMCAP_LIB)
++      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(TERMCAP_LIB)
+ 
+ hist_erasedups$(EXEEXT): hist_erasedups.o $(HISTORY_LIB)
+-      $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_erasedups.o -lhistory $(TERMCAP_LIB)
++      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_erasedups.o -lhistory $(TERMCAP_LIB)
+ 
+ hist_purgecmd$(EXEEXT): hist_purgecmd.o $(HISTORY_LIB)
+-      $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_purgecmd.o -lhistory $(TERMCAP_LIB)
++      $(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ hist_purgecmd.o -lhistory $(TERMCAP_LIB)
  
  clean mostlyclean:
-       $(RM) $(OBJECTS)
+       $(RM) $(OBJECTS) $(OTHEROBJ)
diff -r 573f3682f525 -r f300f872de84 devel/readline/patches/patch-vi_mode.c
--- a/devel/readline/patches/patch-vi_mode.c    Wed Mar 12 09:59:37 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-$NetBSD: patch-vi_mode.c,v 1.1 2014/01/12 13:30:25 chopps Exp $
-
-Pull in fix for 'cc', 'dd', commands 'yy' from readline git repository (pre-6.3
-release). Prior to this 'dd', et al. simply moved to position 0 but did not cut
-the text from the line.
-
---- vi_mode.c.orig     2010-11-21 00:51:39.000000000 +0000
-+++ vi_mode.c
-@@ -1114,7 +1114,7 @@ rl_domove_read_callback (m)
-       rl_beg_of_line (1, c);
-       _rl_vi_last_motion = c;
-       RL_UNSETSTATE (RL_STATE_VIMOTION);
--      return (0);
-+      return (vidomove_dispatch (m));
-     }
- #if defined (READLINE_CALLBACKS)
-   /* XXX - these need to handle rl_universal_argument bindings */
-@@ -1234,11 +1234,19 @@ rl_vi_delete_to (count, key)
-       _rl_vimvcxt->motion = '$';
-       r = rl_domove_motion_callback (_rl_vimvcxt);
-     }
--  else if (vi_redoing)
-+  else if (vi_redoing && _rl_vi_last_motion != 'd')   /* `dd' is special */
-     {
-       _rl_vimvcxt->motion = _rl_vi_last_motion;
-       r = rl_domove_motion_callback (_rl_vimvcxt);
-     }
-+  else if (vi_redoing)                /* handle redoing `dd' here */
-+    {
-+      _rl_vimvcxt->motion = _rl_vi_last_motion;
-+      rl_mark = rl_end;
-+      rl_beg_of_line (1, key);
-+      RL_UNSETSTATE (RL_STATE_VIMOTION);
-+      r = vidomove_dispatch (_rl_vimvcxt);
-+    }
- #if defined (READLINE_CALLBACKS)
-   else if (RL_ISSTATE (RL_STATE_CALLBACK))
-     {
-@@ -1316,11 +1324,19 @@ rl_vi_change_to (count, key)
-       _rl_vimvcxt->motion = '$';
-       r = rl_domove_motion_callback (_rl_vimvcxt);
-     }
--  else if (vi_redoing)
-+  else if (vi_redoing && _rl_vi_last_motion != 'c')   /* `cc' is special */
-     {
-       _rl_vimvcxt->motion = _rl_vi_last_motion;
-       r = rl_domove_motion_callback (_rl_vimvcxt);
-     }
-+  else if (vi_redoing)                /* handle redoing `cc' here */
-+    {
-+      _rl_vimvcxt->motion = _rl_vi_last_motion;
-+      rl_mark = rl_end;
-+      rl_beg_of_line (1, key);
-+      RL_UNSETSTATE (RL_STATE_VIMOTION);
-+      r = vidomove_dispatch (_rl_vimvcxt);
-+    }
- #if defined (READLINE_CALLBACKS)
-   else if (RL_ISSTATE (RL_STATE_CALLBACK))
-     {
-@@ -1377,6 +1393,19 @@ rl_vi_yank_to (count, key)
-       _rl_vimvcxt->motion = '$';
-       r = rl_domove_motion_callback (_rl_vimvcxt);
-     }
-+  else if (vi_redoing && _rl_vi_last_motion != 'y')   /* `yy' is special */
-+    {
-+      _rl_vimvcxt->motion = _rl_vi_last_motion;
-+      r = rl_domove_motion_callback (_rl_vimvcxt);
-+    }
-+  else if (vi_redoing)                        /* handle redoing `yy' here */
-+    {
-+      _rl_vimvcxt->motion = _rl_vi_last_motion;
-+      rl_mark = rl_end;
-+      rl_beg_of_line (1, key);
-+      RL_UNSETSTATE (RL_STATE_VIMOTION);
-+      r = vidomove_dispatch (_rl_vimvcxt);
-+    }
- #if defined (READLINE_CALLBACKS)
-   else if (RL_ISSTATE (RL_STATE_CALLBACK))
-     {



Home | Main Index | Thread Index | Old Index