From 1ced15279c5db2284c068a5a92357faa4c53f8f5 Mon Sep 17 00:00:00 2001
From: sumikawa <sumikawa@FreeBSD.org>
Date: Tue, 11 Jan 2000 19:53:25 +0000
Subject: - Upgrade to 2.1.2a. - Make buildable on FreeBSD-current. Mrt has
 supported IPv6.

Approved by:	maintainer
---
 net/mrt/Makefile       |  3 ++-
 net/mrt/distinfo       |  2 +-
 net/mrt/files/patch-ad | 12 ++++++++++++
 net/mrt/files/patch-ae | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 net/mrt/files/patch-ad
 create mode 100644 net/mrt/files/patch-ae

(limited to 'net/mrt')

diff --git a/net/mrt/Makefile b/net/mrt/Makefile
index a038e783849..c9b82f7d0bd 100644
--- a/net/mrt/Makefile
+++ b/net/mrt/Makefile
@@ -15,8 +15,9 @@ MAINTAINER=	itojun@itojun.org
 
 WRKSRC=		${WRKDIR}/mrt-${VERBASE}/src
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 
-VERBASE=	1.5.1a
+VERBASE=	2.1.2a
 
 MAN8=	mrtd.8
 EXAMPLES=	programs/bgpsim/bgpsim.conf programs/bgpsim/bgpsim6.conf \
diff --git a/net/mrt/distinfo b/net/mrt/distinfo
index fc81d9f6b1e..4ad3bcdb608 100644
--- a/net/mrt/distinfo
+++ b/net/mrt/distinfo
@@ -1 +1 @@
-MD5 (mrt-1.5.1a-src.tar.gz) = 89c476ee662c4a0dfc5ce47a6cb7c860
+MD5 (mrt-2.1.2a-src.tar.gz) = 7973eb65900107b2b79bf7428be39344
diff --git a/net/mrt/files/patch-ad b/net/mrt/files/patch-ad
new file mode 100644
index 00000000000..972a6420eb4
--- /dev/null
+++ b/net/mrt/files/patch-ad
@@ -0,0 +1,12 @@
+--- include/igmp.h-	Tue Jan 11 14:30:14 2000
++++ include/igmp.h	Tue Jan 11 14:31:24 2000
+@@ -46,7 +46,9 @@
+ 
+ #ifdef HAVE_IPV6
+ #ifdef WIDE_IPV6
++#ifdef HAVE_MROUTING6
+ #include <netinet6/ip6_mroute.h>
++#endif /* HAVE_MROUTING6 */
+ #endif /* WIDE_IPV6 */
+ #ifndef sun
+ #include <netinet/ip6.h>
diff --git a/net/mrt/files/patch-ae b/net/mrt/files/patch-ae
new file mode 100644
index 00000000000..0af2ed8ae88
--- /dev/null
+++ b/net/mrt/files/patch-ae
@@ -0,0 +1,17 @@
+--- configure.in-	Tue Jan 11 10:30:49 2000
++++ configure.in	Tue Jan 11 14:38:08 2000
+@@ -549,10 +549,12 @@
+ #ifdef __KAME__
+ yes
+ #endif
+-], [  	    LIBS="$LIBS -L/usr/local/v6/lib -linet6"
++], [	AC_FILE_EXIST(/usr/local/v6/lib/libinet6.a, [
++            LIBS="$LIBS -L/usr/local/v6/lib -linet6"]);
++        AC_FILE_EXIST(/usr/include/netinet6/ip6_mroute.h, [
++            AC_DEFINE(HAVE_MROUTING6)]);
+             AC_DEFINE(WIDE_IPV6)
+             AC_DEFINE(RFC2292)
+-  	    AC_DEFINE(HAVE_MROUTING6)
+             AC_MSG_RESULT(yes... KAME IPv6)], 
+         AC_MSG_RESULT(*unknown*))))
+     ;;
-- 
cgit