[pkgsrc/trunk]: pkgsrc/net/mcast-tools Fix build on DragonFly. Fix PLIST. Bum...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b80bb0d26211
branches:  trunk
changeset: 536890:b80bb0d26211
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Dec 27 17:46:53 2007 +0000

description:
Fix build on DragonFly. Fix PLIST. Bump revision.

diffstat:

 net/mcast-tools/Makefile         |   3 ++-
 net/mcast-tools/PLIST            |   4 +++-
 net/mcast-tools/distinfo         |   4 +++-
 net/mcast-tools/patches/patch-aa |  14 ++++++++++++++
 net/mcast-tools/patches/patch-ab |  24 ++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 3 deletions(-)

diffs (88 lines):

diff -r 2ead217c99a0 -r b80bb0d26211 net/mcast-tools/Makefile
--- a/net/mcast-tools/Makefile  Thu Dec 27 17:26:52 2007 +0000
+++ b/net/mcast-tools/Makefile  Thu Dec 27 17:46:53 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/12/25 17:39:39 is Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/27 17:46:53 joerg Exp $
 
 DISTNAME=      mcast-tools-20061214
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mcast-tools/}
 
diff -r 2ead217c99a0 -r b80bb0d26211 net/mcast-tools/PLIST
--- a/net/mcast-tools/PLIST     Thu Dec 27 17:26:52 2007 +0000
+++ b/net/mcast-tools/PLIST     Thu Dec 27 17:46:53 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/10/11 19:14:20 is Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/27 17:46:53 joerg Exp $
 bin/mtrace6
 bin/mcastread
 bin/mcastsend
@@ -7,6 +7,8 @@
 man/man1/mcastsend.1
 man/man1/pim6stat.1
 man/man1/pmsft.1
+man/man5/pim6dd.conf.5
+man/man5/pim6sd.conf.5
 man/man8/mfc.8
 man/man8/mtrace6.8
 man/man8/pim6dd.8
diff -r 2ead217c99a0 -r b80bb0d26211 net/mcast-tools/distinfo
--- a/net/mcast-tools/distinfo  Thu Dec 27 17:26:52 2007 +0000
+++ b/net/mcast-tools/distinfo  Thu Dec 27 17:46:53 2007 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/10/11 19:14:20 is Exp $
+$NetBSD: distinfo,v 1.2 2007/12/27 17:46:53 joerg Exp $
 
 SHA1 (mcast-tools-20061214.tar.gz) = 7a494be18781fae17235942c0222e3db38a4f673
 RMD160 (mcast-tools-20061214.tar.gz) = 2fe4c53a6169cbb4fe84a829b18c907d26ec5f05
 Size (mcast-tools-20061214.tar.gz) = 395708 bytes
+SHA1 (patch-aa) = 35d3b217430f53277c0f410861a41fa5e7996dcc
+SHA1 (patch-ab) = f3308c254478b9e20a669ab9ea4fab98d7bdc65a
diff -r 2ead217c99a0 -r b80bb0d26211 net/mcast-tools/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/mcast-tools/patches/patch-aa  Thu Dec 27 17:46:53 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.1 2007/12/27 17:46:53 joerg Exp $
+
+--- mfc/mfc.h.orig     2007-12-27 15:47:26.000000000 +0000
++++ mfc/mfc.h
+@@ -40,6 +40,9 @@
+ #ifdef __linux__
+ #include <linux/mroute.h>
+ #include <linux/mroute6.h>
++#elif defined(__DragonFly__)
++#include <net/ip_mroute/ip_mroute.h>
++#include <netinet6/ip6_mroute.h>
+ #else
+ #include <netinet/ip_mroute.h>
+ #include <netinet6/ip6_mroute.h>
diff -r 2ead217c99a0 -r b80bb0d26211 net/mcast-tools/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/mcast-tools/patches/patch-ab  Thu Dec 27 17:46:53 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ab,v 1.1 2007/12/27 17:46:53 joerg Exp $
+
+--- pim6dd/defs.h.orig 2007-12-27 15:50:19.000000000 +0000
++++ pim6dd/defs.h
+@@ -87,12 +87,19 @@
+ #ifdef __FreeBSD__      /* sigh */
+ #include <osreldate.h>
+ #endif
++#ifdef __DragonFly__
++#include <net/route.h>
++#endif
+ #ifdef __FreeBSD__
+ #define rtentry kernel_rtentry
+ #include <net/route.h>
+ #undef rtentry
+ #endif
++#ifdef __DragonFly__
++#include <net/ip_mroute/ip_mroute.h>
++#else
+ #include <netinet/ip_mroute.h>
++#endif
+ #ifdef __linux__
+ #include <linux/mroute6.h>
+ #else