Update readline to 4.3.

Changes in this version are mostly bugfixes; some new functionality
has been added as well. For an exhaustive list of changes, please
look at the CHANGES file included in the distribution.

4 files changed, 29 insertions, 26 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 7690b9f2667..79c9fdbbd31 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2002/08/25 18:38:45 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2002/12/07 17:39:47 jmmv Exp $
 #
 
-DISTNAME=	readline-4.2
+DISTNAME=	readline-4.3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
@@ -16,7 +16,7 @@ USE_LIBTOOL=		# defined
 ALL_TARGET=		all-la
 INSTALL_TARGET=		install-la
 
-INFO_FILES=		readline.info history.info
+INFO_FILES=		readline.info history.info rluserman.info
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/PLIST b/devel/readline/PLIST
index 85b27b0ca37..0df4f755a1b 100644
--- a/devel/readline/PLIST
+++ b/devel/readline/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:15 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/07 17:39:47 jmmv Exp $
 include/readline/chardefs.h
 include/readline/history.h
 include/readline/keymaps.h
@@ -9,21 +9,23 @@ include/readline/rltypedefs.h
 include/readline/tilde.h
 @unexec ${INSTALL_INFO} --delete %D/info/history.info %D/info/dir
 @unexec ${INSTALL_INFO} --delete %D/info/readline.info %D/info/dir
+@unexec ${INSTALL_INFO} --delete %D/info/rluserman.info %D/info/dir
 info/history.info
 info/readline.info
 info/rluserman.info
 @exec ${INSTALL_INFO} %D/info/history.info %D/info/dir
 @exec ${INSTALL_INFO} %D/info/readline.info %D/info/dir
+@exec ${INSTALL_INFO} %D/info/rluserman.info %D/info/dir
 lib/libhistory.a
 lib/libhistory.la
 lib/libhistory.so
 lib/libhistory.so.4
-lib/libhistory.so.4.2
+lib/libhistory.so.4.3
 lib/libreadline.a
 lib/libreadline.la
 lib/libreadline.so
 lib/libreadline.so.4
-lib/libreadline.so.4.2
+lib/libreadline.so.4.3
 man/man3/history.3
 man/man3/readline.3
 @dirrm include/readline
diff --git a/devel/readline/distinfo b/devel/readline/distinfo
index eeeae57435b..dc4f6ea7616 100644
--- a/devel/readline/distinfo
+++ b/devel/readline/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/08/06 14:20:46 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/12/07 17:39:47 jmmv Exp $
 
-SHA1 (readline-4.2.tar.gz) = cbf2995df468792a37c446eb99762822cc16bfff
-Size (readline-4.2.tar.gz) = 852285 bytes
-SHA1 (patch-ae) = 687542eb01c19c24e7f0c73a51a73f47d3321a33
+SHA1 (readline-4.3.tar.gz) = 4e226fd5f6f919707f11b9e28d47b5487448895d
+Size (readline-4.3.tar.gz) = 961662 bytes
+SHA1 (patch-ae) = 1198bd554f1ee77397017ab4eee347f1ba50d515
diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae
index bab7b72d44a..1073b8dfe5d 100644
--- a/devel/readline/patches/patch-ae
+++ b/devel/readline/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
+$NetBSD: patch-ae,v 1.8 2002/12/07 17:39:48 jmmv Exp $
 
---- Makefile.in.orig	Mon Nov 27 11:57:09 2000
+--- Makefile.in.orig	Thu Jan 24 16:15:24 2002
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
  srcdir = @srcdir@
  VPATH = .:@srcdir@
  top_srcdir = @top_srcdir@
-@@ -77,11 +80,12 @@
+@@ -80,11 +83,12 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
  
  .c.o:
  	${RM} $@
@@ -26,21 +26,21 @@ $NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -127,6 +131,8 @@
+@@ -133,6 +137,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
  
- all: static
+ all: $(TARGETS)
  
 +all-la: $(LIBTOOL_LIBS)
 +
- everything: static shared examples
+ everything: all examples
  
  static: $(STATIC_LIBS)
-@@ -136,13 +142,25 @@
+@@ -142,6 +148,12 @@ libreadline.a: $(OBJECTS)
  	$(AR) $(ARFLAGS) $@ $(OBJECTS)
  	-test -n "$(RANLIB)" && $(RANLIB) $@
  
 +libreadline.la: $(OBJECTS)
-+	${LIBTOOL} $(RM) $@
++	${LIBTOOL} ${RM} $@
 +	${LIBTOOL} ${CC} -o $@ ${OBJECTS:.o=.lo}			\
 +		-rpath $(libdir)					\
 +		-version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
@@ -48,7 +48,12 @@ $NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
  libhistory.a: $(HISTOBJ) xmalloc.o
  	$(RM) $@
  	$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o
- 	-test -n "$(RANLIB)" && $(RANLIB) $@
+@@ -151,13 +163,27 @@ libhistory.a: $(HISTOBJ) xmalloc.o
+ # it with the right flags when it's built as part of readline
+ tilde.o:	tilde.c
+ 	rm -f $@
+-	$(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
++	$(LIBTOOL) $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
  
 -readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
 -	$(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB}
@@ -63,11 +68,6 @@ $NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
  
  lint:	force
  	$(MAKE) $(MFLAGS) CCFLAGS='$(GCC_LINT_CFLAGS)' static
-@@ -203,6 +221,14 @@
- 	-( if test -d doc ; then \
- 		cd doc && \
- 		${MAKE} ${MFLAGS} infodir=$(infodir) $@; \
-+	  fi )
 +
 +install-la: installdirs $(LIBTOOL_LIBS) install-headers
 +	${LIBTOOL} ${INSTALL_DATA} libreadline.la $(libdir)
@@ -75,6 +75,7 @@ $NetBSD: patch-ae,v 1.7 2001/08/06 14:20:48 jlam Exp $
 +	-( if test -d doc ; then \
 +		cd doc && \
 +		${MAKE} ${MFLAGS} infodir=$(infodir) install; \
- 	  fi )
++ 	  fi )
  
- installdirs: $(srcdir)/support/mkdirs
+ Makefile makefile: config.status $(srcdir)/Makefile.in
+ 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status