* Update "devel/readline" to 4.0.

    * Libtoolize library build.

14 files changed, 245 insertions, 634 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 6849ca77188..75c440e8c10 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.12 1999/04/14 21:39:03 tron Exp $
+# $NetBSD: Makefile,v 1.13 1999/07/13 00:56:12 jlam Exp $
 #
 
-DISTNAME=	readline-2.2
+DISTNAME=	readline-4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
 MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.gnu.org/software/readline/
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_GTEXINFO=	yes
+MAKE_ENV+=	READLINE_MAJOR=4 READLINE_MINOR=0
 
-SCRIPTS_ENV+=	PLIST_SRC="${PLIST_SRC}"
-
-do-build:
-	(cd ${WRKSRC}; ${MAKE} LIB=readline)
-	(cd ${WRKSRC}; ${MAKE} LIB=history)
+ALL_TARGET=	all documentation
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/readline/files/md5 b/devel/readline/files/md5
index 274c8387272..f550371bc12 100644
--- a/devel/readline/files/md5
+++ b/devel/readline/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:21:26 agc Exp $
+$NetBSD: md5,v 1.4 1999/07/13 00:56:13 jlam Exp $
 
-MD5 (readline-2.2.tar.gz) = c5d7c3cf40feef7b651008dcb0581f51
+MD5 (readline-4.0.tar.gz) = 73e863c4439f86d7f71c630956ebd346
diff --git a/devel/readline/files/patch-sum b/devel/readline/files/patch-sum
index bd49aa6afa7..9aaae43ab3c 100644
--- a/devel/readline/files/patch-sum
+++ b/devel/readline/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:41 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/13 00:56:13 jlam Exp $
 
-MD5 (patch-aa) = 0e120fca366737294b36140ac90455df
-MD5 (patch-ab) = 9871cb08faf23e5872f8832231675857
-MD5 (patch-ad) = d18023f43fb4af668f5fd550803298fe
-MD5 (patch-ae) = ddfe375885568db183371acaec54b9f2
-MD5 (patch-af) = a6582c538a0ba018207a6e841c8dd6e0
-MD5 (patch-ag) = 05ea51f5dc6d10312973a94bcd04a4cd
-MD5 (patch-ah) = 0089d321a8febed3d0d76e392158e7d1
+MD5 (patch-aa) = 753804c7a34e14e737bf9c91d2c6d55f
+MD5 (patch-ad) = d449ce3cd4db0f57683c26f526d8e2b0
+MD5 (patch-ae) = 38f3f5a9aeb6edff38f134c1af41739f
+MD5 (patch-ah) = 1692b74a84f79aeb354ca2a0dc46bc71
+MD5 (patch-ai) = 0bee21167117e7e6510455fce24043da
+MD5 (patch-aj) = 37f93b527d0db8795ad17ef9e785c2a7
+MD5 (patch-ak) = 54446c23a1340c6997b6327f10965100
diff --git a/devel/readline/patches/patch-aa b/devel/readline/patches/patch-aa
index 841325792ab..356fbfc0b43 100644
--- a/devel/readline/patches/patch-aa
+++ b/devel/readline/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
+$NetBSD: patch-aa,v 1.5 1999/07/13 00:56:13 jlam Exp $
 
---- display.c.old	Sat Jan 10 16:57:37 1998
-+++ display.c	Sat Jan 10 17:06:06 1998
-@@ -622,7 +622,7 @@
+--- display.c.orig	Thu Dec 17 15:36:30 1998
++++ display.c	Tue Jul  6 05:21:00 1999
+@@ -652,7 +652,7 @@
  	      _rl_last_c_pos <= last_invisible && local_prompt)
  	    {
  	      if (term_cr)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
  	      _rl_output_some_chars (local_prompt, nleft);
  	      _rl_last_c_pos = nleft;
  	    }
-@@ -869,7 +869,7 @@
+@@ -899,7 +899,7 @@
        term_cr && lendiff > visible_length && _rl_last_c_pos > 0 &&
        od > lendiff && _rl_last_c_pos < last_invisible)
      {
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
        _rl_output_some_chars (local_prompt, lendiff);
        _rl_last_c_pos = lendiff;
      }
-@@ -1039,7 +1039,7 @@
+@@ -1069,7 +1069,7 @@
  #if defined (__MSDOS__)
        putc ('\r', rl_outstream);
  #else
@@ -29,7 +29,16 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
  #endif /* !__MSDOS__ */
        _rl_last_c_pos = 0;
      }
-@@ -1097,14 +1097,14 @@
+@@ -1090,7 +1090,7 @@
+ 
+       if (term_forward_char)
+ 	for (i = _rl_last_c_pos; i < new; i++)
+-	  tputs (term_forward_char, 1, _rl_output_character_function);
++	  tputs (term_forward_char, 1, (void *)_rl_output_character_function);
+       else
+ 	for (i = _rl_last_c_pos; i < new; i++)
+ 	  putc (data[i], rl_outstream);
+@@ -1127,14 +1127,14 @@
      {
        for (i = 0; i < delta; i++)
  	putc ('\n', rl_outstream);
@@ -46,7 +55,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
      }
  #endif /* !__GO32__ */
    _rl_last_v_pos = to;		/* Now TO is here */
