Thu Dec 30 08:05:18 2010 UTC ()
Fixes build on DragonFly.
sendfile(2) of DragonFly is FreeBSD in origin.


(obache)
diff -r1.5 -r1.6 pkgsrc/benchmarks/netperf/distinfo
diff -r0 -r1.3 pkgsrc/benchmarks/netperf/patches/patch-ab
cvs diff -r1.5 -r1.6 pkgsrc/benchmarks/netperf/distinfo (expand / switch to unified diff)

--- pkgsrc/benchmarks/netperf/distinfo 2010/05/06 11:14:01 1.5
+++ pkgsrc/benchmarks/netperf/distinfo 2010/12/30 08:05:18 1.6
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.5 2010/05/06 11:14:01 adam Exp $ 1$NetBSD: distinfo,v 1.6 2010/12/30 08:05:18 obache Exp $
2 2
3SHA1 (netperf-2.4.5.tar.bz2) = ccfe3d11ce520c75dc394277b1bea49f353e032d 3SHA1 (netperf-2.4.5.tar.bz2) = ccfe3d11ce520c75dc394277b1bea49f353e032d
4RMD160 (netperf-2.4.5.tar.bz2) = 5791ebfcc798b968dd85e591bb96ade925208294 4RMD160 (netperf-2.4.5.tar.bz2) = 5791ebfcc798b968dd85e591bb96ade925208294
5Size (netperf-2.4.5.tar.bz2) = 960609 bytes 5Size (netperf-2.4.5.tar.bz2) = 960609 bytes
6SHA1 (patch-aa) = a910b966c414f3a7cd5b0d898726966e47969522 6SHA1 (patch-aa) = a910b966c414f3a7cd5b0d898726966e47969522
 7SHA1 (patch-ab) = 0c6114063e3bf0bf0875013aa55a03f7533ff9a6
7SHA1 (patch-ah) = 6ca99c4ce567ff2a36f49426e604c7bdfd31f02d 8SHA1 (patch-ah) = 6ca99c4ce567ff2a36f49426e604c7bdfd31f02d
8SHA1 (patch-ak) = 98228d85034878ff3f0c25bebcc80a6006a2f9f4 9SHA1 (patch-ak) = 98228d85034878ff3f0c25bebcc80a6006a2f9f4
File Added: pkgsrc/benchmarks/netperf/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.3 2010/12/30 08:05:18 obache Exp $

* sendfile(2) of DragonFly is FreeBSD in origin. 

--- src/nettest_bsd.c.orig	2009-06-04 00:31:15.000000000 +0000
+++ src/nettest_bsd.c
@@ -4372,7 +4372,7 @@ Size (bytes)\n\
       sv.sfv_off = send_ring->offset;
       sv.sfv_len =  send_ring->length;
       if ((len = sendfilev(send_socket, &sv, 1, &scratch_len)) != send_size)
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
 	/* so close to HP-UX and yet so far away... :) */
 	if ((sendfile(send_ring->fildes, 
 		      send_socket,