summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorsalo <salo>2006-09-26 15:48:41 +0000
committersalo <salo>2006-09-26 15:48:41 +0000
commitb19fb9dd6b30ddb4e744e6baeec61b9985710a65 (patch)
treebbccf4c0ab7950020f3eca474a27467e26f57f19 /net
parentb776402ad9ab406238246e24cf078d40bac1f91d (diff)
downloadpkgsrc-b19fb9dd6b30ddb4e744e6baeec61b9985710a65.tar.gz
Remove zebra.
No longer developed upstream, literally for years. Vulnerable, nobody stepped up to fix it. Use net/quagga instead.
Diffstat (limited to 'net')
-rw-r--r--net/Makefile3
-rw-r--r--net/zebra/DESCR18
-rw-r--r--net/zebra/Makefile80
-rw-r--r--net/zebra/PLIST16
-rw-r--r--net/zebra/PLIST.v67
-rw-r--r--net/zebra/PLIST.vtysh4
-rw-r--r--net/zebra/distinfo15
-rw-r--r--net/zebra/patches/patch-aa27
-rw-r--r--net/zebra/patches/patch-ab27
-rw-r--r--net/zebra/patches/patch-ac27
-rw-r--r--net/zebra/patches/patch-ad27
-rw-r--r--net/zebra/patches/patch-ae27
-rw-r--r--net/zebra/patches/patch-af27
-rw-r--r--net/zebra/patches/patch-ag33
-rw-r--r--net/zebra/patches/patch-ah19
-rw-r--r--net/zebra/patches/patch-ai12
-rw-r--r--net/zebra/patches/patch-aj31
17 files changed, 1 insertions, 399 deletions
diff --git a/net/Makefile b/net/Makefile
index 5161881329a..dc0e7032e0f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.638 2006/09/07 10:09:38 rillig Exp $
+# $NetBSD: Makefile,v 1.639 2006/09/26 15:48:41 salo Exp $
#
COMMENT= Networking tools
@@ -503,6 +503,5 @@ SUBDIR+= yale-tftpd
SUBDIR+= yaz
SUBDIR+= ytalk
SUBDIR+= ywho
-SUBDIR+= zebra
.include "../mk/bsd.pkg.subdir.mk"
diff --git a/net/zebra/DESCR b/net/zebra/DESCR
deleted file mode 100644
index b6d1ce2f69a..00000000000
--- a/net/zebra/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-GNU Zebra is a free software (distributed under GNU Generic Public
-License) which manages TCP/IP based routing protocols.
-
-It supports BGP-4 protocol as described in RFC1771 (A Border Gateway
-Protocol 4) and RIPv1, RIPv2 and OSPFv2.
-
-Zebra uses multithread technology under multithread supported UNIX
-kernels. However it can be run under not-multithread supported
-UNIX kernels.
-
-Zebra is intended to be used as a Route Server and a Route Reflector.
-Zebra is not a toolkit, it provides full routing power under a new
-architecture.
-
-If you want to build with IPv6 support, install with:
- # make USE_INET6=YES install
-If you want to build vtysh, the Zebra integrated shell, install with:
- # make USE_ZEBRA_VTYSH=YES insatll
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
deleted file mode 100644
index 711ee902480..00000000000
--- a/net/zebra/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# $NetBSD: Makefile,v 1.75 2006/03/20 18:15:38 jlam 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.95
-PKGREVISION= 1
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \
- ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \
- ftp://ftp.sunet.se/pub/network/zebra/
-
-MAINTAINER= itojun@itojun.org
-HOMEPAGE= http://www.zebra.org/
-COMMENT= Free multithreaded routing daemon software
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-
-PKG_SYSCONFSUBDIR?= zebra
-EGDIR= ${PREFIX}/share/examples/zebra
-CONF_FILES= ${EGDIR}/bgpd.conf.sample ${PKG_SYSCONFDIR}/bgpd.conf \
- ${EGDIR}/ospfd.conf.sample ${PKG_SYSCONFDIR}/ospfd.conf \
- ${EGDIR}/ripd.conf.sample ${PKG_SYSCONFDIR}/ripd.conf \
- ${EGDIR}/zebra.conf.sample ${PKG_SYSCONFDIR}/zebra.conf
-# with optimization, the timer/scheduler (esp. for MRT dump rotation) appears
-# to have problems.
-CFLAGS+= -O0
-
-CONFLICTS+= quagga-[0-9]*
-
-PLIST_SRC= # empty
-INFO_FILES= # PLIST
-
-BUILD_DEFS+= USE_ZEBRA_VTYSH
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
-USE_GNU_READLINE= # uses rl_pending_input
-. include "../../devel/readline/buildlink3.mk"
-PLIST_SRC+= ${PKGDIR}/PLIST.vtysh
-CONFIGURE_ARGS+= --enable-vtysh
-CONF_FILES+= ${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf
-.else
-CONFIGURE_ARGS+= --disable-vtysh
-.endif
-
-USE_TOOLS+= automake gmake makeinfo
-
-.include "../../devel/readline/buildlink3.mk"
-
-BUILD_DEFS+= USE_INET6
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-PLIST_SRC+= ${PKGDIR}/PLIST.v6
-CONFIGURE_ARGS+= --enable-ipv6
-CONF_FILES+= ${EGDIR}/ospf6d.conf.sample ${PKG_SYSCONFDIR}/ospf6d.conf \
- ${EGDIR}/ripngd.conf.sample ${PKG_SYSCONFDIR}/ripngd.conf
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-CONFIGURE_ARGS+= --disable-ospf6d
-CONFIGURE_ARGS+= --disable-ripngd
-.endif
-
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-LIBS+= ${LDFLAGS}
-
-pre-configure:
- cd ${WRKSRC} && autoreconf --force
-# cd ${WRKSRC} && automake
-
-#post-build:
-# cd ${WRKSRC}/doc ; \
-# ${TOUCH} zebra.texi ; \
-# makeinfo zebra.texi
-
-post-install:
- @${CHMOD} a+r ${PREFIX}/share/examples/zebra/*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
deleted file mode 100644
index 56d8804ec4c..00000000000
--- a/net/zebra/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/20 18:15:38 jlam Exp $
-info/zebra.info
-man/man8/bgpd.8
-man/man8/ospfd.8
-man/man8/ripd.8
-man/man8/zebra.8
-sbin/bgpd
-sbin/ospfd
-sbin/ripd
-sbin/zebra
-share/examples/zebra/bgpd.conf.sample
-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
diff --git a/net/zebra/PLIST.v6 b/net/zebra/PLIST.v6
deleted file mode 100644
index 212e2bafe1c..00000000000
--- a/net/zebra/PLIST.v6
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.v6,v 1.2 2003/12/29 21:59:01 heas Exp $
-man/man8/ospf6d.8
-man/man8/ripngd.8
-sbin/ospf6d
-sbin/ripngd
-share/examples/zebra/ospf6d.conf.sample
-share/examples/zebra/ripngd.conf.sample
diff --git a/net/zebra/PLIST.vtysh b/net/zebra/PLIST.vtysh
deleted file mode 100644
index b1b1acbe1c7..00000000000
--- a/net/zebra/PLIST.vtysh
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.vtysh,v 1.2 2003/12/29 21:59:01 heas Exp $
-man/man1/vtysh.1
-bin/vtysh
-share/examples/zebra/vtysh.conf.sample
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
deleted file mode 100644
index 0e5598d5f11..00000000000
--- a/net/zebra/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.15 2005/12/19 14:03:26 joerg Exp $
-
-SHA1 (zebra-0.95.tar.gz) = 9e1cc85ba0c48a85ba24d3c3da623f43514a432a
-RMD160 (zebra-0.95.tar.gz) = e9ec551afcb5f1135158ae9ac3499fdebb691739
-Size (zebra-0.95.tar.gz) = 1379369 bytes
-SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
-SHA1 (patch-ab) = 7c907a3c17c34c4c1b8f6df82b479878723e5499
-SHA1 (patch-ac) = ce7d3d09b54b75f481de8a03e1f527df819f09a4
-SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
-SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
-SHA1 (patch-af) = 626f4caae8911a99b827134da444b722a73d2001
-SHA1 (patch-ag) = de7372c1db0f82691870c944df6ade6c3afaf63a
-SHA1 (patch-ah) = bd356b89afa623c9e2da5636c5a5b76be0b74fd4
-SHA1 (patch-ai) = c64ca5532cefb3187643b526c651b33c1d42d7bf
-SHA1 (patch-aj) = 03919029326d9dd94d2d9502299f1d2709e4a871
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
deleted file mode 100644
index fbda1e076a9..00000000000
--- a/net/zebra/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2002/08/25 21:50:21 jlam Exp $
-
---- bgpd/Makefile.am.orig Wed Jun 19 04:05:04 2002
-+++ bgpd/Makefile.am Wed Jul 10 08:34:31 2002
-@@ -30,15 +30,17 @@
-
- EXTRA_DIST = $(sysconf_DATA) BGP4-MIB.txt
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
deleted file mode 100644
index 41d786bcc3f..00000000000
--- a/net/zebra/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/08/11 11:14:06 adam Exp $
-
---- ospf6d/Makefile.am.orig 2004-12-11 02:01:08.000000000 +0000
-+++ ospf6d/Makefile.am
-@@ -36,15 +36,17 @@ sysconf_DATA = ospf6d.conf.sample
-
- EXTRA_DIST = $(sysconf_DATA)
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
deleted file mode 100644
index f1190b96ac2..00000000000
--- a/net/zebra/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/12/29 21:59:01 heas Exp $
-
---- 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 ChangeLog.opaque.txt
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
deleted file mode 100644
index 6705fdd2480..00000000000
--- a/net/zebra/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/08/25 21:50:22 jlam Exp $
-
---- ripd/Makefile.am.orig Wed Jun 19 04:06:18 2002
-+++ ripd/Makefile.am Wed Jul 10 08:34:31 2002
-@@ -23,15 +23,17 @@
-
- EXTRA_DIST = $(sysconf_DATA) RIPv2-MIB.txt
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
deleted file mode 100644
index 3e6705e6951..00000000000
--- a/net/zebra/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/08/25 21:50:22 jlam Exp $
-
---- ripngd/Makefile.am.orig Wed Jun 19 04:06:33 2002
-+++ ripngd/Makefile.am Wed Jul 10 08:34:31 2002
-@@ -23,15 +23,17 @@
-
- EXTRA_DIST = $(sysconf_DATA)
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
deleted file mode 100644
index 94f8c5d2428..00000000000
--- a/net/zebra/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.5 2005/08/11 11:14:06 adam Exp $
-
---- zebra/Makefile.am.orig 2004-04-28 16:05:31.000000000 +0000
-+++ zebra/Makefile.am
-@@ -44,15 +44,17 @@ EXTRA_DIST = $(sysconf_DATA) if_ioctl.c
- #client : client_main.o ../lib/libzebra.a
- # $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
-
-+sysconfdatadir=$(datadir)/examples/zebra
-+
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+ $(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
- @list='$(sysconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ 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)$(sysconfdir)/$$p"; \
-- $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
-+ echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
-+ $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
- fi; fi; \
- done
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
deleted file mode 100644
index b3158805bb5..00000000000
--- a/net/zebra/patches/patch-ag
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2005/08/11 11:14:06 adam Exp $
-
---- configure.ac.orig 2005-01-25 17:29:49.000000000 +0000
-+++ configure.ac
-@@ -211,6 +211,7 @@ case "$host" in
- AC_CHECK_LIB(kvm, main)
- ;;
- esac
-+AM_CONDITIONAL([VTY_OPT], [test "${enable_vtysh}" = yes])
-
- dnl ---------------------
- dnl Integrated VTY option
-@@ -219,8 +220,10 @@ case "${enable_vtysh}" in
- "yes")
- VTYSH="vtysh";
- AC_DEFINE(VTYSH,,VTY shell)
-- AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs, ,
-- AC_CHECK_LIB(termcap, 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.])
-@@ -501,6 +504,7 @@ else
- AC_MSG_RESULT(Linux IPv6)
- fi
- fi
-+AM_CONDITIONAL([V6_OPT], [test "${enable_ipv6}" = yes])
-
- if test "$zebra_cv_linux_ipv6" = "yes";then
- AC_DEFINE(HAVE_IPV6)
diff --git a/net/zebra/patches/patch-ah b/net/zebra/patches/patch-ah
deleted file mode 100644
index 64c5c176702..00000000000
--- a/net/zebra/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/12/29 21:59:01 heas Exp $
-
---- 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
-
--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)
-
- EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS)
-
diff --git a/net/zebra/patches/patch-ai b/net/zebra/patches/patch-ai
deleted file mode 100644
index 5f0618ce05e..00000000000
--- a/net/zebra/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/12/19 14:03:26 joerg Exp $
-
---- ospf6d/ospf6d.h.orig 2005-12-19 13:55:45.000000000 +0000
-+++ ospf6d/ospf6d.h
-@@ -25,7 +25,6 @@
- #define OSPF6_DAEMON_VERSION "0.9.7o"
-
- /* global variables */
--extern int errno;
- extern struct thread_master *master;
-
- #ifdef INRIA_IPV6
diff --git a/net/zebra/patches/patch-aj b/net/zebra/patches/patch-aj
deleted file mode 100644
index d6c51a0b73d..00000000000
--- a/net/zebra/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$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