Update to 0.98.2. This is from riz AT boogers.sf.ca.us

via PR #29518 with some slight modifications. Also some review
by Greg Troxel (who is a quagga developer). This is based on the
pkgsrc-wip version.

This has many changes. But ChangeLog is incomplete.

This uses USE_LIBTOOL.
Uses rcd scripts provide from quagga distribution (are pkgsrc/NetBSD style).
Adds USE_ZEBRA_OSPF_OPAQUELSA build definition for --enable-opaque-lsa.

All patches removed.

15 files changed, 118 insertions, 254 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index fb4e5b5fac9..84346294002 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/12/29 15:31:24 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/02 19:15:07 reed Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	quagga-0.96.3
-PKGREVISION=	2
+DISTNAME=	quagga-0.98.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.quagga.net/download/
 
@@ -13,59 +12,89 @@ COMMENT=	Free multithreaded routing daemon software (fork of zebra)
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_BUILDLINK3=		yes
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK3=		YES
+GNU_CONFIGURE=		YES
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		YES
+
 PKG_SYSCONFSUBDIR?=	zebra
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--enable-exampledir=${PREFIX}/share/examples/quagga
+#CONFIGURE_ARGS+=	--enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/run/zebra
-# you might need debugging, it's a developer release !
-#CFLAGS+=	-g
 
 CONFLICTS+=		zebra-[0-9]*
 
-PLIST_SRC=		# empty
+PLIST_SRC=		${WRKDIR}/PLIST
+PLIST_CAT=		# empty
 
 INFO_FILES=	quagga.info
 
 USE_PKGINSTALL=	YES
+RCD_SCRIPTS=	zebra bgpd ospfd ripd
 PKG_GROUPS=	quagga
 PKG_USERS=	quagga:quagga
 
