Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_147427587014790"
MIME-Version: 1.0
Date: Mon, 19 Sep 2016 09:04:30 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/readline
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20160919090430.2A64AFBD1@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_147427587014790
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Sep 19 09:04:30 UTC 2016

Modified Files:
	pkgsrc/devel/readline: Makefile distinfo
	pkgsrc/devel/readline/patches: patch-colors.c
	    patch-examples_Makefile.in
Removed Files:
	pkgsrc/devel/readline/patches: patch-display.c patch-patchlevel
	    patch-posixjmp.h patch-readline.c patch-util.c

Log Message:
Updated readline to 7.0.

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

New Features in Readline

a.  The history truncation code now uses the same error recovery mechansim as
    the history writing code, and restores the old version of the history file
    on error.  The error recovery mechanism handles symlinked history files.

b.  There is a new bindable variable, `enable-bracketed-paste', which enables
    support for a terminal's bracketed paste mode.

c.  The editing mode indicators can now be strings and are user-settable
    (new `emacs-mode-string', `vi-cmd-mode-string' and `vi-ins-mode-string'
    variables).  Mode strings can contain invisible character sequences.
    Setting mode strings to null strings restores the defaults.

d.  Prompt expansion adds the mode string to the last line of a multi-line
    prompt (one with embedded newlines).

e.  There is a new bindable variable, `colored-completion-prefix', which, if
    set, causes the common prefix of a set of possible completions to be
    displayed in color.

f.  There is a new bindable command `vi-yank-pop', a vi-mode version of emacs-
    mode yank-pop.

g.  The redisplay code underwent several efficiency improvements for multibyte
    locales.

h.  The insert-char function attempts to batch-insert all pending typeahead
    that maps to self-insert, as long as it is coming from the terminal.

i.  rl_callback_sigcleanup: a new application function that can clean up and
    unset any state set by readline's callback mode.  Intended to be used
    after a signal.

j.  If an incremental search string has its last character removed with DEL, the
    resulting empty search string no longer matches the previous line.

k.  If readline reads a history file that begins with `#' (or the value of
    the history comment character) and has enabled history timestamps, the history
    entries are assumed to be delimited by timestamps.  This allows multi-line
    history entries.

