Add DragonFly support. Remove conditonal Makefile code to handle

diffferent bsd.prog.mks, which doesn't matter for pkgsrc.

3 files changed, 87 insertions, 1 deletions

diff --git a/net/pim6dd/distinfo b/net/pim6dd/distinfo
index c9c0c01ca5f..4e7d2bb7939 100644
--- a/net/pim6dd/distinfo
+++ b/net/pim6dd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:14:00 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/02/24 20:17:55 joerg Exp $
 
 SHA1 (pim6dd-20031021a.tar.gz) = 7dac6a611433a4e0b643d3a8b9ff46267abdb6ff
 RMD160 (pim6dd-20031021a.tar.gz) = 27c55cfe054d8942d93e13a1289a6bd29a07a4dd
 Size (pim6dd-20031021a.tar.gz) = 84817 bytes
 SHA1 (patch-aa) = 8346bedaff00ed1b37226a5f53fb720890f19a68
+SHA1 (patch-ab) = 631ff729b8aad01d46b8443a4838d35b59725854
+SHA1 (patch-ac) = 26f35f12dcb070b9a4e4a15851678174681faff7
diff --git a/net/pim6dd/patches/patch-ab b/net/pim6dd/patches/patch-ab
new file mode 100644
index 00000000000..4b2bedf8d9e
--- /dev/null
+++ b/net/pim6dd/patches/patch-ab
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1 2006/02/24 20:17:55 joerg Exp $
+
+--- Makefile.orig	2006-02-24 20:08:55.000000000 +0000
++++ Makefile
+@@ -84,17 +84,8 @@ SRCS=	mld6.c mld6_proto.c\
+ 	inet6.c kern.c main.c config.c debug.c routesock.c vers.c callout.c\
+ 	route.c vif.c timer.c mrt.c pim6.c pim6_proto.c trace.c
+ 
+-.if (${OPSYS} == "BSD/OS")
+-CC=	gcc
+-.endif
+-.if (${OPSYS} != "NetBSD")
+-CFLAGS+=-Wall
+-.endif
+-.if (${OPSYS} != "NetBSD")
+-CFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET
+-.else
+ CPPFLAGS+=-DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET
+-.endif
++
+ .if exists(/usr/local/v6/lib/libinet6.a)
+ LDADD+=	-L${.OBJDIR}/../libinet6 -L${.OBJDIR}/../libinet6/obj \
+ 	-L/usr/local/v6/lib -linet6
+@@ -103,11 +94,6 @@ DPADD+= ${.OBJDIR}/../libinet6/libinet6.
+ 	/usr/local/v6/lib/libinet6.a
+ .endif
+ 
+-.if (${OPSYS} == "NetBSD") || (${OPSYS} == "OpenBSD")
+ MAN=	pim6dd.8 pim6dd.conf.5
+-.else
+-MAN5=	pim6dd.conf.5
+-MAN8=	pim6dd.8
+-.endif
+ 
+ .include <bsd.prog.mk>
diff --git a/net/pim6dd/patches/patch-ac b/net/pim6dd/patches/patch-ac
new file mode 100644
index 00000000000..d3ae8ff045b
--- /dev/null
+++ b/net/pim6dd/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2006/02/24 20:17:55 joerg Exp $
+
+--- defs.h.orig	2003-09-02 10:12:24.000000000 +0000
++++ defs.h
+@@ -70,7 +70,7 @@
+ #endif /* SYSV || __bsdi__ || SunOS 4.x */
+ #include <sys/time.h>
+ #include <net/if.h>
+-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
++#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD__ >= 3)
+ #include <net/if_var.h>
+ #endif /* __FreeBSD__ >= 3 */
+ #include <netinet/in.h>
+@@ -85,12 +85,16 @@
+ #ifdef __FreeBSD__      /* sigh */
+ #include <osreldate.h>
+ #endif /* __FreeBSD__ */
+-#if (defined(__bsdi__)) || (defined(__FreeBSD__) && (__FreeBSD_version >= 220000))
++#if (defined(__bsdi__)) || (defined(__FreeBSD__) && (__FreeBSD_version >= 220000)) || defined(__DragonFly__)
+ #define rtentry kernel_rtentry
+ #include <net/route.h>
+ #undef rtentry
+ #endif /* __bsdi__ or __FreeBSD_version >= 220000 */
++#if defined(__DragonFly__)
++#include <net/ip_mroute/ip_mroute.h>
++#else
+ #include <netinet/ip_mroute.h>
++#endif
+ #include <netinet6/ip6_mroute.h>
+ #include <strings.h>
+ #ifdef RSRR
+@@ -142,7 +146,7 @@ typedef void (*ihfunc_t) __P((int, fd_se
+ 
+ /* Versions of Solaris older than 2.6 don't have routing sockets. */
+ /* XXX TODO: check FreeBSD version and add all other platforms */
+-#if ((defined(SunOS) && SunOS >=56) || (defined __FreeBSD__) || (defined IRIX) || (defined __bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__))
++#if ((defined(SunOS) && SunOS >=56) || (defined __FreeBSD__) || (defined IRIX) || (defined __bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
+ #define HAVE_ROUTING_SOCKETS
+ #endif
+ 
+@@ -436,7 +440,7 @@ extern char	*net6name	__P((struct in6_ad
+ 
+ /* kern.c */
+ extern void     k_set_rcvbuf    __P((int socket, int bufsize, int minsize));
+-extern void     k_hdr_include   __P((int socket, int bool));
++extern void     k_hdr_include   __P((int socket, int));
+ extern void     k_set_hlim       __P((int socket, int t));
+ extern void     k_set_loop      __P((int socket, int l));
+ extern void     k_set_if        __P((int socket, u_int ifindex));