- Update to 0.98.5

From the official site:
    0.98.5 from stable series is released fixing several bugs in ospfd and
    bgpd, most notably some crashes in ospfd and yet another route server
    functionality regression in bgpd.

PR:		ports/85461
Submitted by:	Boris Kovalenko <boris@tagnet.ru> (maintainer)

10 files changed, 14 insertions, 70 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 3c42ea517a3..f07c935e718 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.98.3
-PORTREVISION=	2
+PORTVERSION=	0.98.5
+PORTREVISION=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/
 
@@ -22,9 +22,9 @@ GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_REINPLACE=		yes
 INSTALLS_SHLIB=		yes
-USE_AUTOCONF_VER=	259
-USE_LIBTOOL_VER=	15
 USE_PERL5_BUILD=	yes
+USE_LIBTOOL_VER=	15
+LIBTOOLFILES=		configure
 
 MAN1=		vtysh.1
 MAN8=		bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
@@ -41,9 +41,12 @@ OPTIONS=	ISISD		"Enable experimental ISIS daemon"	off \
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga
+CONFIGURE_ARGS+=--includedir=${PREFIX}/include --enable-exampledir=${PREFIX}/share/examples/quagga \
+		--program-transform-name=""
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
+		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
+		LIBTOOL_VERSION=${LIBTOOL_VERSION}
 
 .if !defined(ENABLE_USER)
 ENABLE_USER=quagga
@@ -125,10 +128,10 @@ LIB_DEPENDS+=netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp:install
 
 .if defined(WITH_TCPMD5) && !defined(WITHOUT_TCPMD5)
 .if ${OSVERSION} < 491000
-BROKEN=	This version of FreeBSD does not have TCP MD5 signature support
+BROKEN=	"This version of FreeBSD does not have TCP MD5 signature support"
 .endif
-CONFIGURE_ARGS+=--enable-tcp-signature
-EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-configure.ac ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.h
+EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.h
+CFLAGS+=	-DQUAGGA_TCP_MD5SIG
 .endif
 
 USE_RC_SUBR=	watchquagga.sh
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index dd8ee5a37c7..e761779dc8f 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,2 +1,2 @@
-MD5 (quagga-0.98.3.tar.gz) = 68be5e911e4d604c0f5959338263356e
-SIZE (quagga-0.98.3.tar.gz) = 2118348
+MD5 (quagga-0.98.5.tar.gz) = ec09c1ec624aea98e18aa19282666784
+SIZE (quagga-0.98.5.tar.gz) = 2018058
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgp_network.c b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgp_network.c
index 3d46b383bb0..3d46b383bb0 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgp_network.c
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgp_network.c
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgp_vty.c b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgp_vty.c
index 40852c334fc..40852c334fc 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgp_vty.c
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgp_vty.c
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgpd.c b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c
index 445a16577ee..445a16577ee 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgpd.c
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgpd.h b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h
index 92ffb01ab34..92ffb01ab34 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd::bgpd.h
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.h
diff --git a/net/quagga/files/extra-tcpmd5-patch-configure.ac b/net/quagga/files/extra-tcpmd5-patch-configure.ac
deleted file mode 100644
index 7de5b40a5ec..00000000000
--- a/net/quagga/files/extra-tcpmd5-patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.ac.orig	Fri Jan  7 06:03:14 2005
-+++ configure.ac	Fri Jan 28 17:52:57 2005
-@@ -204,6 +204,13 @@
-   AC_DEFINE(HAVE_IRDP,, IRDP )
- fi
- 
-+AC_ARG_ENABLE(tcp-signature,
-+[  --enable-tcp-signature        enable TCP MD5 checksum capability])
-+
-+if test "${enable_tcp_signature}" = "yes"; then
-+  AC_DEFINE(QUAGGA_TCP_MD5SIG,,TCP signatures)
-+fi
-+
- if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then
-   enable_user="quagga"
- elif test "${enable_user}" = "no"; then
diff --git a/net/quagga/files/extra-tcpmd5-patch-lib::sockopt.c b/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.c
index d44ec4949c0..d44ec4949c0 100644
--- a/net/quagga/files/extra-tcpmd5-patch-lib::sockopt.c
+++ b/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.c
diff --git a/net/quagga/files/extra-tcpmd5-patch-lib::sockopt.h b/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.h
index 495f26707b1..495f26707b1 100644
--- a/net/quagga/files/extra-tcpmd5-patch-lib::sockopt.h
+++ b/net/quagga/files/extra-tcpmd5-patch-lib-sockopt.h
diff --git a/net/quagga/files/patch-configure.ac b/net/quagga/files/patch-configure.ac
deleted file mode 100644
index 030a86a1974..00000000000
--- a/net/quagga/files/patch-configure.ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.ac.orig	Sun Nov  2 04:12:19 2003
-+++ configure.ac	Wed Dec  3 02:28:37 2003
-@@ -724,7 +724,7 @@
- dnl  AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
-   if test "${HAVE_SNMP}" = ""; then
-     old_libs="${LIBS}"
--    LIBS="-L/usr/lib"
-+    LIBS="-L/usr/lib -L/usr/local/lib"
-     unset ac_cv_lib_snmp_asn_parse_int
-     AC_CHECK_LIB(crypto, main, NEED_CRYPTO=yes, )
-     if test "${NEED_CRYPTO}" = ""; then
-@@ -765,7 +765,7 @@
-   fi
- 
-   if test "${HAVE_SNMP}" = "yes"; then
--    for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /dev/null
-+    for ac_snmp in /usr/include/net-snmp/library/asn1.h /usr/include/ucd-snmp/asn1.h /usr/local/include/ucd-snmp/asn1.h /usr/local/include/net-snmp/library/asn1.h /dev/null
-     do
-       test -f "${ac_snmp}" && break
-     done
-@@ -782,6 +782,13 @@
- 			LIBS="${LIBS} -lsnmp"
- 		  fi
-                   ;;
-+      /usr/local/include/net-snmp/*)
-+		  AC_DEFINE(HAVE_SNMP,,SNMP)
-+		  AC_DEFINE(HAVE_NETSNMP,,SNMP)
-+		  AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-+		  CFLAGS="${CFLAGS} -I/usr/local/include -I/usr/local/include/net-snmp -I/usr/local/include/net-snmp/library"
-+	          LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"
-+		  ;;
-       /usr/include/ucd-snmp/*) 
-                   AC_DEFINE(HAVE_SNMP,,SNMP)
-                   CFLAGS="${CFLAGS} -I/usr/include/ucd-snmp"
-@@ -794,7 +801,7 @@
-                   ;;
-       /usr/local/include/net-snmp/*)
-       		AC_DEFINE(HAVE_SNMP,,SNMP)
--      		AC_DEFINE(HAVE_NET_SNMP,,SNMP)
-+      		AC_DEFINE(HAVE_NETSNMP,,SNMP)
-       		AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-       		CFLAGS="${CFLAGS} -I/usr/local/include/net-snmp"
-       		LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"