Link the readline library against the library that has the termcap

functions.  This corrects dependency_libs defined in libreadline.la.

Bump PKGREVISION.

3 files changed, 12 insertions, 11 deletions

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 6f3f2191764..f9f301f3df0 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2005/12/31 00:01:45 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/03/02 00:24:55 minskim Exp $
 #
 
 DISTNAME=	readline-5.1
 PKGNAME=	readline-5.1pl1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=readline/}
 
diff --git a/devel/readline/distinfo b/devel/readline/distinfo
index aa85a2e6d2d..e861ae79611 100644
--- a/devel/readline/distinfo
+++ b/devel/readline/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/12/31 00:01:45 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/03/02 00:24:55 minskim Exp $
 
 SHA1 (readline-5.1.tar.gz) = 4b2ee2bc9c6dd1d238c84a58f7e6db173600b850
 RMD160 (readline-5.1.tar.gz) = e7e755bcde7a38740dd0ef6fc10d66614b74ea21
@@ -6,4 +6,4 @@ Size (readline-5.1.tar.gz) = 2030276 bytes
 SHA1 (readline51-001) = 2d369ad65a8751d0a9721002c06e139afe35265b
 RMD160 (readline51-001) = 93dd36106f68682c4dc73a9b1ecf62bf7943fae4
 Size (readline51-001) = 2042 bytes
-SHA1 (patch-ae) = 92a6249e51d8e0cb0e159862a383ba7b785a33c0
+SHA1 (patch-ae) = b5956a7722a26a7394083fd81b741065436b2f68
diff --git a/devel/readline/patches/patch-ae b/devel/readline/patches/patch-ae
index 1604cc8bca5..d1abb898dcb 100644
--- a/devel/readline/patches/patch-ae
+++ b/devel/readline/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
+$NetBSD: patch-ae,v 1.12 2006/03/02 00:24:55 minskim Exp $
 
---- Makefile.in.orig	2004-04-22 16:44:37.000000000 -0400
+--- Makefile.in.orig	2005-05-08 01:11:23.000000000 +0000
 +++ Makefile.in
 @@ -18,6 +18,9 @@
  RL_LIBRARY_VERSION = @LIBVERSION@
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
  PACKAGE = @PACKAGE_NAME@
  VERSION = @PACKAGE_VERSION@
  
-@@ -92,9 +95,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
+@@ -94,9 +97,15 @@ GCC_LINT_CFLAGS = $(XCCFLAGS) $(GCC_LINT
  	${RM} $@
  	$(CC) -c $(CCFLAGS) $<
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
  
  # The C code source files for this library.
  CSOURCES = $(srcdir)/readline.c $(srcdir)/funmap.c $(srcdir)/keymaps.c \
-@@ -143,6 +152,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
+@@ -145,6 +154,8 @@ INSTALL_TARGETS = @STATIC_INSTALL_TARGET
  
  all: $(TARGETS)
  
@@ -37,14 +37,14 @@ $NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
  everything: all examples
  
  static: $(STATIC_LIBS)
-@@ -152,17 +163,31 @@ libreadline.a: $(OBJECTS)
+@@ -154,17 +165,31 @@ libreadline.a: $(OBJECTS)
  	$(AR) $(ARFLAGS) $@ $(OBJECTS)
  	-test -n "$(RANLIB)" && $(RANLIB) $@
  
 +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)
++	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
++		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +
  libhistory.a: $(HISTOBJ) xmalloc.o
  	$(RM) $@
@@ -69,7 +69,7 @@ $NetBSD: patch-ae,v 1.11 2004/11/14 06:16:49 jlam Exp $
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
  	$(CC) $(CCFLAGS) -o $@ ./examples/rl.c ./libreadline.a ${TERMCAP_LIB}
  
-@@ -241,6 +266,12 @@ install-shared: installdirs install-head
+@@ -243,6 +268,12 @@ install-shared: installdirs install-head
  uninstall-shared: maybe-uninstall-headers
  	-( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )