Update devel/readline to 5.0. Changes from version 4.3 include:

* Improved compatibility with BSD csh modifiers.
* Improved vi editing mode.
* History files include timestamp information.

5 files changed, 62 insertions, 75 deletions

diff --git a/devel/readline/DESCR b/devel/readline/DESCR
index f9649ac4302..ad9e9b1415d 100644
--- a/devel/readline/DESCR
+++ b/devel/readline/DESCR
@@ -1,3 +1,3 @@
-This is the GNU readline library, which can be linked into
-applications, allowing them to re-use previously typed input, and,
-additionally, edit it.
+This is the GNU readline library, which can be linked into applications,
+allowing them to re-use previously typed input and additionally to
+edit it.
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 9577718e7b3..66498d68a2a 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,16 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: Makefile,v 1.33 2004/11/14 06:16:49 jlam Exp $
 #
 
-DISTNAME=	readline-4.3
-PKGNAME=	${DISTNAME}pl5
-PKGREVISION=	2
+DISTNAME=	readline-5.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
-PATCH_SITES=	${MASTER_SITES:=${DISTNAME}-patches/}
-PATCHFILES=	readline43-001 readline43-002 readline43-003 readline43-004 \
-		readline43-005
-
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 COMMENT=	GNU library that can recall and edit previous input
@@ -18,12 +12,12 @@ COMMENT=	GNU library that can recall and edit previous input
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
 
-ALL_TARGET=		all-la
-INSTALL_TARGET=		install-la
+ALL_TARGET=		all-libtool
+INSTALL_TARGET=		install-libtool
 
-INFO_FILES=		readline.info history.info rluserman.info
+INFO_FILES=		history.info readline.info rluserman.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk
index eee154a42c9..dbb130a6b90 100644
--- a/devel/readline/buildlink3.mk
+++ b/devel/readline/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2004/10/03 00:13:33 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2004/11/14 06:16:49 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=	${READLINE_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nreadline}
 BUILDLINK_PACKAGES+=	readline
 
 .if !empty(READLINE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.readline+=	readline>=2.2
-BUILDLINK_RECOMMENDED.readline+=	readline>=4.3pl5nb2
-BUILDLINK_PKGSRCDIR.readline?=	../../devel/readline
+BUILDLINK_DEPENDS.readline+=		readline>=2.2
+BUILDLINK_RECOMMENDED.readline+=	readline>=5.0
+BUILDLINK_PKGSRCDIR.readline?=		../../devel/readline
 
 BUILDLINK_FILES.readline+=	include/history.h
 BUILDLINK_FILES.readline+=	include/readline.h
diff --git a/devel/readline/distinfo b/devel/readline/distinfo
index 517622e3ac2..e9708ef6c7d 100644
--- a/devel/readline/distinfo
+++ b/devel/readline/distinfo
@@ -1,15 +1,5 @@
-$NetBSD: distinfo,v 1.8 2004/08/20 17:32:50 tv Exp $
+$NetBSD: distinfo,v 1.9 2004/11/14 06:16:49 jlam Exp $
 
-SHA1 (readline-4.3.tar.gz) = 4e226fd5f6f919707f11b9e28d47b5487448895d
-Size (readline-4.3.tar.gz) = 961662 bytes
-SHA1 (readline43-001) = 23a75df0b127ec1e29e627471cdf5618862dc9b2
-Size (readline43-001) = 1126 bytes
-SHA1 (readline43-002) = 4500d4ee9d447c6e35569bb965ecf2905aa2b11e
-Size (readline43-002) = 738 bytes
-SHA1 (readline43-003) = e68ff498502ab28ec12826c97fdc87249f0af874
-Size (readline43-003) = 2202 bytes
-SHA1 (readline43-004) = 24bef0b7bda1cafd0475098ed7a01f45a58765e6
-Size (readline43-004) = 3140 bytes
-SHA1 (readline43-005) = a022e113b8ad603d1020e99308de0a917626d1e1
-Size (readline43-005) = 1056 bytes
-SHA1 (patch-ae) = 89d95180051bb4d9db9336fbac236ab083cf83e9
+SHA1 (readline-5.0.tar.gz) = 9b9959c3f62e3e82d3edd604c0bf6124d5256c9e
+Size (readline-5.0.tar.gz) = 1808946 bytes
+SHA1 (patch-ae) = 92a6249e51d8e0cb0e159862a383ba7b785a33c0
diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae
index 3dcabbe2442..1604cc8bca5 100644
--- a/devel/readline/patches/patch-ae
+++ b/devel/readline/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.10 2004/08/20 17:32:50 tv Exp $
+$NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
 
---- Makefile.in.orig	Thu Jan 24 16:15:24 2002
+--- Makefile.in.orig	2004-04-22 16:44:37.000000000 -0400
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -9,16 +9,18 @@ $NetBSD: patch-ae,v 1.10 2004/08/20 17:32:50 tv Exp $
 +SHLIB_MAJOR = @SHLIB_MAJOR@
 +SHLIB_MINOR = @SHLIB_MINOR@
 +
- srcdir = @srcdir@
- VPATH = .:@srcdir@
- top_srcdir = @top_srcdir@
-@@ -80,11 +83,12 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
+ PACKAGE = @PACKAGE_NAME@
+ VERSION = @PACKAGE_VERSION@
  
- .c.o:
+@@ -92,9 +95,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
  	${RM} $@
--	$(CC) -c $(CCFLAGS) $<
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CCFLAGS) $<
+ 	$(CC) -c $(CCFLAGS) $<
  
