Update to cvs version 20060331, from Matthew Luckie <mjl@luckie.org.nz>.

The significant change is the incorporation of pkgsrc DragonFly patches.
Thanks to Joerg for this.

9 files changed, 6 insertions, 115 deletions

diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index 8ef384ab441..e7cad06570a 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/02/03 04:47:42 rpaulo Exp $
+# $NetBSD: Makefile,v 1.5 2006/04/20 22:57:06 rpaulo Exp $
 #
 
-DISTNAME=	scamper-cvs-20051128
+DISTNAME=	scamper-cvs-20060331
 PKGNAME=	${DISTNAME:S/-cvs//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.wand.net.nz/scamper/
diff --git a/net/scamper/distinfo b/net/scamper/distinfo
index ffbfafc8544..d573c23999e 100644
--- a/net/scamper/distinfo
+++ b/net/scamper/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/02/24 19:53:52 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/04/20 22:57:06 rpaulo 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
+SHA1 (scamper-cvs-20060331.tar.gz) = 516a7ccdb303052ab005c34621da2466f1b23b67
+RMD160 (scamper-cvs-20060331.tar.gz) = eabd6f3926408c0fb40b25b5b1ba501fa1c9e97a
+Size (scamper-cvs-20060331.tar.gz) = 157238 bytes
diff --git a/net/scamper/patches/patch-aa b/net/scamper/patches/patch-aa
deleted file mode 100644
index 84c035aa175..00000000000
--- a/net/scamper/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index a8492ff298b..00000000000
--- a/net/scamper/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 100e15b839b..00000000000
--- a/net/scamper/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index d50a49425af..00000000000
--- a/net/scamper/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$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
deleted file mode 100644
index aa8e29a1589..00000000000
--- a/net/scamper/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index e74861079e9..00000000000
--- a/net/scamper/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 6b639be6c5b..00000000000
--- a/net/scamper/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-