+# log_syslog.conf is used as a template for each config file
+.for _file_ in vtysh.conf zebra.conf bgpd.conf ospfd.conf ripd.conf
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/quagga/log_syslog.conf \
+			${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+.endfor
+.undef _file_
+
+BUILD_DEFS+=			USE_ZEBRA_VTYSH USE_ZEBRA_OSPF_OPAQUELSA
+USE_ZEBRA_VTYSH?=		YES
+USE_ZEBRA_OSPF_OPAQUELSA?=	YES
+
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 USE_GNU_READLINE=	# uses rl_pending_input
 .  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-vtysh
-PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
+PLIST_CAT+=		${PKGDIR}/PLIST.vtysh
 .else
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
-USE_GNU_TOOLS+=		make
+.if defined(USE_ZEBRA_OSPF_OPAQUELSA) && ${USE_ZEBRA_OSPF_OPAQUELSA} == "YES"
+CONFIGURE_ARGS+=	--enable-opaque-lsa
+PLIST_CAT+=		${PKGDIR}/PLIST.opaquelsa
+.endif
 
 BUILD_DEFS+=		USE_INET6
 
 .if defined(USE_INET6) && ${USE_INET6} == YES
-PLIST_SRC+=		${PKGDIR}/PLIST.v6
+PLIST_CAT+=		${PKGDIR}/PLIST.v6
+RCD_SCRIPTS+=		ospf6d ripngd
+.for _file_ in ospf6d.conf ripngd.conf
+CONF_FILES_PERMS+=	${PREFIX}/share/examples/quagga/log_syslog.conf \
+			${PKG_SYSCONFDIR}/${_file_} quagga quagga 0600
+.endfor
+.undef _file_
 .else
 CONFIGURE_ARGS+=	--disable-ospf6d
 CONFIGURE_ARGS+=	--disable-ripngd
 .endif
 
-PLIST_SRC+=		${PKGDIR}/PLIST
+PLIST_CAT+=		${PKGDIR}/PLIST
 
 LIBS+=			${LDFLAGS}
 
-pre-configure:
-	cd ${WRKSRC} && ${AUTORECONF} --force
-#	cd ${WRKSRC} && ${AUTOMAKE}
-
-#post-build:
-#	cd ${WRKSRC}/doc ; \
-#	${TOUCH} quagga.texi ; \
-#	${MAKEINFO} --no-split quagga.texi
+.for _script_ in ${RCD_SCRIPTS}
+RCD_SCRIPT_SRC.${_script_}?=	${WRKSRC}/pkgsrc/${_script_}.sh
+.endfor
 
 post-install:
 	@${CHMOD} a+r ${PREFIX}/share/examples/quagga/*
+	${INSTALL} -d -o quagga -g quagga -m 750 ${PKG_SYSCONFDIR}
+	${INSTALL_DATA} ${FILESDIR}/log_syslog.conf ${PREFIX}/share/examples/quagga
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quagga/mpls
+	${INSTALL_DATA} ${WRKSRC}/doc/BGP-TypeCode ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA} ${WRKSRC}/doc/draft-zebra-00.txt ${PREFIX}/share/doc/quagga
+	${INSTALL_DATA} ${WRKSRC}/doc/mpls/* ${PREFIX}/share/doc/quagga/mpls
+	${CAT} ${PLIST_CAT} > ${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} share/doc/quagga -type f -print ) >> ${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} share/doc/quagga -type d -print ) | \
+		${SED} -e 's/^/@dirrm /' | ${SORT} -r >> ${PLIST_SRC}
 
-.include "../../mk/automake.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/quagga/PLIST b/net/quagga/PLIST
index 3446ddeb49f..cfaff854ff7 100644
--- a/net/quagga/PLIST
+++ b/net/quagga/PLIST
@@ -1,27 +1,68 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/09 11:46:39 seb Exp $
-include/ospfd/ospf_api.h
-include/ospfd/ospf_asbr.h
-include/ospfd/ospf_dump.h
-include/ospfd/ospf_ism.h
-include/ospfd/ospf_lsa.h
-include/ospfd/ospf_lsdb.h
-include/ospfd/ospf_nsm.h
-include/ospfd/ospf_opaque.h
-include/ospfd/ospfd.h
-lib/libospf.a
-lib/libzebra.a
+@comment $NetBSD: PLIST,v 1.4 2005/03/02 19:15:07 reed Exp $
+include/quagga/buffer.h
+include/quagga/command.h
+include/quagga/distribute.h
+include/quagga/filter.h
+include/quagga/getopt.h
+include/quagga/hash.h
+include/quagga/if.h
+include/quagga/if_rmap.h
+include/quagga/jhash.h
+include/quagga/keychain.h
+include/quagga/linklist.h
+include/quagga/log.h
+include/quagga/md5-gnu.h
+include/quagga/memory.h
+include/quagga/network.h
+include/quagga/ospfd/ospf_api.h
+include/quagga/ospfd/ospf_asbr.h
+include/quagga/ospfd/ospf_dump.h
+include/quagga/ospfd/ospf_ism.h
+include/quagga/ospfd/ospf_lsa.h
+include/quagga/ospfd/ospf_lsdb.h
+include/quagga/ospfd/ospf_nsm.h
+include/quagga/ospfd/ospf_opaque.h
+include/quagga/ospfd/ospfd.h
+include/quagga/plist.h
+include/quagga/pqueue.h
+include/quagga/prefix.h
+include/quagga/privs.h
+include/quagga/routemap.h
+include/quagga/sigevent.h
+include/quagga/smux.h
+include/quagga/sockopt.h
+include/quagga/sockunion.h
+include/quagga/str.h
+include/quagga/stream.h
+include/quagga/table.h
+include/quagga/thread.h
+include/quagga/vector.h
+include/quagga/version.h
+include/quagga/vty.h
+include/quagga/zassert.h
+include/quagga/zclient.h
+include/quagga/zebra.h
+lib/libospf.la
+lib/libzebra.la
 man/man1/vtysh.1
 man/man8/bgpd.8
+man/man8/isisd.8
+man/man8/ospf6d.8
 man/man8/ospfd.8
 man/man8/ripd.8
+man/man8/ripngd.8
 man/man8/zebra.8
 sbin/bgpd
 sbin/ospfd
 sbin/ripd
+sbin/watchquagga
 sbin/zebra
 share/examples/quagga/bgpd.conf.sample
 share/examples/quagga/bgpd.conf.sample2
+share/examples/quagga/log_syslog.conf
+share/examples/quagga/ospfd.conf.sample
 share/examples/quagga/ripd.conf.sample
 share/examples/quagga/zebra.conf.sample
 @dirrm share/examples/quagga
-@dirrm include/ospfd
+@dirrm include/quagga/ospfd
+@dirrm include/quagga
diff --git a/net/quagga/PLIST.opaquelsa b/net/quagga/PLIST.opaquelsa
new file mode 100644
index 00000000000..b5adf848f40
--- /dev/null
+++ b/net/quagga/PLIST.opaquelsa
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.opaquelsa,v 1.1 2005/03/02 19:15:07 reed Exp $
+include/quagga/ospfapi/ospf_apiclient.h
+lib/libospfapiclient.la
+sbin/ospfclient
+@dirrm include/quagga/ospfapi
diff --git a/net/quagga/PLIST.v6 b/net/quagga/PLIST.v6
index 25361ddf188..8d884526cb4 100644
--- a/net/quagga/PLIST.v6
+++ b/net/quagga/PLIST.v6
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST.v6,v 1.1.1.1 2003/08/13 07:26:57 itojun Exp $
-man/man8/ospf6d.8
-man/man8/ripngd.8
+@comment $NetBSD: PLIST.v6,v 1.2 2005/03/02 19:15:07 reed Exp $
 sbin/ospf6d
 sbin/ripngd
 share/examples/quagga/ospf6d.conf.sample
diff --git a/net/quagga/PLIST.vtysh b/net/quagga/PLIST.vtysh
index 185a60cc11a..65bb66c0127 100644
--- a/net/quagga/PLIST.vtysh
+++ b/net/quagga/PLIST.vtysh
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.vtysh,v 1.1.1.1 2003/08/13 07:26:57 itojun Exp $
+@comment $NetBSD: PLIST.vtysh,v 1.2 2005/03/02 19:15:07 reed Exp $
 bin/vtysh
+share/examples/quagga/vtysh.conf.sample
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index 53cf2e3213c..11a1a869d86 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,13 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:14:02 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/02 19:15:07 reed Exp $
 
-SHA1 (quagga-0.96.3.tar.gz) = 0be8baf3c175ef8df31ec254009d8d7ac4ba412f
-RMD160 (quagga-0.96.3.tar.gz) = cf58a1a8328252f768c4694536834d1cdfb95123
-Size (quagga-0.96.3.tar.gz) = 1464239 bytes
-SHA1 (patch-aa) = b6ae546885a4101cce71e09f41bd509b3808ac8d
-SHA1 (patch-ab) = 5a88348acc8a93ab1fee94a25cb424f5754cb413
-SHA1 (patch-ac) = b0fb9f234c4eacfda0808496576037b63c4f3934
-SHA1 (patch-ad) = ac4ebd252cffa3f290fe76609004aaef0958dcf7
-SHA1 (patch-ae) = bd96350270d0bb09a549af02fd706a59f1dd6002
-SHA1 (patch-af) = 5b0e15f21e874273fbd120829708d7fd8d744605
-SHA1 (patch-ag) = 7f0265cd88e78b1b7e938a6d446f788242f7e886
-SHA1 (patch-ah) = a714f939352caca3ec60934532a6561d85446b3a
+SHA1 (quagga-0.98.2.tar.gz) = ac53eeac08c8c1b98c32481f60aa779f48f62f5e
+Size (quagga-0.98.2.tar.gz) = 2012251 bytes
diff --git a/net/quagga/files/log_syslog.conf b/net/quagga/files/log_syslog.conf
new file mode 100644
index 00000000000..2bb6a45c48b
--- /dev/null
+++ b/net/quagga/files/log_syslog.conf
@@ -0,0 +1,3 @@
+!
+log syslog
+!
diff --git a/net/quagga/patches/patch-aa b/net/quagga/patches/patch-aa
deleted file mode 100644
index 227fb71fce2..00000000000
--- a/net/quagga/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/13 07:26:57 itojun 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/quagga
-+
- 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/quagga/patches/patch-ab b/net/quagga/patches/patch-ab
deleted file mode 100644
index 4bdc97d5944..00000000000
--- a/net/quagga/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/08/13 07:26:57 itojun Exp $
-
---- ospf6d/Makefile.am.orig	Sat Jun 29 15:20:39 2002
-+++ ospf6d/Makefile.am	Wed Jul 10 08:34:31 2002
-@@ -34,15 +34,17 @@
- 
- EXTRA_DIST = $(sysconf_DATA)
- 
-+sysconfdatadir=$(datadir)/examples/quagga
-+
- 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/quagga/patches/patch-ac b/net/quagga/patches/patch-ac
deleted file mode 100644
index 583ef95ad3d..00000000000
--- a/net/quagga/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/08/13 07:26:57 itojun Exp $
-
---- ospfd/Makefile.am.orig	2003-06-05 12:07:34.000000000 +0900
-+++ ospfd/Makefile.am	2003-08-13 16:12:15.000000000 +0900
-@@ -34,15 +34,17 @@
- 
- EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
- 
-+sysconfdatadir=$(datadir)/examples/quagga
-+
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
--	@list='$(sysconf_DATA)'; for p in $$list; do \
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadatadir)
-+	@list='$(sysconfdata_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/quagga/patches/patch-ad b/net/quagga/patches/patch-ad
deleted file mode 100644
index 9c15667c99b..00000000000
--- a/net/quagga/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/08/13 07:26:57 itojun 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/quagga
-+
- 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/quagga/patches/patch-ae b/net/quagga/patches/patch-ae
deleted file mode 100644
index 0c2ca64ae42..00000000000
--- a/net/quagga/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/08/13 07:26:57 itojun 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/quagga
-+
- 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/quagga/patches/patch-af b/net/quagga/patches/patch-af
deleted file mode 100644
index 669df5a04d0..00000000000
--- a/net/quagga/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/08/13 07:26:58 itojun Exp $
-
---- zebra/Makefile.am.orig	Wed Jun 19 08:17:32 2002
-+++ zebra/Makefile.am	Wed Jul 10 08:34:31 2002
-@@ -43,15 +43,17 @@
- #client : client_main.o ../lib/libzebra.a
- #	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
- 
-+sysconfdatadir=$(datadir)/examples/quagga
-+
- 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/quagga/patches/patch-ag b/net/quagga/patches/patch-ag
deleted file mode 100644
index 9f0de29992f..00000000000
--- a/net/quagga/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2003/08/13 07:26:58 itojun Exp $
-
---- configure.ac-	2003-08-13 16:13:23.000000000 +0900
-+++ configure.ac	2003-08-13 16:13:35.000000000 +0900
-@@ -239,7 +239,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(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/quagga/patches/patch-ah b/net/quagga/patches/patch-ah
deleted file mode 100644
index 515c7407423..00000000000
--- a/net/quagga/patches/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/11/18 16:34:49 wiz Exp $
-
---- lib/vty.c.orig	Tue Jul 15 14:52:22 2003
-+++ lib/vty.c
-@@ -1140,13 +1140,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;
- 
--	if (buffer == NULL)
-+	if (!vty->iac_sb_in_progress)
- 	  return 0;
- 
--	if (!vty->iac_sb_in_progress)
-+	buffer = (char *)vty->sb_buffer->head->data;
-+	length = vty->sb_buffer->length;
-+
-+	if (buffer == NULL)
- 	  return 0;
- 
- 	if (buffer[0] == '\0')