l.  Readline now throws an error if it parses a key binding without a terminating
    `:' or whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/devel/readline/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/readline/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/readline/patches/patch-colors.c
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/readline/patches/patch-display.c \
    pkgsrc/devel/readline/patches/patch-patchlevel \
    pkgsrc/devel/readline/patches/patch-posixjmp.h \
    pkgsrc/devel/readline/patches/patch-readline.c \
    pkgsrc/devel/readline/patches/patch-util.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/readline/patches/patch-examples_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_147427587014790
Content-Disposition: inline
Content-Length: 7351
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/readline/Makefile
diff -u pkgsrc/devel/readline/Makefile:1.62 pkgsrc/devel/readline/Makefile:1.63
--- pkgsrc/devel/readline/Makefile:1.62	Thu Feb 25 12:12:49 2016
+++ pkgsrc/devel/readline/Makefile	Mon Sep 19 09:04:29 2016
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2016/02/25 12:12:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.63 2016/09/19 09:04:29 wiz Exp $
 
-READLINE_VERSION=	6.3
+READLINE_VERSION=	7.0
 
 DISTNAME=       readline-${READLINE_VERSION}
-PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 

Index: pkgsrc/devel/readline/distinfo
diff -u pkgsrc/devel/readline/distinfo:1.26 pkgsrc/devel/readline/distinfo:1.27
--- pkgsrc/devel/readline/distinfo:1.26	Tue Nov  3 03:29:19 2015
+++ pkgsrc/devel/readline/distinfo	Mon Sep 19 09:04:29 2016
@@ -1,16 +1,11 @@
-$NetBSD: distinfo,v 1.26 2015/11/03 03:29:19 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/09/19 09:04:29 wiz Exp $
 
-SHA1 (readline-6.3.tar.gz) = 017b92dc7fd4e636a2b5c9265a77ccc05798c9e1
-RMD160 (readline-6.3.tar.gz) = 986262d811d9dbe1e38bc9d714853272967dca7e
-SHA512 (readline-6.3.tar.gz) = f70efaf46d570b85c7637172b0ee2eb9a4aa73ba38a62bb45075e665929d9701b96fba0aea6c767fd9a2a0d39dfe8e70ab06da08f8524aee76a7c502f370a401
-Size (readline-6.3.tar.gz) = 2468560 bytes
+SHA1 (readline-7.0.tar.gz) = d9095fa14a812495052357e1d678b3f2ac635463
+RMD160 (readline-7.0.tar.gz) = 745bfdddd989fe46c55eea1b41cae7848c3bf2e0
+SHA512 (readline-7.0.tar.gz) = 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
+Size (readline-7.0.tar.gz) = 2910016 bytes
 SHA1 (patch-ae) = 98ef48c55111de4a9cc9b19fb44b7d139f6de40f
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
-SHA1 (patch-colors.c) = 42ffd2766a808a670a445a8ac34740cf4bdf02d5
-SHA1 (patch-display.c) = 8dc455e5cb3ad4208834518f55f93d1d60f52087
-SHA1 (patch-examples_Makefile.in) = d8268b7de6d548f673b23eb0718394245e56ab1f
-SHA1 (patch-patchlevel) = 04d5af0e90455d7dcbc1917c07b30656afc725a5
-SHA1 (patch-posixjmp.h) = e2be68635c49a85d03417904338ce6376d8a9a99
-SHA1 (patch-readline.c) = ad9aef8a3e9a199d2b9a1a32fc3f715784136c89
-SHA1 (patch-util.c) = b7c22aa43cbd1d0225099e2ee1d4d1772d402b5f
+SHA1 (patch-colors.c) = beb4cdb33e1b361804a7d8d3b36dbd137e7502fd
+SHA1 (patch-examples_Makefile.in) = f9fce95533ee578c5323d3dbf5eb95fa344dd4ef

Index: pkgsrc/devel/readline/patches/patch-colors.c
diff -u pkgsrc/devel/readline/patches/patch-colors.c:1.1 pkgsrc/devel/readline/patches/patch-colors.c:1.2
--- pkgsrc/devel/readline/patches/patch-colors.c:1.1	Fri Jul 18 13:02:06 2014
+++ pkgsrc/devel/readline/patches/patch-colors.c	Mon Sep 19 09:04:29 2016
@@ -1,9 +1,9 @@
-$NetBSD: patch-colors.c,v 1.1 2014/07/18 13:02:06 ryoon Exp $
+$NetBSD: patch-colors.c,v 1.2 2016/09/19 09:04:29 wiz Exp $
 
---- colors.c.orig	2013-03-20 15:19:08.000000000 +0000
+--- colors.c.orig	2016-01-25 15:38:00.000000000 +0000
 +++ colors.c
-@@ -187,8 +187,10 @@ _rl_print_color_indicator (char *f)
-                 ? C_ORPHAN : C_LINK);
+@@ -215,8 +215,10 @@ _rl_print_color_indicator (const char *f
+         colored_filetype = C_LINK;
        else if (S_ISFIFO (mode))
          colored_filetype = C_FIFO;
 +#if defined(S_ISSOCK)

Index: pkgsrc/devel/readline/patches/patch-examples_Makefile.in
diff -u pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.2 pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.3
--- pkgsrc/devel/readline/patches/patch-examples_Makefile.in:1.2	Wed Mar 12 10:04:50 2014
+++ pkgsrc/devel/readline/patches/patch-examples_Makefile.in	Mon Sep 19 09:04:29 2016
@@ -1,12 +1,21 @@
-$NetBSD: patch-examples_Makefile.in,v 1.2 2014/03/12 10:04:50 wiz Exp $
+$NetBSD: patch-examples_Makefile.in,v 1.3 2016/09/19 09:04:29 wiz Exp $
 
 Patch to link correctly against libtool built libs.
 
---- examples/Makefile.in.orig	2013-10-03 16:57:31.000000000 +0000
+--- examples/Makefile.in.orig	2016-04-26 13:50:18.000000000 +0000
 +++ examples/Makefile.in
-@@ -58,8 +58,8 @@ LDFLAGS = -g -L.. @LDFLAGS@
+@@ -46,7 +46,7 @@ OBJEXT = @OBJEXT@
+ DESTDIR =
  
- PURIFY = @PURIFY@
+ DEFS = @DEFS@
+-CC = @CC@
++CC = $(LIBTOOL) --mode=link @CC@
+ CFLAGS = @CFLAGS@
+ LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DREADLINE_LIBRARY -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
+ CPPFLAGS = @CPPFLAGS@
+@@ -56,8 +56,8 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir) -
+ CCFLAGS  = $(DEFS) $(LOCAL_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LDFLAGS = -g -L.. @LDFLAGS@
  
 -READLINE_LIB = ../libreadline.a
 -HISTORY_LIB = ../libhistory.a
@@ -15,52 +24,3 @@ Patch to link correctly against libtool 
  
  TERMCAP_LIB = @TERMCAP_LIB@
  
-@@ -104,37 +104,37 @@ uninstall:
- 	-rmdir $(DESTDIR)$(installdir)
- 
- rl$(EXEEXT): rl.o $(READLINE_LIB)
--	$(PURIFY) $(CC) $(LDFLAGS) -o $@ rl.o $(READLINE_LIB) $(TERMCAP_LIB)
-+	$(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rl.o $(READLINE_LIB) $(TERMCAP_LIB)
- 
- rlcat$(EXEEXT): rlcat.o $(READLINE_LIB)
--	$(PURIFY) $(CC) $(LDFLAGS) -o $@ rlcat.o $(READLINE_LIB) $(TERMCAP_LIB)
-+	$(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlcat.o $(READLINE_LIB) $(TERMCAP_LIB)
- 
- rlevent$(EXEEXT): rlevent.o $(READLINE_LIB)
--	$(PURIFY) $(CC) $(LDFLAGS) -o $@ rlevent.o $(READLINE_LIB) $(TERMCAP_LIB)
-+	$(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ rlevent.o $(READLINE_LIB) $(TERMCAP_LIB)
- 
- fileman$(EXEEXT): fileman.o $(READLINE_LIB)
--	$(PURIFY) $(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
-+	$(LIBTOOL) --mode=link $(PURIFY) $(CC) $(LDFLAGS) -o $@ fileman.o $(READLINE_LIB) $(TERMCAP_LIB)
- 
- rltest$(EXEEXT): rltest.o $(READLINE_LIB)
--	$(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)
- 
- rlversion$(EXEEXT): rlversion.o $(READLINE_LIB)
--	$(CC) $(LDFLAGS) -o $@ rlversion.o $(READLINE_LIB) $(TERMCAP_LIB)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ rlversion.o $(READLINE_LIB) $(TERMCAP_LIB)
- 
- histexamp$(EXEEXT): histexamp.o $(HISTORY_LIB)
--	$(PURIFY) $(CC) $(LDFLAGS) -o $@ histexamp.o -lhistory $(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) $(OTHEROBJ)


--_----------=_147427587014790--