Changes 6.2:

a. Fixed a bug that caused the unconverted filename to be added to the list of
   completions when the application specified filename conversion functions.
b. Fixed a bug that caused the wrong filename to be passed to opendir when the
   application has specified a filename dequoting function.
c. Fixed a bug when repeating a character search in vi mode in the case where
   there was no search to repeat.
d. When show-all-if-ambiguous is set, the completion routines no longer insert
   a common match prefix that is shorter than the text being completed.
e. The full set of vi editing commands may now be used in callback mode.
   dimensions while running in `no-echo' mode.
h. Fixed a bug that caused readline to dump core if an application called
   rl_prep_terminal without setting rl_instream.
i. Fixed a bug that caused meta-prefixed characters bound to incremental
   search forward or backward to not be recognized if they were typed
   subsequently.
j. The incremental search code treats key sequences that map to the same
   functions as (default) ^G, ^W, and ^Y as equivalent to those characters.
k. Fixed a bug in menu-complete that caused it to misbehave with large
   negative argument.
l. Fixed a bug that caused vi-mode yank-last-arg to ring the bell when invoked
   at the end of the line.
m. Fixed a bug that made an explicit argument of 0 to yank-last-arg behave
   as if it were a negative argument.
n. Fixed a bug that caused directory names in words to be completed to not
   be dequoted correctly.

New Features
a. The history library does not try to write the history filename in the
   current directory if $HOME is unset.  This closes a potential security
   problem if the application does not specify a history filename.
b. New bindable variable `completion-display-width' to set the number of
   columns used when displaying completions.
c. New bindable variable `completion-case-map' to cause case-insensitive
   completion to treat `-' and `_' as identical.
d. There are new bindable vi-mode command names to avoid readline's case-
   insensitive matching not allowing them to be bound separately.