++.SUFFIXES: .lo
++.c.lo:
++	${RM} $@
++	$(LIBTOOL) --mode=compile $(CC) -c $(CCFLAGS) $<
++
  # The name of the main library target.
  LIBRARY_NAME = libreadline.a
  STATIC_LIBS = libreadline.a libhistory.a
@@ -26,56 +28,57 @@ $NetBSD: patch-ae,v 1.10 2004/08/20 17:32:50 tv Exp $
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -133,6 +137,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
+@@ -143,6 +152,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
  
  all: $(TARGETS)
  
-+all-la: $(LIBTOOL_LIBS)
++all-libtool: $(LIBTOOL_LIBS)
 +
  everything: all examples
  
  static: $(STATIC_LIBS)
-@@ -142,6 +148,12 @@ libreadline.a: $(OBJECTS)
+@@ -152,17 +163,31 @@ libreadline.a: $(OBJECTS)
  	$(AR) $(ARFLAGS) $@ $(OBJECTS)
  	-test -n "$(RANLIB)" && $(RANLIB) $@
  
-+libreadline.la: $(OBJECTS)
-+	${LIBTOOL} --mode=uninstall ${RM} $@
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${OBJECTS:.o=.lo}		\
-+		-rpath $(libdir)					\
-+		-version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
++libreadline.la: $(OBJECTS:.o=.lo)
++	$(LIBTOOL) --mode=clean $(RM) $@
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) \
++		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR)
 +
  libhistory.a: $(HISTOBJ) xmalloc.o
  	$(RM) $@
  	$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o
-@@ -151,13 +163,27 @@ libhistory.a: $(HISTOBJ) xmalloc.o
+ 	-test -n "$(RANLIB)" && $(RANLIB) $@
+ 
++libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo
++	$(LIBTOOL) --mode=clean $(RM) $@
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo \
++		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR)
++
+ # Since tilde.c is shared between readline and bash, make sure we compile
  # 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) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
+ 	$(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}
-+libhistory.la: $(HISTOBJ) xmalloc.o
-+	${LIBTOOL} --mode=uninstall $(RM) $@
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${HISTOBJ:.o=.lo} xmalloc.lo	\
-+		-rpath $(libdir)					\
-+		-version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
++tilde.lo:	tilde.c
++	$(LIBTOOL) --mode=clean rm -f $@
++	$(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
 +
-+readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./$(LIBRARY_NAME)
-+	${LIBTOOL} $(CC) $(CCFLAGS) $(LDFLAGS) -o $@ ./examples/rl.c ./$(LIBRARY_NAME) ${TERMCAP_LIB}
+ readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
+ 	$(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB}
  
- lint:	force
- 	$(MAKE) $(MFLAGS) CCFLAGS='$(GCC_LINT_CFLAGS)' static
-+
-+install-la: installdirs $(LIBTOOL_LIBS) install-headers
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libreadline.la $(libdir)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libhistory.la $(libdir)
-+	-( if test -d doc ; then \
-+		cd doc && \
-+		${MAKE} ${MFLAGS} infodir=$(infodir) install; \
-+ 	  fi )
+@@ -241,6 +266,12 @@ install-shared: installdirs install-head
+ uninstall-shared: maybe-uninstall-headers
+ 	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
  
- Makefile makefile: config.status $(srcdir)/Makefile.in
- 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
++install-libtool: installdirs $(LIBTOOL_LIBS) install-headers install-doc
++	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libreadline.la
++	$(LIBTOOL) --mode=install $(INSTALL) libreadline.la $(DESTDIR)$(libdir)
++	-$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libhistory.la
++	$(LIBTOOL) --mode=install $(INSTALL) libhistory.la $(DESTDIR)$(libdir)
++
+ install-doc:	installdirs
+ 	-( if test -d doc ; then \
+ 		cd doc && \