-@@ -1316,7 +1316,7 @@
+@@ -1346,7 +1346,7 @@
  {
  #if !defined (__GO32__)
    if (term_clreol)
@@ -55,7 +64,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
    else if (count)
  #endif /* !__GO32__ */
      space_to_eol (count);
-@@ -1341,7 +1341,7 @@
+@@ -1371,7 +1371,7 @@
  {
  #if !defined (__GO32__)
    if (term_clrpag)
@@ -64,7 +73,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
    else
  #endif /* !__GO32__ */
      crlf ();
-@@ -1372,7 +1372,7 @@
+@@ -1402,7 +1402,7 @@
      {
        char *buffer;
        buffer = tgoto (term_IC, 0, count);
@@ -73,7 +82,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
        _rl_output_some_chars (string, count);
      }
    else
-@@ -1381,14 +1381,14 @@
+@@ -1411,14 +1411,14 @@
  
        /* If we have to turn on insert-mode, then do so. */
        if (term_im && *term_im)
@@ -90,7 +99,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
  	}
  
        /* Print the text. */
-@@ -1397,7 +1397,7 @@
+@@ -1427,7 +1427,7 @@
        /* If there is a string to turn off insert mode, we had best use
  	 it now. */
        if (term_ei && *term_ei)
@@ -99,7 +108,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
      }
  #endif /* !__GO32__ */
  }
-@@ -1426,13 +1426,13 @@
+@@ -1456,13 +1456,13 @@
      {
        char *buffer;
        buffer = tgoto (term_DC, count, count);
@@ -115,7 +124,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
      }
  #endif /* !__GO32__ */
  }
-@@ -1473,7 +1473,7 @@
+@@ -1503,7 +1503,7 @@
  {
    if (term_cr)
      {
@@ -124,7 +133,7 @@ $NetBSD: patch-aa,v 1.4 1998/08/07 10:40:28 agc Exp $
        _rl_last_c_pos = 0;
      }
  }