e. New bindable variable `menu-complete-display-prefix' causes the menu
   completion code to display the common prefix of the possible completions
   before cycling through the list, instead of after.

5 files changed, 26 insertions, 32 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index d648999acce..63e50f4ded1 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.50 2010/01/16 17:18:27 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.51 2011/02/23 11:00:17 adam Exp $
 
-DISTNAME=	readline-6.1
+DISTNAME=	readline-6.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
-#PATCH_SITES=	${MASTER_SITE_GNU:=readline/readline-5.1-patches/}
-#PATCHFILES=	readline51-001
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 COMMENT=	GNU library that can recall and edit previous input
@@ -16,9 +12,9 @@ LICENSE=	gnu-gpl-v3
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-INFO_FILES=		# PLIST
+GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 
 BUILD_TARGET=		all-libtool
 INSTALL_TARGET=		install-libtool
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index 8f5d322bd9e..7132682fe16 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2009/05/20 00:58:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2011/02/23 11:00:17 adam Exp $
 
 BUILDLINK_TREE+=	readline
 
@@ -12,19 +12,17 @@ BUILDLINK_PKGSRCDIR.readline?=		../../devel/readline
 BUILDLINK_FILES.readline+=	include/history.h
 BUILDLINK_FILES.readline+=	include/readline.h
 
-BUILDLINK_FNAME_TRANSFORM.readline+= \
-	-e "s|include/history\.h|include/readline/history.h|g"		\
-	-e "s|include/readline\.h|include/readline/readline.h|g"
+BUILDLINK_FNAME_TRANSFORM.readline+=	-e 's|include/history\.h|include/readline/history.h|g'
+BUILDLINK_FNAME_TRANSFORM.readline+=	-e 's|include/readline\.h|include/readline/readline.h|g'
 
 # Many GNU configure scripts don't check for the correct terminal library
 # when testing for -lreadline.  If BROKEN_READLINE_DETECTION is set to
 # "yes", then automatically add the right one.
-#
 .  include "../../mk/bsd.fast.prefs.mk"
 BROKEN_READLINE_DETECTION?=	no
-.  if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
+.if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS])
 BUILDLINK_TRANSFORM+=		l:readline:readline:${BUILDLINK_LIBNAME.termcap}
-.  endif
+.endif
 
 CHECK_BUILTIN.readline:=	yes
 .include "../../devel/readline/builtin.mk"
diff --git a/devel/readline/distinfo b/devel/readline/distinfo
index 595c439b302..c26736c56db 100644
--- a/devel/readline/distinfo
+++ b/devel/readline/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2010/01/16 17:18:27 wiz Exp $
+$NetBSD: distinfo,v 1.18 2011/02/23 11:00:17 adam Exp $
 
-SHA1 (readline-6.1.tar.gz) = 54840a0dc907e7fa598d7ffcdcbd17bae69ace83
-RMD160 (readline-6.1.tar.gz) = b50f47a3952e354655056d9684b05ee65027e291
-Size (readline-6.1.tar.gz) = 2261725 bytes
-SHA1 (patch-ae) = 5ef968372e27be7a4f5bfbfd71f8bcd371ab99e9
+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) = 39a0765711080ee5e6ecc0218eead6d47a9b95c7
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
-SHA1 (patch-ah) = 107701a092b4294907e9a2066cfa7cbb3afad301
+SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae
index 4ed53d7458e..9783f6bc029 100644
--- a/devel/readline/patches/patch-ae
+++ b/devel/readline/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $
+$NetBSD: patch-ae,v 1.15 2011/02/23 11:00:17 adam Exp $
 
---- Makefile.in.orig	2009-01-06 17:03:14.000000000 +0000
+--- Makefile.in.orig	2010-10-11 15:53:52.000000000 +0000
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -36,7 +36,7 @@ $NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -147,6 +157,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
+@@ -150,6 +160,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
  
  all: $(TARGETS)
  
@@ -45,7 +45,7 @@ $NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $
  everything: all examples
  
  static: $(STATIC_LIBS)
-@@ -156,17 +168,33 @@ libreadline.a: $(OBJECTS)
+@@ -159,17 +171,33 @@ libreadline.a: $(OBJECTS)
  	$(AR) $(ARFLAGS) $@ $(OBJECTS)
  	-test -n "$(RANLIB)" && $(RANLIB) $@
  
@@ -55,14 +55,14 @@ $NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $
 +		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +		$(LDFLAGS)
 +
- libhistory.a: $(HISTOBJ) xmalloc.o
+ libhistory.a: $(HISTOBJ) xmalloc.o xfree.o
  	$(RM) $@
- 	$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o
+ 	$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o xfree.o
  	-test -n "$(RANLIB)" && $(RANLIB) $@
  
-+libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo
++libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo
 +	$(LIBTOOL) --mode=clean $(RM) $@
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo \
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
 +		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +		$(LDFLAGS)
 +
@@ -79,7 +79,7 @@ $NetBSD: patch-ae,v 1.14 2009/02/23 12:35:46 wiz Exp $
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
  	$(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB}
  
-@@ -251,6 +279,12 @@ install-examples: installdirs install-he
+@@ -254,6 +282,12 @@ install-examples: installdirs install-he
  uninstall-examples: maybe-uninstall-headers
  	-( cd examples; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
  
diff --git a/devel/readline/patches/patch-ah b/devel/readline/patches/patch-ah
index 11a64b5fc2b..a6c41b680ad 100644
--- a/devel/readline/patches/patch-ah
+++ b/devel/readline/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2008/08/13 11:11:38 he Exp $
+$NetBSD: patch-ah,v 1.5 2011/02/23 11:00:17 adam Exp $
 
 --- readline.h.orig	2006-08-16 21:16:59.000000000 +0200
 +++ readline.h
-@@ -33,6 +33,7 @@ extern "C" {
+@@ -32,6 +32,7 @@ extern "C" {
  #  include "keymaps.h"
  #  include "tilde.h"
  #else