use 0.89.

+ OSPF works on x86 Solaris box.
+ OSPF neighbor is supported.
+ IPv6 inteface's address information propagation bug is fixed.
+ BGP's various MED comparison methods are added.
+ BGP read lock problem is fixed.
+ Zebra works on OpenBSD again.

s/CFLAGS/CPPFLAGS/, to make vtysh build successful.
From: Hal Snyder <hal@vailsys.com>

5 files changed, 16 insertions, 17 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 9e76840499b..d7194f2a857 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2000/08/27 08:32:55 itojun Exp $
+# $NetBSD: Makefile,v 1.26 2000/10/13 15:13:54 itojun Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	zebra-0.88
+DISTNAME=	zebra-0.89
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 # you might need debugging, it's a developer release !
@@ -14,11 +14,13 @@ HOMEPAGE=	http://www.zebra.org/
 BUILD_DEPENDS+=	automake:../../devel/automake
 BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
 
+.include "../../mk/bsd.prefs.mk"
+
 # 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
+CONFIGURE_ENV+=	LIBS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
 .else
 CONFIGURE_ARGS+=--disable-vtysh
 .endif
@@ -46,6 +48,7 @@ post-patch:
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 		${CAT} ${PKGDIR}/PLIST.vtysh >> ${PLIST_SRC}
 .endif
+		${ECHO} '@dirrm share/examples/zebra' >>${PLIST_SRC}
 
 pre-configure:
 		cd ${WRKSRC} && autoreconf
diff --git a/net/zebra/files/md5 b/net/zebra/files/md5
index e68aa3e43e3..e93195b77eb 100644
--- a/net/zebra/files/md5
+++ b/net/zebra/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.17 2000/08/18 02:42:07 itojun Exp $
+$NetBSD: md5,v 1.18 2000/10/13 15:13:54 itojun Exp $
 
-MD5 (zebra-0.88.tar.gz) = ef07727b0cf30baa0af125d9aa8b45ea
+MD5 (zebra-0.89.tar.gz) = 5f116ea08bfbbdb7be3f79cb786ea353
diff --git a/net/zebra/files/patch-sum b/net/zebra/files/patch-sum
index 2146b15ea63..ae8381546ef 100644
--- a/net/zebra/files/patch-sum
+++ b/net/zebra/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2000/08/27 08:32:56 itojun Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/13 15:13:54 itojun Exp $
 
 MD5 (patch-aa) = 60249b54ad575e635365d27d4b1dc422
 MD5 (patch-ab) = 5ef249301cffb83c38d3e3c5f3bd6ddf
@@ -6,4 +6,4 @@ MD5 (patch-ac) = 961be716df1d9495c1782859f1af783d
 MD5 (patch-ad) = 9a390dc0a8b8d8864eb7d2b219796742
 MD5 (patch-ae) = 50fc4fa9b9758a14e873080b015fc935
 MD5 (patch-af) = 1cda9baf2b79130ad73ad6e1ead070bb
-MD5 (patch-ag) = 38dbc2d75b4956dc78b0ad6a175c90a5
+MD5 (patch-ag) = 4f97c5e9c11198db74953b1797c8a8a8
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
index 7f3f218c842..b06b2b6e51b 100644
--- a/net/zebra/patches/patch-ag
+++ b/net/zebra/patches/patch-ag
@@ -1,11 +1,8 @@
-$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 @@
+$NetBSD: patch-ag,v 1.2 2000/10/13 15:13:54 itojun Exp $
+--- configure.in.orig	Wed Sep 27 19:02:51 2000
++++ configure.in	Sat Oct 14 00:02:09 2000
+@@ -155,3 +155,3 @@
           AC_DEFINE(VTYSH)
+-         AC_CHECK_LIB(ncurses, tputs)
 +         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 b/net/zebra/pkg/PLIST
index db76b9fbe5d..dd1a1499e86 100644
--- a/net/zebra/pkg/PLIST
+++ b/net/zebra/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/08/24 01:25:48 kim Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/10/13 15:13:55 itojun Exp $
 @unexec install-info --delete %D/info/zebra.info %D/info/dir
 info/zebra.info
 info/zebra.info-1
@@ -20,4 +20,3 @@ 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