-@@ -1488,14 +1488,14 @@
+@@ -1518,14 +1518,14 @@
       the right thing happens if we have wrapped to a new screen line. */
    if (term_cr)
      {
diff --git a/devel/readline/patches/patch-ab b/devel/readline/patches/patch-ab
deleted file mode 100644
index 19e01c0cc34..00000000000
--- a/devel/readline/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:28 agc Exp $
-
---- doc/Makefile.in	1998/03/19 12:37:30	1.1
-+++ doc/Makefile.in	1998/03/19 12:37:14
-@@ -10,6 +10,7 @@
- man3dir = $(mandir)/man3
- 
- RM = rm -f
-+SHELL= /bin/sh
- 
- TEXINPUTDIR = $(srcdir)
- 
diff --git a/devel/readline/patches/patch-ad b/devel/readline/patches/patch-ad
index 9b4859f4142..2f879ec4f24 100644
--- a/devel/readline/patches/patch-ad
+++ b/devel/readline/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:40:28 agc Exp $
+$NetBSD: patch-ad,v 1.3 1999/07/13 00:56:13 jlam Exp $
 
---- terminal.c.orig	Tue Apr 21 08:53:08 1998
-+++ terminal.c	Tue Apr 21 08:54:31 1998
-@@ -468,7 +468,7 @@
+--- terminal.c.orig	Thu May 14 10:54:16 1998
++++ terminal.c	Tue Jul  6 05:23:35 1999
+@@ -478,7 +478,7 @@
  #if !defined (__GO32__)
    if (term_backspace)
      for (i = 0; i < count; i++)
@@ -11,7 +11,16 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:40:28 agc Exp $
    else
  #endif /* !__GO32__ */
      for (i = 0; i < count; i++)
-@@ -503,7 +503,7 @@
+@@ -492,7 +492,7 @@
+ {
+ #if defined (NEW_TTY_DRIVER)
+   if (term_cr)
+-    tputs (term_cr, 1, _rl_output_character_function);
++    tputs (term_cr, 1, (void *)_rl_output_character_function);
+ #endif /* NEW_TTY_DRIVER */
+   putc ('\n', _rl_out_stream);
+   return 0;
+@@ -513,7 +513,7 @@
  	case VISIBLE_BELL:
  	  if (visible_bell)
  	    {
@@ -20,7 +29,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:40:28 agc Exp $
  	      break;
  	    }
  	  /* FALLTHROUGH */
-@@ -531,7 +531,7 @@
+@@ -541,7 +541,7 @@
  _rl_enable_meta_key ()
  {
    if (term_has_meta && term_mm)
@@ -29,7 +38,7 @@ $NetBSD: patch-ad,v 1.2 1998/08/07 10:40:28 agc Exp $
  }
  
  void
-@@ -539,7 +539,7 @@
+@@ -549,7 +549,7 @@
       int on;
  {
    if (on && term_ks)
diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae
index 2c8a950450a..cee03900d64 100644
--- a/devel/readline/patches/patch-ae
+++ b/devel/readline/patches/patch-ae
@@ -1,541 +1,59 @@
-$NetBSD: patch-ae,v 1.3 1999/03/08 14:26:13 agc Exp $
+$NetBSD: patch-ae,v 1.4 1999/07/13 00:56:13 jlam Exp $
 
---- Makefile.in.orig	Fri Apr  3 18:23:01 1998
-+++ Makefile.in	Tue Apr 21 10:09:52 1998
-@@ -53,7 +53,7 @@
- ETAGS = etags -tw
- CTAGS = ctags -tw
+--- Makefile.in.orig	Thu Feb 18 12:24:11 1999
++++ Makefile.in	Tue Jul  6 13:18:52 1999
+@@ -67,11 +67,11 @@
  
--CFLAGS = @CFLAGS@
-+CFLAGS += @CFLAGS@
- LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@
-@@ -64,53 +64,26 @@
- # For libraries which include headers from other libraries.
- INCLUDES = -I. -I$(srcdir) -I$(includedir)
- 
--CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS) $(CFLAGS)
-+CFLAGS += $(DEFS) $(LOCAL_DEFS) $(CPPFLAGS) $(INCLUDES) $(LOCAL_CFLAGS)
- 
--# these two options need tweaking for compiler/OS versions other than gcc
--# and SunOS4
--PICFLAG=        -fpic    # -pic for some versions of cc
--SHLIB_OPTS=	-assert pure-text -ldl	# -Bshareable for some versions of gcc
--
--MAJOR=		3
--# shared library systems like SVR4's do not use minor versions
--MINOR=		.0
--
--.SUFFIXES:	.so
--
--.c.o:
+ .c.o:
+ 	${RM} $@
 -	$(CC) -c $(CCFLAGS) $<
--
--.c.so:
--	-mv $*.o z$*.o
--	$(CC) -c $(PICFLAG) $(CCFLAGS) $< 
--	mv $*.o $@
--	-mv z$*.o $*.o
--
--# The name of the main library target.
++	${LIBTOOL} --mode=compile $(CC) -c $(CCFLAGS) $<
+ 
+ # The name of the main library target.
 -LIBRARY_NAME = libreadline.a
 -STATIC_LIBS = libreadline.a libhistory.a
--
--SHARED_READLINE = libreadline.so.$(MAJOR)$(MINOR)
--SHARED_HISTORY = libhistory.so.$(MAJOR)$(MINOR)
--SHARED_LIBS = $(SHARED_READLINE) $(SHARED_HISTORY)
-+MAJOR=		2
-+MINOR=		2
++LIBRARY_NAME = libreadline.la
++STATIC_LIBS = libreadline.la libhistory.la
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
- 	   $(srcdir)/vi_mode.c $(srcdir)/parens.c $(srcdir)/rltty.c \
- 	   $(srcdir)/complete.c $(srcdir)/bind.c $(srcdir)/isearch.c \
--	   $(srcdir)/display.c $(srcdir)/signals.c $(srcdir)/emacs_keymap.c \
--	   $(srcdir)/vi_keymap.c $(srcdir)/util.c $(srcdir)/kill.c \
-+	   $(srcdir)/display.c $(srcdir)/signals.c \
-+	   $(srcdir)/util.c $(srcdir)/kill.c \
- 	   $(srcdir)/undo.c $(srcdir)/macro.c $(srcdir)/input.c \
--	   $(srcdir)/callback.c $(srcdir)/terminal.c $(srcdir)/xmalloc.c \
-+	   $(srcdir)/callback.c $(srcdir)/terminal.c
-+
-+# history library
-+HSOURCES = $(srcdir)/xmalloc.c \
- 	   $(srcdir)/history.c $(srcdir)/histsearch.c $(srcdir)/histexpand.c \
- 	   $(srcdir)/histfile.c $(srcdir)/nls.c $(srcdir)/search.c \
- 	   $(srcdir)/shell.c $(srcdir)/tilde.c
- 
--# The header files for this library.
--HSOURCES = readline.h rldefs.h chardefs.h keymaps.h history.h histlib.h \
--	   posixstat.h posixdir.h posixjmp.h tilde.h rlconf.h rltty.h \
--	   ansi_stdlib.h tcap.h
--
- HISTOBJ = history.o histexpand.o histfile.o histsearch.o shell.o
- TILDEOBJ = tilde.o
- OBJECTS = readline.o vi_mode.o funmap.o keymaps.o parens.o search.o \
-@@ -118,13 +91,6 @@
- 	  util.o kill.o undo.o macro.o input.o callback.o terminal.o \
- 	  nls.o xmalloc.o $(HISTOBJ) $(TILDEOBJ)
- 
--SHARED_HISTOBJ = history.so histexpand.so histfile.so histsearch.so shell.so
--SHARED_TILDEOBJ = tilde.so
--SHARED_OBJ = readline.so vi_mode.so funmap.so keymaps.so parens.so search.so \
--	  rltty.so complete.so bind.so isearch.so display.so signals.so \
--	  util.so kill.so undo.so macro.so input.so callback.so terminal.so \
--	  nls.so xmalloc.so $(SHARED_HISTOBJ) $(SHARED_TILDEOBJ)
--
- # The texinfo files which document this library.
- DOCSOURCE = doc/rlman.texinfo doc/rltech.texinfo doc/rluser.texinfo
- DOCOBJECT = doc/readline.dvi
-@@ -139,421 +105,35 @@
- INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h
+@@ -117,18 +117,16 @@
  
- ##########################################################################
-+# now comes the BSD staff
-+
-+SHLIB_MAJOR = $(MAJOR)
-+SHLIB_MINOR = $(MINOR)
-+
-+INCS   = ${INSTALLED_HEADERS}
-+INCSDIR = ${PREFIX}/include/readline
-+
-+NOPROFILE = 1
-+NOLINT    = 1
-+
-+LIBDIR = ${PREFIX}/lib
-+
-+LIB ?= readline
-+
-+.if (${LIB} == "readline")
-+SRCS = ${CSOURCES} ${HSOURCES}
-+.else
-+SRCS = ${HSOURCES}
-+.endif
-+
-+.PHONY:        install
- 
--all: static
-+install: ${INCSDIR} incinstall
-+	${MAKE} LIB=readline libinstall
-+	${MAKE} LIB=history libinstall
-+	( cd doc; ${MAKE} install )
- 
--static: $(STATIC_LIBS)
--shared: $(SHARED_LIBS)
-+${INCSDIR}:  
-+	mkdir ${.TARGET}
+ static: $(STATIC_LIBS)
  
 -libreadline.a: $(OBJECTS)
--	$(RM) $@
--	$(AR) cr $@ $(OBJECTS)
++libreadline.la: $(OBJECTS)
+ 	$(RM) $@
+-	$(AR) $(ARFLAGS) $@ $(OBJECTS)
 -	-test -n "$(RANLIB)" && $(RANLIB) $@
--
++	${LIBTOOL} --mode=link cc -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${READLINE_MAJOR}:${READLINE_MINOR}
+ 
 -libhistory.a: $(HISTOBJ) xmalloc.o
--	$(RM) $@
--	$(AR) cr $@ $(HISTOBJ) xmalloc.o
++libhistory.la: $(HISTOBJ) xmalloc.o
+ 	$(RM) $@
+-	$(AR) $(ARFLAGS) $@ $(HISTOBJ) xmalloc.o
 -	-test -n "$(RANLIB)" && $(RANLIB) $@
--
--$(SHARED_READLINE):	$(SHARED_OBJ)
--	$(RM) $@
--	$(LD) ${SHLIB_OPTS} -o $@ $(SHARED_OBJ)
--
--$(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
--	$(RM) $@
--	$(LD) ${SHLIB_OPTS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
--
++	${LIBTOOL} --mode=link cc -o $@ ${HISTOBJ:.o=.lo} xmalloc.lo -rpath ${PREFIX}/lib -version-info ${READLINE_MAJOR}:${READLINE_MINOR}
+ 
 -readline: $(OBJECTS) readline.h rldefs.h chardefs.h
 -	$(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a -ltermcap
--
--Makefile makefile: config.status $(srcdir)/Makefile.in
--	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
--
--Makefiles makefiles: config.status $(srcdir)/Makefile.in
--	@for mf in $(CREATED_MAKEFILES); do \
--		CONFIG_FILES=$$mf CONFIG_HEADERS= $(SHELL) ./config.status ; \
--	done
--
--config.status: configure
--	$(SHELL) ./config.status --recheck
--
--config.h:	stamp-h
--
--stamp-h: config.status $(srcdir)/config.h.in
--	CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
--	echo > $@
--
--$(srcdir)/configure: $(srcdir)/configure.in	## Comment-me-out in distribution
--	cd $(srcdir) && autoconf	## Comment-me-out in distribution
--
--documentation: force
--	-test -d doc || mkdir doc
--	-( cd doc && $(MAKE) $(MFLAGS) )
--
--examples: force
--	-test -d examples || mkdir examples
--	-(cd examples && ${MAKE} ${MFLAGS} all )
--
--force:
--
--install: installdirs libreadline.a
--	for f in ${INSTALLED_HEADERS}; do \
--		$(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \
--	done
++readline: libreadline.la readline.h rldefs.h chardefs.h
++	${LIBTOOL} --mode=link $(CC) $(CCFLAGS) ${LDFLAGS} -o $@ ./examples/rl.c libreadline.la -ltermcap
+ 
+ Makefile makefile: config.status $(srcdir)/Makefile.in
+ 	CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
+@@ -169,12 +167,8 @@
+ 	for f in ${INSTALLED_HEADERS}; do \
+ 		$(INSTALL_DATA) $(srcdir)/$$f $(includedir)/readline ; \
+ 	done
 -	-$(MV) $(libdir)/libreadline.a $(libdir)/libreadline.old
 -	$(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a
 -	-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a
--	-$(MV) $(libdir)/libreadline.a $(libdir)/libhistory.old
+-	-$(MV) $(libdir)/libhistory.a $(libdir)/libhistory.old
 -	$(INSTALL_DATA) libhistory.a $(libdir)/libhistory.a
 -	-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libhistory.a
--	-( if test -d doc ; then \
--		cd doc && \
--		${MAKE} ${MFLAGS} infodir=$(infodir) $@; \
--	  fi )
--
--installdirs: $(srcdir)/support/mkdirs
--	-$(SHELL) $(srcdir)/support/mkdirs $(includedir) \
--		$(includedir)/readline $(libdir) $(infodir) $(man3dir)
--
--uninstall:
--	-test -n "$(includedir)" && cd $(includedir)/readline && \
--		${RM} ${INSTALLED_HEADERS}
--	-test -n "$(libdir)" && cd $(libdir) && \
--		${RM} libreadline.a libreadline.old libhistory.a libhistory.old $(SHARED_LIBS)
--
--install-shared: installdirs shared
--	-$(MV) $(libdir)/$(SHARED_HISTORY) $(libdir)/$(SHARED_HISTORY).old
--	$(INSTALL_DATA) $(SHARED_HISTORY) $(libdir)/$(SHARED_HISTORY)
--	-$(MV) $(libdir)/$(SHARED_READLINE) $(libdir)/$(SHARED_READLINE).old
--	$(INSTALL_DATA) $(SHARED_READLINE) $(libdir)/$(SHARED_READLINE)
--
--uninstall-shared:
--	-test -n "$(libdir)" && cd $(libdir) && ${RM} ${SHARED_LIBS}
--
--TAGS:	force
--	$(ETAGS) $(CSOURCES) $(HSOURCES)
--
--tags:	force
--	$(CTAGS) $(CSOURCES) $(HSOURCES)
--
--clean:	force
--	$(RM) $(OBJECTS) $(STATIC_LIBS)
--	$(RM) $(SHARED_OBJ) $(SHARED_LIBS)
--	-( cd doc && $(MAKE) $(MFLAGS) $@ )
--	-( cd examples && $(MAKE) $(MFLAGS) $@ )
--
--mostlyclean: clean
--	-( cd doc && $(MAKE) $(MFLAGS) $@ )
--	-( cd examples && $(MAKE) $(MFLAGS) $@ )
--
--distclean maintainer-clean: clean
--	-( cd doc && $(MAKE) $(MFLAGS) $@ )
--	-( cd examples && $(MAKE) $(MFLAGS) $@ )
--	$(RM) Makefile
--	$(RM) $(CREATED_CONFIGURE)
--	$(RM) $(CREATED_TAGS)
--
--info dvi:
--	-( cd doc && $(MAKE) $(MFLAGS) $@ )
--
--install-info:
--check:
--installcheck:
--
--dist:   force
--	@echo Readline distributions are created using $(srcdir)/support/mkdist.
--	@echo Here is a sample of the necessary commands:
--	@echo bash $(srcdir)/support/mkdist -m $(srcdir)/MANIFEST -s $(srcdir) -r $(RL_LIBRARY_NAME)-$(RL_LIBRARY_VERSION)
--	@echo tar cf $(RL_LIBRARY_NAME)-${RL_LIBRARY_VERSION}.tar ${RL_LIBRARY_NAME}-$(RL_LIBRARY_VERSION)
--	@echo gzip $(RL_LIBRARY_NAME)-$(RL_LIBRARY_VERSION).tar
--
--# Tell versions [3.59,3.63) of GNU make not to export all variables.
--# Otherwise a system limit (for SysV at least) may be exceeded.
--.NOEXPORT:
--
--# Dependencies
--bind.o: ansi_stdlib.h posixstat.h
--bind.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--bind.o: readline.h keymaps.h chardefs.h tilde.h
--bind.o: history.h
--callback.o: rlconf.h
--callback.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--callback.o: readline.h keymaps.h chardefs.h tilde.h
--complete.o: ansi_stdlib.h posixdir.h posixstat.h
--complete.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--complete.o: readline.h keymaps.h chardefs.h tilde.h
--display.o: ansi_stdlib.h posixstat.h
--display.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--display.o: tcap.h
--display.o: readline.h keymaps.h chardefs.h tilde.h
--display.o: history.h
--funmap.o: readline.h keymaps.h chardefs.h tilde.h
--funmap.o: rlconf.h ansi_stdlib.h
--funmap.o: ${BUILD_DIR}/config.h
--histexpand.o: ansi_stdlib.h
--histexpand.o: history.h histlib.h
--histexpand.o: ${BUILD_DIR}/config.h
--histfile.o: ansi_stdlib.h
--histfile.o: history.h histlib.h
--histfile.o: ${BUILD_DIR}/config.h
--history.o: ansi_stdlib.h
--history.o: history.h histlib.h
--history.o: ${BUILD_DIR}/config.h
--histsearch.o: ansi_stdlib.h
--histsearch.o: history.h histlib.h
--histsearch.o: ${BUILD_DIR}/config.h
--input.o: ansi_stdlib.h
--input.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--input.o: readline.h keymaps.h chardefs.h tilde.h
--isearch.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--isearch.o: readline.h keymaps.h chardefs.h tilde.h
--isearch.o: ansi_stdlib.h history.h
--keymaps.o: emacs_keymap.c vi_keymap.c
--keymaps.o: keymaps.h chardefs.h rlconf.h ansi_stdlib.h
--keymaps.o: readline.h keymaps.h chardefs.h tilde.h
--keymaps.o: ${BUILD_DIR}/config.h
--kill.o: ansi_stdlib.h
--kill.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--kill.o: readline.h keymaps.h chardefs.h tilde.h
--kill.o: history.h
--macro.o: ansi_stdlib.h
--macro.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--macro.o: readline.h keymaps.h chardefs.h tilde.h
--macro.o: history.h
--nls.o: ansi_stdlib.h
--nls.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--parens.o: rlconf.h
--parens.o: ${BUILD_DIR}/config.h
--parens.o: readline.h keymaps.h chardefs.h tilde.h
--readline.o: readline.h keymaps.h chardefs.h tilde.h
--readline.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--readline.o: history.h
--readline.o: posixstat.h ansi_stdlib.h posixjmp.h
--rltty.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--rltty.o: rltty.h
--rltty.o: readline.h keymaps.h chardefs.h tilde.h
--search.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--search.o: readline.h keymaps.h chardefs.h tilde.h
--search.o: ansi_stdlib.h history.h
--shell.o: ${BUILD_DIR}/config.h
--shell.o: ansi_stdlib.h
--signals.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--signals.o: readline.h keymaps.h chardefs.h tilde.h
--signals.o: history.h
--terminal.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--terminal.o: tcap.h
--terminal.o: readline.h keymaps.h chardefs.h tilde.h
--terminal.o: history.h
--tilde.o: ansi_stdlib.h
--tilde.o: ${BUILD_DIR}/config.h
--tilde.o: tilde.h
--undo.o: ansi_stdlib.h
--undo.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--undo.o: readline.h keymaps.h chardefs.h tilde.h
--undo.o: history.h
--util.o: posixjmp.h ansi_stdlib.h
--util.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--util.o: readline.h keymaps.h chardefs.h tilde.h
--vi_mode.o: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--vi_mode.o: readline.h keymaps.h chardefs.h tilde.h
--vi_mode.o: history.h ansi_stdlib.h
--xmalloc.o: ${BUILD_DIR}/config.h
--xmalloc.o: ansi_stdlib.h
--
--readline.o: $(srcdir)/readline.c
--vi_mode.o: $(srcdir)/vi_mode.c
--funmap.o: $(srcdir)/funmap.c
--keymaps.o: $(srcdir)/keymaps.c
--parens.o: $(srcdir)/parens.c
--search.o: $(srcdir)/search.c
--rltty.o: $(srcdir)/rltty.c
--complete.o: $(srcdir)/complete.c
--bind.o: $(srcdir)/bind.c
--isearch.o: $(srcdir)/isearch.c
--display.o: $(srcdir)/display.c
--signals.o: $(srcdir)/signals.c
--util.o: $(srcdir)/util.c
--kill.o: $(srcdir)/kill.c
--undo.o: $(srcdir)/undo.c
--macro.o: $(srcdir)/macro.c
--input.o: $(srcdir)/input.c
--callback.o: $(srcdir)/callback.c
--terminal.o: $(srcdir)/terminal.c
--nls.o: $(srcdir)/nls.c
--xmalloc.o: $(srcdir)/xmalloc.c
--history.o: $(srcdir)/history.c
--histexpand.o: $(srcdir)/histexpand.c
--histfile.o: $(srcdir)/histfile.c
--histsearch.o: $(srcdir)/histsearch.c
--shell.o: $(srcdir)/shell.c
--tilde.o: $(srcdir)/tilde.c
--
--bind.so: ansi_stdlib.h posixstat.h
--bind.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--bind.so: readline.h keymaps.h chardefs.h tilde.h
--bind.so: history.h
--callback.so: rlconf.h
--callback.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--callback.so: readline.h keymaps.h chardefs.h tilde.h
--complete.so: ansi_stdlib.h posixdir.h posixstat.h
--complete.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--complete.so: readline.h keymaps.h chardefs.h tilde.h
--display.so: ansi_stdlib.h posixstat.h
--display.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--display.so: tcap.h
--display.so: readline.h keymaps.h chardefs.h tilde.h
--display.so: history.h
--funmap.so: readline.h keymaps.h chardefs.h tilde.h
--funmap.so: rlconf.h ansi_stdlib.h
--funmap.so: ${BUILD_DIR}/config.h
--histexpand.so: ansi_stdlib.h
--histexpand.so: history.h histlib.h
--histexpand.so: ${BUILD_DIR}/config.h
--histfile.so: ansi_stdlib.h
--histfile.so: history.h histlib.h
--histfile.so: ${BUILD_DIR}/config.h
--history.so: ansi_stdlib.h
--history.so: history.h histlib.h
--history.so: ${BUILD_DIR}/config.h
--histsearch.so: ansi_stdlib.h
--histsearch.so: history.h histlib.h
--histsearch.so: ${BUILD_DIR}/config.h
--input.so: ansi_stdlib.h
--input.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--input.so: readline.h keymaps.h chardefs.h tilde.h
--isearch.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--isearch.so: readline.h keymaps.h chardefs.h tilde.h
--isearch.so: ansi_stdlib.h history.h
--keymaps.so: emacs_keymap.c vi_keymap.c
--keymaps.so: keymaps.h chardefs.h rlconf.h ansi_stdlib.h
--keymaps.so: readline.h keymaps.h chardefs.h tilde.h
--keymaps.so: ${BUILD_DIR}/config.h
--kill.so: ansi_stdlib.h
--kill.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--kill.so: readline.h keymaps.h chardefs.h tilde.h
--kill.so: history.h
--macro.so: ansi_stdlib.h
--macro.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--macro.so: readline.h keymaps.h chardefs.h tilde.h
--macro.so: history.h
--nls.so: ansi_stdlib.h
--nls.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--parens.so: rlconf.h
--parens.so: ${BUILD_DIR}/config.h
--parens.so: readline.h keymaps.h chardefs.h tilde.h
--readline.so: readline.h keymaps.h chardefs.h tilde.h
--readline.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--readline.so: history.h
--readline.so: posixstat.h ansi_stdlib.h posixjmp.h
--rltty.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--rltty.so: rltty.h
--rltty.so: readline.h keymaps.h chardefs.h tilde.h
--search.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--search.so: readline.h keymaps.h chardefs.h tilde.h
--search.so: ansi_stdlib.h history.h
--signals.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--signals.so: readline.h keymaps.h chardefs.h tilde.h
--signals.so: history.h
--terminal.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--terminal.so: tcap.h
--terminal.so: readline.h keymaps.h chardefs.h tilde.h
--terminal.so: history.h
--tilde.so: ansi_stdlib.h
--tilde.so: ${BUILD_DIR}/config.h
--tilde.so: tilde.h
--undo.so: ansi_stdlib.h
--undo.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--undo.so: readline.h keymaps.h chardefs.h tilde.h
--undo.so: history.h
--util.so: posixjmp.h ansi_stdlib.h
--util.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--util.so: readline.h keymaps.h chardefs.h tilde.h
--vi_mode.so: rldefs.h ${BUILD_DIR}/config.h rlconf.h
--vi_mode.so: readline.h keymaps.h chardefs.h tilde.h
--vi_mode.so: history.h ansi_stdlib.h
--xmalloc.so: ${BUILD_DIR}/config.h
--xmalloc.so: ansi_stdlib.h
--
--readline.o: readline.c
--vi_mode.o: vi_mode.c
--funmap.o: funmap.c
--keymaps.o: keymaps.c
--parens.o: parens.c
--search.o: search.c
--rltty.o: rltty.c
--complete.o: complete.c
--bind.o: bind.c
--isearch.o: isearch.c
--display.o: display.c
--signals.o: signals.c
--util.o: util.c
--kill.o: kill.c
--undo.o: undo.c
--macro.o: macro.c
--input.o: input.c
--callback.o: callback.c
--terminal.o: terminal.c
--nls.o: nls.c
--xmalloc.o: xmalloc.c
--history.o: history.c
--histexpand.o: histexpand.c
--histfile.o: histfile.c
--histsearch.o: histsearch.c
--shell.o: shell.c
--tilde.o: tilde.c
--
--readline.so: $(srcdir)/readline.c
--vi_mode.so: $(srcdir)/vi_mode.c
--funmap.so: $(srcdir)/funmap.c
--keymaps.so: $(srcdir)/keymaps.c
--parens.so: $(srcdir)/parens.c
--search.so: $(srcdir)/search.c
--rltty.so: $(srcdir)/rltty.c
--complete.so: $(srcdir)/complete.c
--bind.so: $(srcdir)/bind.c
--isearch.so: $(srcdir)/isearch.c
--display.so: $(srcdir)/display.c
--signals.so: $(srcdir)/signals.c
--util.so: $(srcdir)/util.c
--kill.so: $(srcdir)/kill.c
--undo.so: $(srcdir)/undo.c
--macro.so: $(srcdir)/macro.c
--input.so: $(srcdir)/input.c
--callback.so: $(srcdir)/callback.c
--terminal.so: $(srcdir)/terminal.c
--nls.so: $(srcdir)/nls.c
--xmalloc.so: $(srcdir)/xmalloc.c
--history.so: $(srcdir)/history.c
--histexpand.so: $(srcdir)/histexpand.c
--histfile.so: $(srcdir)/histfile.c
--histsearch.so: $(srcdir)/histsearch.c
--shell.so: $(srcdir)/shell.c
--tilde.so: $(srcdir)/tilde.c
--
--readline.so: readline.c
--vi_mode.so: vi_mode.c
--funmap.so: funmap.c
--keymaps.so: keymaps.c
--parens.so: parens.c
--search.so: search.c
--rltty.so: rltty.c
--complete.so: complete.c
--bind.so: bind.c
--isearch.so: isearch.c
--display.so: display.c
--signals.so: signals.c
--util.so: util.c
--kill.so: kill.c
--undo.so: undo.c
--macro.so: macro.c
--input.so: input.c
--callback.so: callback.c
--terminal.so: terminal.c
--nls.so: nls.c
--xmalloc.so: xmalloc.c
--history.so: history.c
--histexpand.so: histexpand.c
--histfile.so: histfile.c
--histsearch.so: histsearch.c
--shell.so: shell.c
--tilde.so: tilde.c
-+.include <bsd.lib.mk>
++	${LIBTOOL} --mode=install ${INSTALL_DATA} libreadline.la ${libdir}
++	${LIBTOOL} --mode=install ${INSTALL_DATA} libhistory.la ${libdir}
+ 	-( if test -d doc ; then \
+ 		cd doc && \
+ 		${MAKE} ${MFLAGS} infodir=$(infodir) $@; \
diff --git a/devel/readline/patches/patch-af b/devel/readline/patches/patch-af
deleted file mode 100644
index 7b22d02ffef..00000000000
--- a/devel/readline/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 10:40:28 agc Exp $
-
---- history.h	Thu Jul 23 12:13:23 1998
-+++ history.h	Thu May 22 22:37:53 1997
-@@ -22,6 +22,10 @@
- #ifndef _HISTORY_H_
- #define _HISTORY_H_
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #if !defined (_FUNCTION_DEF)
- #  define _FUNCTION_DEF
- typedef int Function ();
-@@ -219,5 +223,9 @@
-    history expansion should be treated as a special case for the calling
-    application and not expanded. */
- extern Function *history_inhibit_expansion_function;
-+
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif /* !_HISTORY_H_ */
diff --git a/devel/readline/patches/patch-ag b/devel/readline/patches/patch-ag
deleted file mode 100644
index 4fa02e9e503..00000000000
--- a/devel/readline/patches/patch-ag
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:28 agc Exp $
-
---- readline.h.orig	Mon Sep  8 21:00:15 1997
-+++ readline.h	Fri Jul 24 08:38:22 1998
-@@ -23,6 +23,10 @@
- #if !defined (_READLINE_H_)
- #define _READLINE_H_
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- #if defined (READLINE_LIBRARY)
- #  include "keymaps.h"
- #  include "tilde.h"
-@@ -411,6 +415,10 @@
- 
- #if !defined (savestring)
- extern char *savestring ();	/* XXX backwards compatibility */
-+#endif
-+
-+#ifdef __cplusplus
-+}
- #endif
- 
- #endif /* _READLINE_H_ */
diff --git a/devel/readline/patches/patch-ah b/devel/readline/patches/patch-ah
index 0f8cb5102e0..8609701dd46 100644
--- a/devel/readline/patches/patch-ah
+++ b/devel/readline/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 1999/02/23 18:56:59 sommerfe Exp $
+$NetBSD: patch-ah,v 1.2 1999/07/13 00:56:13 jlam Exp $
 
---- chardefs.h.~1~	Thu Sep 25 10:59:00 1997
-+++ chardefs.h	Tue Feb 23 13:47:23 1999
+--- chardefs.h.orig	Thu Sep 25 10:59:00 1997
++++ chardefs.h	Tue Jul  6 05:18:58 1999
 @@ -51,7 +51,7 @@
  #define meta_character_bit 0x080	    /* x0000000, must be on. */
  #define largest_char 255		    /* Largest character value. */
diff --git a/devel/readline/patches/patch-ai b/devel/readline/patches/patch-ai
new file mode 100644
index 00000000000..7f0952c5869
--- /dev/null
+++ b/devel/readline/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1999/07/13 00:56:14 jlam Exp $
+
+--- doc/hist.texinfo.orig	Thu Dec 31 12:04:50 1998
++++ doc/hist.texinfo	Tue Jul  6 13:29:26 1999
+@@ -11,7 +11,7 @@
+ @ifinfo
+ @dircategory Libraries
+ @direntry
+-* History: (history).       The GNU history library API
++* History: (history).		The GNU history library API
+ @end direntry
+ 
+ This document describes the GNU History library, a programming tool that
diff --git a/devel/readline/patches/patch-aj b/devel/readline/patches/patch-aj
new file mode 100644
index 00000000000..26085557ee7
--- /dev/null
+++ b/devel/readline/patches/patch-aj
@@ -0,0 +1,113 @@
+$NetBSD: patch-aj,v 1.1 1999/07/13 00:56:14 jlam Exp $
+
+--- /dev/null	Tue Jul  6 13:13:15 1999
++++ doc/rlman.texinfo	Tue Jul  6 13:29:43 1999
+@@ -0,0 +1,108 @@
++\input texinfo    @c -*-texinfo-*-
++@comment %**start of header (This is for running Texinfo on a region.)
++@setfilename readline.info
++@settitle GNU Readline Library
++@comment %**end of header (This is for running Texinfo on a region.)
++@synindex vr fn
++@setchapternewpage odd
++
++@include manvers.texinfo
++
++@ifinfo
++@dircategory Libraries
++@direntry
++* Readline: (readline).		The GNU readline library API
++@end direntry
++
++This document describes the GNU Readline Library, a utility which aids
++in the consistency of user interface across discrete programs that need
++to provide a command line interface.
++
++Copyright (C) 1988-1999 Free Software Foundation, Inc.
++
++Permission is granted to make and distribute verbatim copies of
++this manual provided the copyright notice and this permission notice
++pare preserved on all copies.
++
++@ignore
++Permission is granted to process this file through TeX and print the
++results, provided the printed document carries copying permission
++notice identical to this one except for the removal of this paragraph
++(this paragraph not being relevant to the printed manual).
++@end ignore
++
++Permission is granted to copy and distribute modified versions of this
++manual under the conditions for verbatim copying, provided that the entire
++resulting derived work is distributed under the terms of a permission
++notice identical to this one.
++
++Permission is granted to copy and distribute translations of this manual
++into another language, under the above conditions for modified versions,
++except that this permission notice may be stated in a translation approved
++by the Free Software Foundation.
++@end ifinfo
++
++@titlepage  
++@title GNU Readline Library
++@subtitle Edition @value{EDITION}, for @code{Readline Library} Version @value{VERSION}.
++@subtitle @value{UPDATE-MONTH}
++@author Brian Fox, Free Software Foundation
++@author Chet Ramey, Case Western Reserve University
++
++@page
++This document describes the GNU Readline Library, a utility which aids
++in the consistency of user interface across discrete programs that need
++to provide a command line interface.
++
++Published by the Free Software Foundation @*
++675 Massachusetts Avenue, @*
++Cambridge, MA 02139 USA
++
++Permission is granted to make and distribute verbatim copies of
++this manual provided the copyright notice and this permission notice
++are preserved on all copies.
++
++Permission is granted to copy and distribute modified versions of this
++manual under the conditions for verbatim copying, provided that the entire
++resulting derived work is distributed under the terms of a permission
++notice identical to this one.
++
++Permission is granted to copy and distribute translations of this manual
++into another language, under the above conditions for modified versions,
++except that this permission notice may be stated in a translation approved
++by the Free Software Foundation.
++
++@vskip 0pt plus 1filll
++Copyright @copyright{} 1988-1999 Free Software Foundation, Inc.
++@end titlepage
++
++@ifinfo
++@node Top
++@top GNU Readline Library
++
++This document describes the GNU Readline Library, a utility which aids
++in the consistency of user interface across discrete programs that need
++to provide a command line interface.
++
++@menu
++* Command Line Editing::	   GNU Readline User's Manual.
++* Programming with GNU Readline::  GNU Readline Programmer's Manual.
++* Concept Index::		   Index of concepts described in this manual.
++* Function and Variable Index::	   Index of externally visible functions
++				   and variables.
++@end menu
++@end ifinfo
++
++@include rluser.texinfo
++@include rltech.texinfo
++
++@node Concept Index
++@unnumbered Concept Index
++@printindex cp
++
++@node Function and Variable Index
++@unnumbered Function and Variable Index
++@printindex fn
++
++@contents
++@bye
diff --git a/devel/readline/patches/patch-ak b/devel/readline/patches/patch-ak
new file mode 100644
index 00000000000..aa74a2605ee
--- /dev/null
+++ b/devel/readline/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 1999/07/13 00:56:14 jlam Exp $
+
+--- doc/Makefile.in.orig	Thu Feb 18 12:24:36 1999
++++ doc/Makefile.in	Tue Jul  6 13:36:33 1999
+@@ -53,7 +53,7 @@
+ 	$(RM) $@
+ 	-${NROFF} -man $< > $@
+ 
+-all: info dvi html ps text
++all: info # dvi html ps text
+ nodvi: info html text
+ 
+ readline.dvi: $(RLSRC)
diff --git a/devel/readline/pkg/PLIST b/devel/readline/pkg/PLIST
index b31422c0cfb..88f47f59909 100644
--- a/devel/readline/pkg/PLIST
+++ b/devel/readline/pkg/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.5 1999/02/11 19:17:31 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/07/13 00:56:14 jlam Exp $
 include/readline/chardefs.h
 include/readline/history.h
 include/readline/keymaps.h
 include/readline/readline.h
+include/readline/rlstdc.h
+include/readline/rlconf.h
 include/readline/tilde.h
-lib/libreadline.a
-lib/libreadline_pic.a
-lib/libreadline.so.2.2
 lib/libhistory.a
-lib/libhistory_pic.a
-lib/libhistory.so.2.2
-@unexec install-info --delete %D/info/readline.info %D/info/dir
+lib/libhistory.so.4.0
+lib/libreadline.a
+lib/libreadline.so.4.0
 @unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
+@unexec install-info --delete %D/info/readline.info %D/info/dir
 info/history.info
-@exec install-info %D/info/readline.info %D/info/dir
+info/readline.info
 @exec install-info %D/info/history.info %D/info/dir
+@exec install-info %D/info/readline.info %D/info/dir
 man/man3/readline.3
 @dirrm include/readline