5 files changed, 75 insertions, 30 deletions
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index bd970951890..f1190b96ac2 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.3 2002/08/25 21:50:22 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2003/12/29 21:59:01 heas Exp $
 
---- ospfd/Makefile.am.orig	Wed Jun 19 04:06:08 2002
-+++ ospfd/Makefile.am	Wed Jul 10 08:34:31 2002
+--- ospfd/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ ospfd/Makefile.am	2003-12-21 02:06:15.000000000 +0000
 @@ -30,15 +30,17 @@
  
- EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
index ad13789d55a..1d8fb19b7e6 100644
--- a/net/zebra/patches/patch-ag
+++ b/net/zebra/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.4 2001/05/28 21:02:28 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2003/12/29 21:59:01 heas Exp $
 
---- configure.in.orig	Fri Jan 19 18:26:13 2001
-+++ configure.in	Mon May 28 16:27:43 2001
-@@ -185,7 +185,10 @@
+--- configure.ac.orig	2003-12-21 02:10:57.000000000 +0000
++++ configure.ac	2003-12-21 02:08:46.000000000 +0000
+@@ -200,7 +200,10 @@
  case "${enable_vtysh}" in
    "yes") VTYSH="vtysh";
-          AC_DEFINE(VTYSH)
+          AC_DEFINE(VTYSH,,VTY shell)
 -	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
 +	 AC_CHECK_LIB(termcap, tputs, ,
 +		AC_CHECK_LIB(tinfo, tputs, ,
diff --git a/net/zebra/patches/patch-ah b/net/zebra/patches/patch-ah
index b1a0854cd20..64c5c176702 100644
--- a/net/zebra/patches/patch-ah
+++ b/net/zebra/patches/patch-ah
@@ -1,25 +1,19 @@
-$NetBSD: patch-ah,v 1.1 2003/11/18 16:34:13 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2003/12/29 21:59:01 heas Exp $
 
---- lib/vty.c.orig	Sun Aug 18 16:49:50 2002
-+++ lib/vty.c
-@@ -1138,13 +1138,16 @@ vty_telnet_option (struct vty *vty, unsi
-       break;
-     case SE: 
-       {
--	char *buffer = (char *)vty->sb_buffer->head->data;
--	int length = vty->sb_buffer->length;
-+	char *buffer;
-+	int length;
+--- doc/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ doc/Makefile.am	2003-12-22 04:18:26.000000000 +0000
+@@ -6,7 +6,13 @@
+ 	ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \
+ 	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi vtysh.texi
  
--	if (buffer == NULL)
-+	if (!vty->iac_sb_in_progress)
- 	  return 0;
+-man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
++if V6_OPT
++V6_MANS = ospf6d.8 ripngd.8
++endif
++if VTY_OPT
++VTY_MANS = vtysh.1
++endif
++man_MANS = bgpd.8 ospfd.8 ripd.8 zebra.8 $(V6_MANS) $(VTY_MANS)
  
--	if (!vty->iac_sb_in_progress)
-+	buffer = (char *)vty->sb_buffer->head->data;
-+	length = vty->sb_buffer->length;
-+
-+	if (buffer == NULL)
- 	  return 0;
+ EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) 
  
- 	if (buffer[0] == '\0')
diff --git a/net/zebra/patches/patch-ai b/net/zebra/patches/patch-ai
new file mode 100644
index 00000000000..529c2b028e0
--- /dev/null
+++ b/net/zebra/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 2003/12/29 21:59:01 heas Exp $
+
+--- configure.ac.orig	2003-12-22 03:44:07.000000000 +0000
++++ configure.ac	2003-12-22 04:13:39.000000000 +0000
+@@ -216,6 +216,7 @@
+   "no" ) VTYSH="";;
+   *    ) ;;
+ esac
++AM_CONDITIONAL([VTY_OPT], [test "${enable_vtysh}" = yes])
+ 
+ dnl ----------
+ dnl PAM module
+@@ -511,6 +512,7 @@
+   AC_MSG_RESULT(IPv4 only)
+ fi
+ fi
++AM_CONDITIONAL([V6_OPT], [test "${enable_ipv6}" = yes])
+ 
+ dnl --------------------
+ dnl Daemon disable check
diff --git a/net/zebra/patches/patch-aj b/net/zebra/patches/patch-aj
new file mode 100644
index 00000000000..d6c51a0b73d
--- /dev/null
+++ b/net/zebra/patches/patch-aj
@@ -0,0 +1,31 @@
+$NetBSD: patch-aj,v 1.1 2003/12/29 21:59:01 heas Exp $
+
+--- vtysh/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ vtysh/Makefile.am	2003-12-24 19:40:34.000000000 +0000
+@@ -12,6 +12,7 @@
+ vtysh_LDADD = ../lib/libzebra.a
+ 
+ sysconf_DATA = vtysh.conf.sample
++INSTALL_SDATA=@INSTALL@ -m 600
+ 
+ EXTRA_DIST = extract.pl vtysh.conf.sample
+ 
+@@ -20,3 +21,18 @@
+ 
+ rebuild:
+ 	./extract.pl ../zebra/*.c ../ripd/*.c ../ripngd/*.c ../ospfd/*.c ../ospf6d/*.c ../bgpd/*.c ../lib/keychain.c ../lib/routemap.c ../lib/filter.c ../lib/plist.c ../lib/distribute.c > vtysh_cmd.c
++
++sysconfdatadir=$(datadir)/examples/zebra
++
++install-sysconfDATA: $(sysconf_DATA)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
++	@list='$(sysconf_DATA)'; for p in $$list; do \
++	  if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
++	  else if test -f $$p; then \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
++	  fi; fi; \
++	done