Use buildlink.mk to get readline dependency and use ${BUILDLINK_INCDIR}

and ${BUILDLINK_LIBDIR} to find headers and libraries.  Also find tputs()
in termcap first, before looking in tinfo, curses, then ncurses.  Simplify
the PLIST handling by using space-separated list of PLIST files in
PLIST_SRC.

4 files changed, 41 insertions, 37 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 70e3d3e2081..b6ed7113313 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2001/03/27 03:20:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.37 2001/05/28 21:02:28 jlam Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -17,48 +17,48 @@ BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 .include "../../mk/bsd.prefs.mk"
 
-# libedit does not work due to missing functions.
+PLIST_SRC=		# empty
+
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
-DEPENDS+=	readline-*:../../devel/readline
-CONFIGURE_ARGS+=--enable-vtysh
-CONFIGURE_ENV+=	LIBS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
+USE_GNU_READLINE=	uses rl_pending_input
+.include "../../devel/readline/buildlink.mk"
+CONFIGURE_ARGS+=	--enable-vtysh
+CPPFLAGS+=		-I${BUILDLINK_INCDIR}
+LDFLAGS+=		-L${BUILDLINK_LIBDIR}
+PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
 .else
-CONFIGURE_ARGS+=--disable-vtysh
+CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=/etc/zebra
-USE_GTEXINFO=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--sysconfdir=/etc/zebra
+USE_GTEXINFO=		# defined
+USE_GMAKE=		# defined
 
-BUILD_DEFS+=	USE_INET6
+BUILD_DEFS+=		USE_INET6
 
 .if defined(USE_INET6) && ${USE_INET6} == YES
+PLIST_SRC+=		${PKGDIR}/PLIST.v6
 .else
-CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
+CONFIGURE_ARGS+=	--disable-ospf6d
+CONFIGURE_ARGS+=	--disable-ripngd
 .endif
-PLIST_SRC=	${WRKDIR}/PLIST
 
-post-patch:
-		${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-.if defined(USE_INET6) && ${USE_INET6} == YES
-		${CAT} ${PKGDIR}/PLIST.v6 >> ${PLIST_SRC}
-.endif
-.if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
-		${CAT} ${PKGDIR}/PLIST.vtysh >> ${PLIST_SRC}
-.endif
-		${ECHO} '@dirrm share/examples/zebra' >>${PLIST_SRC}
+PLIST_SRC+=		${PKGDIR}/PLIST
+
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		LIBS="${LDFLAGS} ${LIBS}"
 
-pre-configure:
-		cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
-#		cd ${WRKSRC} && ${LOCALBASE}/bin/automake
+pre-configure: ${BUILDLINK_TARGETS}
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
+#	cd ${WRKSRC} && ${LOCALBASE}/bin/automake
 
 #post-build:
-#		cd ${WRKSRC}/doc ; \
-#		${TOUCH} zebra.texi ; \
-#		makeinfo --no-split zebra.texi
+#	cd ${WRKSRC}/doc ; \
+#	${TOUCH} zebra.texi ; \
+#	makeinfo --no-split zebra.texi
 
 post-install:
-		@${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
+	@${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index 704f507a15b..14244871ee8 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:42 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/28 21:02:28 jlam Exp $
 
 SHA1 (zebra-0.91a.tar.gz) = e21ffff312a60fe8679b7c721dd62563c6dbf0f5
 Size (zebra-0.91a.tar.gz) = 1108955 bytes
@@ -8,4 +8,4 @@ SHA1 (patch-ac) = 4bdc7ded7d39702529f774b8a809d33898c5559e
 SHA1 (patch-ad) = 7a9a1daa024b9efacefb3c469bc86dbbc36af47c
 SHA1 (patch-ae) = 0d255facaacd0521d9e5fe31698c1f7f5d4c7f61
 SHA1 (patch-af) = b3b879e8932196a8e3e9f6fe92815a817223aceb
-SHA1 (patch-ag) = 9933b1d268c2c9df5c4e718f38b28594443d58c5
+SHA1 (patch-ag) = 62b5e4f28c1d13cb1f9c772250529aefe0511f90
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
index fbf7c905b02..ad13789d55a 100644
--- a/net/zebra/patches/patch-ag
+++ b/net/zebra/patches/patch-ag
@@ -1,13 +1,16 @@
-$NetBSD: patch-ag,v 1.3 2001/01/11 05:34:16 itojun Exp $
+$NetBSD: patch-ag,v 1.4 2001/05/28 21:02:28 jlam Exp $
 
---- configure.in.orig	Wed Jan 10 20:01:41 2001
-+++ configure.in	Thu Jan 11 13:57:58 2001
-@@ -193,7 +193,7 @@
+--- configure.in.orig	Fri Jan 19 18:26:13 2001
++++ configure.in	Mon May 28 16:27:43 2001
+@@ -185,7 +185,10 @@
  case "${enable_vtysh}" in
    "yes") VTYSH="vtysh";
           AC_DEFINE(VTYSH)
 -	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
-+	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(curses, tputs))
++	 AC_CHECK_LIB(termcap, tputs, ,
++		AC_CHECK_LIB(tinfo, tputs, ,
++		AC_CHECK_LIB(curses, tputs, ,
++		AC_CHECK_LIB(ncurses, tputs))))
           AC_CHECK_LIB(readline, main)
           if test $ac_cv_lib_readline_main = no; then
             AC_MSG_ERROR([vtysh needs libreadline but was not found on your system.])
diff --git a/net/zebra/pkg/PLIST b/net/zebra/pkg/PLIST
index 3cbb6743cd3..3c4a6f81b5b 100644
--- a/net/zebra/pkg/PLIST
+++ b/net/zebra/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/02/03 09:45:17 itojun Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/05/28 21:02:29 jlam Exp $
 @unexec install-info --delete %D/info/zebra.info %D/info/dir
 info/zebra.info
 @exec   install-info          %D/info/zebra.info %D/info/dir
@@ -16,3 +16,4 @@ share/examples/zebra/bgpd.conf.sample2
 share/examples/zebra/ospfd.conf.sample
 share/examples/zebra/ripd.conf.sample
 share/examples/zebra/zebra.conf.sample
+@dirrm share/examples/zebra