Use buildlink.mk to get readline dependency, and use libedit readline

emulation where possible.  Only link readline into amrecover as it's the
only program that needs readline.

3 files changed, 34 insertions, 8 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index ec7e5a24a4e..7b4f700ff53 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/02/17 17:42:09 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/05/29 18:04:30 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -11,7 +11,6 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Client part of Amanda, a network backup system
 
-DEPENDS+=		readline>=4.0:../../devel/readline
 DEPENDS+=		gtar-1.12:../../archivers/gtar
 DEPENDS+=		amanda-common-2.4.2:../../sysutils/amanda-common
 
@@ -19,8 +18,24 @@ GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
+.include "../../devel/readline/buildlink.mk"
+
+CPPFLAGS+=		-I${BUILDLINK_INCDIR}
+LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 
 CONFIGURE_ARGS+=	--without-server --without-restore
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+# Prevent configure script from finding unnecessary libraries.  We'll patch
+# the amrecover Makefile to add the readline libraries as it's the only
+# program that uses readline.
+#
+CONFIGURE_ENV+=         ac_cv_lib_intl_main=no
+CONFIGURE_ENV+=         ac_cv_lib_termcap_tgetent=no
+CONFIGURE_ENV+=         ac_cv_lib_curses_tgetent=no
+CONFIGURE_ENV+=         ac_cv_lib_ncurses_tgetent=no
+CONFIGURE_ENV+=         ac_cv_lib_ncurses_tgetent=no
+CONFIGURE_ENV+=         ac_cv_lib_readline_readline=no
 
 BUILD_DEFS+=		AMANDA_USER AMANDA_SMB AMANDA_VAR
 
@@ -29,4 +44,6 @@ CONFIGURE_ARGS+=	--with-smbclient
 DEPENDS+=		samba>=2.0.0:../../net/samba
 .endif
 
+pre-configure: ${BUILDLINK_TARGETS}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo
index 159ce448f5f..699cd481675 100644
--- a/sysutils/amanda-client/distinfo
+++ b/sysutils/amanda-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:28:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/29 18:04:30 jlam Exp $
 
 SHA1 (amanda-2.4.2.tar.gz) = 2d22cc2d2527d1b192024fda65bc49747514e9c4
 Size (amanda-2.4.2.tar.gz) = 914760 bytes
@@ -6,4 +6,4 @@ SHA1 (patch-aa) = e4f33a5e1a26d41344e337d046389ab1a748d111
 SHA1 (patch-ab) = bbb9a77cf1780e123f40dea76386b0ea92ac5a70
 SHA1 (patch-ac) = 683fe415d41e3dfda354b6658c106e4b56976169
 SHA1 (patch-ad) = 995621a680f7e0fb550c8bfdd1a413441603295b
-SHA1 (patch-ae) = 46a0c9cb9106862b2fbdec506417e2714f046aac
+SHA1 (patch-ae) = 6bddd1b18c6a84cb2a9e2294180fe89abcc79998
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
index 2549de26d58..8265f067b76 100644
--- a/sysutils/amanda-client/patches/patch-ae
+++ b/sysutils/amanda-client/patches/patch-ae
@@ -1,16 +1,25 @@
-$NetBSD: patch-ae,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ae,v 1.5 2001/05/29 18:04:30 jlam Exp $
 
---- recover-src/Makefile.in~	Sat Nov 25 07:02:00 2000
-+++ recover-src/Makefile.in	Mon Jan 15 16:50:54 2001
+--- recover-src/Makefile.in.orig	Sat Nov 25 09:02:00 2000
++++ recover-src/Makefile.in	Tue May 29 12:32:35 2001
 @@ -158,7 +158,7 @@
  
  LDADD = @LEXLIB@ \
  	../client-src/libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+	-lamanda
++	-lamanda -lreadline -ltermcap
  
  
  amrecover_SOURCES = amrecover.c					\
+@@ -179,7 +179,7 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../config
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = @CPPFLAGS@ -DHAVE_LIBREADLINE
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ am_amrecover_OBJECTS =  amrecover.$(OBJEXT) display_commands.$(OBJEXT) \
 @@ -187,8 +187,7 @@
  uparse.$(OBJEXT) uscan.$(OBJEXT)
  amrecover_OBJECTS =  $(am_amrecover_OBJECTS)