Add DragonFly support. Use kqueue also on NetBSD.

8 files changed, 110 insertions, 1 deletions

diff --git a/net/scamper/distinfo b/net/scamper/distinfo
index 993e6dcd5d3..ffbfafc8544 100644
--- a/net/scamper/distinfo
+++ b/net/scamper/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.2 2006/02/03 04:47:42 rpaulo Exp $
+$NetBSD: distinfo,v 1.3 2006/02/24 19:53:52 joerg Exp $
 
 SHA1 (scamper-cvs-20051128.tar.gz) = f7d9eceae17b16c226fe6312f45f7db8bb9514ca
 RMD160 (scamper-cvs-20051128.tar.gz) = 72a70fe392c20b25b50f01945d9d00d223c4d66f
 Size (scamper-cvs-20051128.tar.gz) = 155813 bytes
+SHA1 (patch-aa) = 0757790cd1b70d3624e9786512932f0e83bf85cf
+SHA1 (patch-ab) = d030f03cfd6c1381a31905e710abb7a33ca37816
+SHA1 (patch-ac) = 0db3f57b73c42cd17402756a8c1e51b8dcd127c5
+SHA1 (patch-ad) = 7cd762297366ae5de1ee86be8eb3aa169debc3c1
+SHA1 (patch-ae) = fba854f5648b8e50589de1b3caacbf81b9ec6bb1
+SHA1 (patch-af) = 85258f05042fc6a916256800ee91835292991f0b
+SHA1 (patch-ag) = b0c3b8186eaf148ff53786515408781bbb7483a1
diff --git a/net/scamper/patches/patch-aa b/net/scamper/patches/patch-aa
new file mode 100644
index 00000000000..84c035aa175
--- /dev/null
+++ b/net/scamper/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- utils.c.orig	2006-02-24 19:45:31.000000000 +0000
++++ utils.c
+@@ -28,7 +28,7 @@
+ #include <stdint.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define HAVE_SOCKADDR_SA_LEN
+ #endif
+ 
diff --git a/net/scamper/patches/patch-ab b/net/scamper/patches/patch-ab
new file mode 100644
index 00000000000..a8492ff298b
--- /dev/null
+++ b/net/scamper/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_rtsock.c.orig	2006-02-24 19:45:49.000000000 +0000
++++ scamper_rtsock.c
+@@ -59,7 +59,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define HAVE_BSD_ROUTE_SOCKET
+ #endif
+ 
diff --git a/net/scamper/patches/patch-ac b/net/scamper/patches/patch-ac
new file mode 100644
index 00000000000..100e15b839b
--- /dev/null
+++ b/net/scamper/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_privsep.c.orig	2006-02-24 19:46:04.000000000 +0000
++++ scamper_privsep.c
+@@ -32,7 +32,7 @@
+ #define HAVE_ACCRIGHTS
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define HAVE_SETPROCTITLE
+ #endif
+ 
diff --git a/net/scamper/patches/patch-ad b/net/scamper/patches/patch-ad
new file mode 100644
index 00000000000..d50a49425af
--- /dev/null
+++ b/net/scamper/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_icmp4.c.orig	2006-02-24 19:46:32.000000000 +0000
++++ scamper_icmp4.c
+@@ -268,7 +268,7 @@ uint16_t scamper_icmp4_icmp_ip_len(struc
+ 
+ #if defined(__linux__) || defined(__OpenBSD__) || defined(__sun__)
+   len = ntohs(icmp->icmp_ip.ip_len);
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+   if(icmp->icmp_type == ICMP_TIMXCEED)
+     {
+       if(icmp->icmp_code <= 1)
+@@ -298,7 +298,7 @@ uint16_t scamper_icmp4_icmp_ip_len(struc
+ 	case ICMP_UNREACH_HOST_PROHIB:
+ 	case ICMP_UNREACH_TOSHOST:
+ 
+-# if defined(__FreeBSD__) || defined(__APPLE__)
++# if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
+ 	case ICMP_UNREACH_HOST_PRECEDENCE:
+ 	case ICMP_UNREACH_PRECEDENCE_CUTOFF:
+ 	case ICMP_UNREACH_FILTER_PROHIB:
diff --git a/net/scamper/patches/patch-ae b/net/scamper/patches/patch-ae
new file mode 100644
index 00000000000..aa8e29a1589
--- /dev/null
+++ b/net/scamper/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_fds.c.orig	2006-02-24 19:47:02.000000000 +0000
++++ scamper_fds.c
+@@ -33,6 +33,10 @@
+ #if 0
+ #if defined(__FreeBSD__) && __FreeBSD_version >= 410000
+ #define HAVE_KQUEUE
++#elif defined(__DragonFly__)
++#define HAVE_KQUEUE
++#elif defined(__NetBSD__) && __NetBSD_Version >= 200000000
++#define HAVE_KQUEUE
+ #elif defined(__OpenBSD__) && OpenBSD >= 200105
+ #define HAVE_KQUEUE
+ #else
diff --git a/net/scamper/patches/patch-af b/net/scamper/patches/patch-af
new file mode 100644
index 00000000000..e74861079e9
--- /dev/null
+++ b/net/scamper/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_dl.c.orig	2006-02-24 19:47:53.000000000 +0000
++++ scamper_dl.c
+@@ -49,7 +49,7 @@
+ #include <stdint.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define HAVE_BPF
+ #endif
+ 
diff --git a/net/scamper/patches/patch-ag b/net/scamper/patches/patch-ag
new file mode 100644
index 00000000000..6b639be6c5b
--- /dev/null
+++ b/net/scamper/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2006/02/24 19:53:52 joerg Exp $
+
+--- scamper_addr2mac.c.orig	2006-02-24 19:48:36.000000000 +0000
++++ scamper_addr2mac.c
+@@ -15,7 +15,7 @@
+ #include <stdint.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ #define HAVE_BSD_ARPCACHE
+ #endif
+