Jaromir Dolecek's readline package (PR 4915) is better than the one

in tree, so take the necessary elements from Jaromir's package:

+ build and install libhistory

+ build and install shared history and readline libraries.

+ install readline and history info pages with the correct names

Preserve change from the original package:

+ don't assume that the Makefile SHELL is Bourne shell - set it
explicitly, so that Bourne shell scripts aren't run by the csh(1)

5 files changed, 666 insertions, 34 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 81a30e78508..bc6f8f37e86 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -3,7 +3,7 @@
 # Date created:        			Fri Mar  6 19:07:28 GMT 1998
 # Whom:                			Alistair Crooks (agc@netbsd.org)
 #
-# $NetBSD: Makefile,v 1.2 1998/03/10 13:47:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/03/19 13:02:19 agc Exp $
 #
 
 DISTNAME=	readline-2.1
@@ -13,12 +13,19 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	packages@netbsd.org
 
 BUILD_DEPENDS=	${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
+RUN_DEPENDS=    ${PREFIX}/bin/install-info:${PORTSDIR}/devel/gtexinfo
 
 GNU_CONFIGURE=	yes
 
 MAN3=		readline.3
 
+SCRIPTS_ENV+=	PLIST_SRC="$(PLIST_SRC)"
+
+do-build:
+	(cd ${WRKSRC}; make LIB=readline)
+	(cd ${WRKSRC}; make LIB=history)
+
 post-install:
-	@install-info ${PREFIX}/info/readline.info ${PREFIX}/info/dir
+	@/sbin/ldconfig || /usr/bin/true
 
 .include <bsd.port.mk>
diff --git a/devel/readline/patches/patch-aa b/devel/readline/patches/patch-aa
index d44e3768153..cca6079b780 100644
--- a/devel/readline/patches/patch-aa
+++ b/devel/readline/patches/patch-aa
@@ -1,33 +1,181 @@
---- Makefile.in	1998/03/06 21:40:55	1.1
-+++ Makefile.in	1998/03/06 21:41:04
-@@ -34,6 +34,7 @@
- RM = rm -f
- CP = cp
- MV = mv
-+SHELL = /bin/sh
+--- display.c.old	Sat Jan 10 16:57:37 1998
++++ display.c	Sat Jan 10 17:06:06 1998
+@@ -622,7 +622,7 @@
+ 	      _rl_last_c_pos <= last_invisible && local_prompt)
+ 	    {
+ 	      if (term_cr)
+-		tputs (term_cr, 1, _rl_output_character_function);
++		tputs (term_cr, 1, (void *)_rl_output_character_function);
+ 	      _rl_output_some_chars (local_prompt, nleft);
+ 	      _rl_last_c_pos = nleft;
+ 	    }
+@@ -869,7 +869,7 @@
+       term_cr && lendiff > visible_length && _rl_last_c_pos > 0 &&
+       od > lendiff && _rl_last_c_pos < last_invisible)
+     {
+-      tputs (term_cr, 1, _rl_output_character_function);
++      tputs (term_cr, 1, (void *)_rl_output_character_function);
+       _rl_output_some_chars (local_prompt, lendiff);
+       _rl_last_c_pos = lendiff;
+     }
+@@ -1039,7 +1039,7 @@
+ #if defined (__MSDOS__)
+       putc ('\r', rl_outstream);
+ #else
+-      tputs (term_cr, 1, _rl_output_character_function);
++      tputs (term_cr, 1, (void *)_rl_output_character_function);
+ #endif /* !__MSDOS__ */
+       _rl_last_c_pos = 0;
+     }
+@@ -1097,14 +1097,14 @@
+     {
+       for (i = 0; i < delta; i++)
+ 	putc ('\n', rl_outstream);
+-      tputs (term_cr, 1, _rl_output_character_function);
++      tputs (term_cr, 1, (void *)_rl_output_character_function);
+       _rl_last_c_pos = 0;
+     }
+   else
+     {			/* delta < 0 */
+       if (term_up && *term_up)
+ 	for (i = 0; i < -delta; i++)
+-	  tputs (term_up, 1, _rl_output_character_function);
++	  tputs (term_up, 1, (void *)_rl_output_character_function);
+     }
+ #endif /* !__GO32__ */
+   _rl_last_v_pos = to;		/* Now TO is here */
+@@ -1316,7 +1316,7 @@
+ {
+ #if !defined (__GO32__)
+   if (term_clreol)
+-    tputs (term_clreol, 1, _rl_output_character_function);
++    tputs (term_clreol, 1, (void *)_rl_output_character_function);
+   else if (count)
+ #endif /* !__GO32__ */
+     space_to_eol (count);
+@@ -1341,7 +1341,7 @@
+ {
+ #if !defined (__GO32__)
+   if (term_clrpag)
+-    tputs (term_clrpag, 1, _rl_output_character_function);
++    tputs (term_clrpag, 1, (void *)_rl_output_character_function);
+   else
+ #endif /* !__GO32__ */
+     crlf ();
+@@ -1372,7 +1372,7 @@
+     {
+       char *buffer;
+       buffer = tgoto (term_IC, 0, count);
+-      tputs (buffer, 1, _rl_output_character_function);
++      tputs (buffer, 1, (void *)_rl_output_character_function);
+       _rl_output_some_chars (string, count);
+     }
+   else
+@@ -1381,14 +1381,14 @@
  
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-@@ -191,10 +192,10 @@
- 	done
- 	-$(MV) $(libdir)/libreadline.a $(libdir)/libreadline.old
- 	$(INSTALL_DATA) libreadline.a $(libdir)/libreadline.a
--	-test -n "$(RANLIB)" && -$(RANLIB) -t $(libdir)/libreadline.a
-+	-test -n "$(RANLIB)" && $(RANLIB) -t $(libdir)/libreadline.a
- 	-( if test -d doc ; then \
- 		cd doc && \
--		${MAKE} ${MFLAGS} infodir=$(infodir) INSTALL_DATA=$(INSTALL_DATA) $@; \
-+		${MAKE} ${MFLAGS} infodir=$(infodir) INSTALL_DATA="$(INSTALL_DATA)" $@; \
- 	  fi )
+       /* If we have to turn on insert-mode, then do so. */
+       if (term_im && *term_im)
+-	tputs (term_im, 1, _rl_output_character_function);
++	tputs (term_im, 1, (void *)_rl_output_character_function);
  
- installdirs: $(srcdir)/support/mkdirs
---- doc/Makefile.in	1998/03/06 22:28:22	1.1
-+++ doc/Makefile.in	1998/03/06 22:28:55
-@@ -10,6 +10,7 @@
- man3dir = $(mandir)/man3
+       /* If there is a special command for inserting characters, then
+ 	 use that first to open up the space. */
+       if (term_ic && *term_ic)
+ 	{
+ 	  for (i = count; i--; )
+-	    tputs (term_ic, 1, _rl_output_character_function);
++	    tputs (term_ic, 1, (void *)_rl_output_character_function);
+ 	}
  
- RM = rm -f
-+SHELL = /bin/sh
- 
- TEXINPUTDIR = $(srcdir)
+       /* Print the text. */
+@@ -1397,7 +1397,7 @@
+       /* If there is a string to turn off insert mode, we had best use
+ 	 it now. */
+       if (term_ei && *term_ei)
+-	tputs (term_ei, 1, _rl_output_character_function);
++	tputs (term_ei, 1, (void *)_rl_output_character_function);
+     }
+ #endif /* !__GO32__ */
+ }
+@@ -1426,13 +1426,13 @@
+     {
+       char *buffer;
+       buffer = tgoto (term_DC, count, count);
+-      tputs (buffer, count, _rl_output_character_function);
++      tputs (buffer, count, (void *)_rl_output_character_function);
+     }
+   else
+     {
+       if (term_dc && *term_dc)
+ 	while (count--)
+-	  tputs (term_dc, 1, _rl_output_character_function);
++	  tputs (term_dc, 1, (void *)_rl_output_character_function);
+     }
+ #endif /* !__GO32__ */
+ }
+@@ -1473,7 +1473,7 @@
+ {
+   if (term_cr)
+     {
+-      tputs (term_cr, 1, _rl_output_character_function);
++      tputs (term_cr, 1, (void *)_rl_output_character_function);
+       _rl_last_c_pos = 0;
+     }
+ }
+@@ -1488,14 +1488,14 @@
+      the right thing happens if we have wrapped to a new screen line. */
+   if (term_cr)
+     {
+-      tputs (term_cr, 1, _rl_output_character_function);
++      tputs (term_cr, 1, (void *)_rl_output_character_function);
+       _rl_last_c_pos = 0;
+       if (term_clreol)
+-	tputs (term_clreol, 1, _rl_output_character_function);
++	tputs (term_clreol, 1, (void *)_rl_output_character_function);
+       else
+ 	{
+ 	  space_to_eol (screenwidth);
+-	  tputs (term_cr, 1, _rl_output_character_function);
++	  tputs (term_cr, 1, (void *)_rl_output_character_function);
+ 	}
+       if (_rl_last_v_pos > 0)
+ 	_rl_move_vert (0);
+--- terminal.c.old	Sat Jan 10 17:13:57 1998
++++ terminal.c	Sat Jan 10 17:14:48 1998
+@@ -460,7 +460,7 @@
+ #if !defined (__GO32__)
+   if (term_backspace)
+     for (i = 0; i < count; i++)
+-      tputs (term_backspace, 1, _rl_output_character_function);
++      tputs (term_backspace, 1, (void *)_rl_output_character_function);
+   else
+ #endif /* !__GO32__ */
+     for (i = 0; i < count; i++)
+@@ -495,7 +495,7 @@
+ 	case VISIBLE_BELL:
+ 	  if (visible_bell)
+ 	    {
+-	      tputs (visible_bell, 1, _rl_output_character_function);
++	      tputs (visible_bell, 1, (void *)_rl_output_character_function);
+ 	      break;
+ 	    }
+ 	  /* FALLTHROUGH */
+@@ -530,7 +530,7 @@
+ _rl_enable_meta_key ()
+ {
+   if (term_has_meta && term_mm)
+-    tputs (term_mm, 1, outchar);
++    tputs (term_mm, 1, (void *)outchar);
+ }
  
+ void
+@@ -538,7 +538,7 @@
+      int on;
+ {
+   if (on && term_ks)
+-    tputs (term_ks, 1, outchar);
++    tputs (term_ks, 1, (void *)outchar);
+   else if (!on && term_ke)
+-    tputs (term_ke, 1, outchar);
++    tputs (term_ke, 1, (void *)outchar);
+ }
diff --git a/devel/readline/patches/patch-ab b/devel/readline/patches/patch-ab
new file mode 100644
index 00000000000..414d8ec9d3b
--- /dev/null
+++ b/devel/readline/patches/patch-ab
@@ -0,0 +1,444 @@
+--- Makefile.in.orig	Tue Jun  3 17:29:31 1997
++++ Makefile.in	Fri Jan 30 16:35:58 1998
+@@ -53,7 +53,7 @@
+ ETAGS = etags -tw
+ CTAGS = ctags -tw
+ 
+-CFLAGS = @CFLAGS@
++CFLAGS += @CFLAGS@
+ LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ @LOCAL_LDFLAGS@ @CFLAGS@
+@@ -64,51 +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:
+-	$(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.
+-LIBRARY_NAME = libreadline.a
+-SHARED_READLINE = libreadline.so.$(MAJOR)$(MINOR)
+-SHARED_HISTORY = libhistory.so.$(MAJOR)$(MINOR)
+-SHARED_LIBS = $(SHARED_READLINE) $(SHARED_HISTORY)
++MAJOR=		2
++MINOR=		1
+ 
+ # 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)/nls.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)/histfile.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 \
+@@ -116,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
+@@ -133,316 +101,35 @@
+ 
+ INSTALLED_HEADERS = readline.h chardefs.h keymaps.h history.h tilde.h
+ 
+-##########################################################################
++# 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
++
++install: ${INCSDIR} incinstall
++	make LIB=readline libinstall
++	make LIB=history libinstall
++	( cd doc; make install )
+ 
+-all: libreadline.a libhistory.a
+-shared: $(SHARED_LIBS)
++${INCSDIR}:
++	mkdir ${.TARGET}
+ 
+-libreadline.a: $(OBJECTS)
+-	$(RM) $@
+-	$(AR) cr $@ $(OBJECTS)
+-	-test -n "$(RANLIB)" && $(RANLIB) $@
+-
+-libhistory.a: $(HISTOBJ) xmalloc.o
+-	$(RM) $@
+-	$(AR) cr $@ $(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
+-
+-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) )
+-
+-force:
+-
+-install: installdirs libreadline.a
+-	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
+-	-( if test -d doc ; then \
+-		cd doc && \
+-		${MAKE} ${MFLAGS} infodir=$(infodir) INSTALL_DATA=$(INSTALL_DATA) $@; \
+-	  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 $(SHARED_LIBS)
+-
+-TAGS:	force
+-	$(ETAGS) $(CSOURCES) $(HSOURCES)
+-
+-tags:	force
+-	$(CTAGS) $(CSOURCES) $(HSOURCES)
+-
+-clean:	force
+-	$(RM) $(OBJECTS) *.a
+-	$(RM) $(SHARED_OBJ) $(SHARED_LIBS)
+-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
+-
+-mostlyclean: clean
+-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
+-
+-distclean maintainer-clean: clean
+-	-( cd doc && $(MAKE) $(MFLAGS) $@ )
+-	$(RM) Makefile
+-	$(RM) config.status config.h config.cache config.log 
+-	$(RM) stamp-config stamp-h
+-	$(RM) TAGS 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
+-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
+-
+-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.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
++.include <bsd.lib.mk>
+--- 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-ac b/devel/readline/patches/patch-ac
new file mode 100644
index 00000000000..a8b3d5ff513
--- /dev/null
+++ b/devel/readline/patches/patch-ac
@@ -0,0 +1,26 @@
+--- doc/rlman.texinfo.orig	Thu Mar 21 22:07:03 1996
++++ doc/rlman.texinfo	Thu Jan 15 14:19:07 1998
+@@ -2,6 +2,10 @@
+ @comment %**start of header (This is for running Texinfo on a region.)
+ @setfilename readline.info
+ @settitle GNU Readline Library
++@dircategory Programming & development tools
++@direntry
++* Readline: (readline).         GNU Readline Libary.
++@end direntry
+ @comment %**end of header (This is for running Texinfo on a region.)
+ @synindex vr fn
+ @setchapternewpage odd
+--- doc/hist.texinfo.old	Sat Jan 10 18:20:15 1998
++++ doc/hist.texinfo	Sat Jan 10 18:19:49 1998
+@@ -2,6 +2,10 @@
+ @c %**start of header (This is for running Texinfo on a region.)
+ @setfilename history.info
+ @settitle GNU History Library
++@dircategory Programming & development tools
++@direntry
++* History: (history).           GNU History Libary.
++@end direntry
+ @c %**end of header (This is for running Texinfo on a region.)
+ 
+ @setchapternewpage odd
diff --git a/devel/readline/pkg/PLIST b/devel/readline/pkg/PLIST
index b416a667488..ca2cfe47c7f 100644
--- a/devel/readline/pkg/PLIST
+++ b/devel/readline/pkg/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 1998/03/08 01:40:39 agc Exp $
-include/readline/readline.h
+@comment $NetBSD: PLIST,v 1.2 1998/03/19 13:02:20 agc Exp $
 include/readline/chardefs.h
-include/readline/keymaps.h
 include/readline/history.h
+include/readline/keymaps.h
+include/readline/readline.h
 include/readline/tilde.h
 lib/libreadline.a
+lib/libreadline_pic.a
+lib/libreadline.so.2.1
+lib/libhistory.a
+lib/libhistory_pic.a
+lib/libhistory.so.2.1
+@exec /sbin/ldconfig || /usr/bin/true
+@unexec /sbin/ldconfig || /usr/bin/true
 @unexec %D/bin/install-info --delete %D/info/readline.info %D/info/dir
 @unexec %D/bin/install-info --delete %D/info/history.info %D/info/dir
 info/readline.info