Update to 0.99.22.3.

Update HOMEPAGE, MASTER_SITES.
Set USE_GNU_READLINE to catch up to 2012Q3 devel/readline builtin detection.

0.99.22.3 basically contains a security bugfix for OSPF-API.
0.99.22.2 was not released.
0.99.22.1 contains a few non-security bugfixes.

Changes in 0.99.22 since 0.99.21:

- [bgpd] The semantics of default-originate route-map have changed.
  The route-map is now used to advertise the default route conditionally.
  The old behaviour which allowed to set attributes on the originated
  default route is no longer supported.
- [bgpd] There is now a replace-as option to neighbor ... local-as ...
  no-prepend.  For details, refer to the user documentation.
- [zebra] An FPM interface has been added.  This provides an alternate
  interface to routing information and is geared at OpenFlow & co.
- [snmp] AgentX is now supported;  the old smux backend is considered
  deprecated.  ospf6d has also had OSPFV3-MIB added.
- [*] several issues with configuration save/load/apply have been fixed,
  in particular on ospf "max-metric router-lsa administrative" and
  "distribute-list", bgpd "no neighbor activate", isisd "metric-style",
- [*] a lot of bugs have been fixed, please refer to the git log

4 files changed, 15 insertions, 15 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 2560d943055..593e6072089 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2013/07/12 10:45:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2013/08/07 14:05:15 gdt Exp $
 #
 
-DISTNAME=	quagga-0.99.21
-PKGREVISION=	3
+DISTNAME=	quagga-0.99.22.3
 CATEGORIES=	net
-MASTER_SITES=	http://www.quagga.net/download/
+MASTER_SITES=	http://download.savannah.gnu.org/releases/quagga/
 
 MAINTAINER=	gdt@NetBSD.org
-HOMEPAGE=	http://www.quagga.net/
+HOMEPAGE=	http://www.nongnu.org/quagga/
 COMMENT=	Free multithreaded routing daemon software
 LICENSE=	gnu-gpl-v2
 
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index deb69e18f21..91838844a5a 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2013/05/20 13:49:07 fhajny Exp $
+$NetBSD: distinfo,v 1.17 2013/08/07 14:05:15 gdt Exp $
 
-SHA1 (quagga-0.99.21.tar.gz) = 9f9874ca1d044e00ce38f990aadeb1a7e486213c
-RMD160 (quagga-0.99.21.tar.gz) = 34d164b7e881b00e753df02b0efff7327fdc75de
-Size (quagga-0.99.21.tar.gz) = 2297174 bytes
-SHA1 (patch-configure) = 88a1707b8d765a0a0f1e2e9edab4cb274b2c4458
+SHA1 (quagga-0.99.22.3.tar.gz) = 80e2d32bb0a95d2e3e9c90f16618eee863202f85
+RMD160 (quagga-0.99.22.3.tar.gz) = 41fa875d1722af286621aa90b14b27a56e8d6c9d
+Size (quagga-0.99.22.3.tar.gz) = 2363963 bytes
+SHA1 (patch-configure) = a58a698ba9b8a174c3623a9cd4b52518e410c0df
diff --git a/net/quagga/options.mk b/net/quagga/options.mk
index b91149b66d2..776513483fb 100644
--- a/net/quagga/options.mk
+++ b/net/quagga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2013/07/15 02:02:27 ryoon Exp $
+# $NetBSD: options.mk,v 1.8 2013/08/07 14:05:15 gdt Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.quagga
 PKG_SUPPORTED_OPTIONS=	inet6
@@ -30,6 +30,7 @@ CONFIGURE_ARGS+=	--disable-ripngd
 ###
 .if !empty(PKG_OPTIONS:Mquagga-vtysh)
 # uses rl_pending_input
+USE_GNU_READLINE=	yes
 .  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-vtysh
 PLIST_CAT+=		${PKGDIR}/PLIST.vtysh
diff --git a/net/quagga/patches/patch-configure b/net/quagga/patches/patch-configure
index 0d218277e91..0738a474fc7 100644
--- a/net/quagga/patches/patch-configure
+++ b/net/quagga/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.2 2013/05/20 13:49:07 fhajny Exp $
+$NetBSD: patch-configure,v 1.3 2013/08/07 14:05:15 gdt Exp $
 
 Extend ip_mreq hack to DragonFlyBSD and SunOS.
---- configure.orig	2012-05-01 20:48:03.000000000 +0000
+--- configure.orig	2013-08-07 13:54:57.000000000 +0000
 +++ configure
-@@ -16472,6 +16472,8 @@ main ()
+@@ -16637,6 +16637,8 @@ main ()
  {
- #if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000)
+ #if (defined(__FreeBSD__) && ((__FreeBSD_version >= 500022 && __FreeBSD_version < 700000) || (__FreeBSD_version < 500000 && __FreeBSD_version >= 440000))) || (defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 106010000) || defined(__OpenBSD__) || defined(__APPLE__)
    return (0);
 +#elif defined(__DragonFly__) || defined(__sun)
 +  return (0);