enable "vtysh" build by make USE_ZEBRA_VTYSH (depends on readline).

stabilize build by requiring gmake.

4 files changed, 38 insertions, 9 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index e9fd38df5b4..9e76840499b 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/08/24 01:25:36 kim Exp $
+# $NetBSD: Makefile,v 1.25 2000/08/27 08:32:55 itojun Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -8,32 +8,47 @@ MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 # you might need debugging, it's a developer release !
 #CFLAGS+=	-g
 
-BUILD_DEPENDS+=	automake:../../devel/automake
-
 MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.zebra.org/
 
+BUILD_DEPENDS+=	automake:../../devel/automake
+BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
+
+# libedit does not work due to missing functions.
+.if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
+DEPENDS+=	readline-*:../../devel/readline
+CONFIGURE_ARGS+=--enable-vtysh
+CONFIGURE_ENV+=	LIBS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include
+.else
+CONFIGURE_ARGS+=--disable-vtysh
+.endif
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--sysconfdir=/etc/zebra
 USE_GTEXINFO=	yes
+USE_GMAKE=	yes
 
 BUILD_DEFS+=	USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_INET6) && ${USE_INET6} == YES
-PLIST_SRC=	${WRKSRC}/PLIST
 .else
 CONFIGURE_ARGS+=--disable-ospf6d --disable-ripngd
-PLIST_SRC=	${PKGDIR}/PLIST
 .endif
+PLIST_SRC=	${WRKDIR}/PLIST
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
 post-patch:
-		${CAT} ${PKGDIR}/PLIST.v6 ${PKGDIR}/PLIST > ${PLIST_SRC}
+		${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
 
-#pre-configure:
+pre-configure:
+		cd ${WRKSRC} && autoreconf
 #		cd ${WRKSRC} && automake
 
 #post-build:
diff --git a/net/zebra/files/patch-sum b/net/zebra/files/patch-sum
index f38a376fb1f..2146b15ea63 100644
--- a/net/zebra/files/patch-sum
+++ b/net/zebra/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/08/24 01:25:37 kim Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/27 08:32:56 itojun Exp $
 
 MD5 (patch-aa) = 60249b54ad575e635365d27d4b1dc422
 MD5 (patch-ab) = 5ef249301cffb83c38d3e3c5f3bd6ddf
@@ -6,3 +6,4 @@ MD5 (patch-ac) = 961be716df1d9495c1782859f1af783d
 MD5 (patch-ad) = 9a390dc0a8b8d8864eb7d2b219796742
 MD5 (patch-ae) = 50fc4fa9b9758a14e873080b015fc935
 MD5 (patch-af) = 1cda9baf2b79130ad73ad6e1ead070bb
+MD5 (patch-ag) = 38dbc2d75b4956dc78b0ad6a175c90a5
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
new file mode 100644
index 00000000000..7f3f218c842
--- /dev/null
+++ b/net/zebra/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 2000/08/27 08:32:56 itojun Exp $
+--- configure.in.orig	Thu Aug 17 02:32:30 2000
++++ configure.in	Tue Aug 22 18:27:42 2000
+@@ -148,2 +148,3 @@
+          AC_DEFINE(VTYSH)
++         AC_CHECK_LIB(curses, tputs)
+          AC_CHECK_LIB(readline, main)
+@@ -152,3 +153,2 @@
+          fi
+-         AC_CHECK_LIB(ncurses, tputs)
+          ;;
diff --git a/net/zebra/pkg/PLIST.vtysh b/net/zebra/pkg/PLIST.vtysh
new file mode 100644
index 00000000000..5e14fbc7c5e
--- /dev/null
+++ b/net/zebra/pkg/PLIST.vtysh
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.vtysh,v 1.1 2000/08/27 08:32:56 itojun Exp $
+bin/vtysh