Sat Jan 1 12:42:28 2011 UTC ()
Fixes for DragonFly-2.8.2.


(obache)
diff -r1.3 -r1.4 pkgsrc/net/aoe-vblade/distinfo
diff -r1.2 -r1.3 pkgsrc/net/aoe-vblade/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/net/aoe-vblade/distinfo (expand / switch to unified diff)

--- pkgsrc/net/aoe-vblade/distinfo 2007/03/31 13:36:27 1.3
+++ pkgsrc/net/aoe-vblade/distinfo 2011/01/01 12:42:28 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2007/03/31 13:36:27 obache Exp $ 1$NetBSD: distinfo,v 1.4 2011/01/01 12:42:28 obache Exp $
2 2
3SHA1 (vblade-14.tgz) = 57bea505f3acb88f03f761954eea0759a0241e3f 3SHA1 (vblade-14.tgz) = 57bea505f3acb88f03f761954eea0759a0241e3f
4RMD160 (vblade-14.tgz) = ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c 4RMD160 (vblade-14.tgz) = ad0fe6f0c4ab40fa31daa68c7b14143ad87f443c
5Size (vblade-14.tgz) = 20317 bytes 5Size (vblade-14.tgz) = 20317 bytes
6SHA1 (patch-aa) = 0de85d0d4af15f874e17420ca70136a01955c87a 6SHA1 (patch-aa) = fe40105ed835cb54a23edb4861024f1d16ef1116
7SHA1 (patch-ab) = b7ab4ac144f885d9198d1efacd2089c7f4dcfb33 7SHA1 (patch-ab) = b7ab4ac144f885d9198d1efacd2089c7f4dcfb33
cvs diff -r1.2 -r1.3 pkgsrc/net/aoe-vblade/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/net/aoe-vblade/patches/patch-aa 2007/03/31 13:36:27 1.2
+++ pkgsrc/net/aoe-vblade/patches/patch-aa 2011/01/01 12:42:28 1.3
@@ -1,27 +1,50 @@ @@ -1,27 +1,50 @@
1$NetBSD: patch-aa,v 1.2 2007/03/31 13:36:27 obache Exp $ 1$NetBSD: patch-aa,v 1.3 2011/01/01 12:42:28 obache Exp $
2 2
3--- freebsd.c.orig 2006-11-13 18:57:34.000000000 +0000 3--- freebsd.c.orig 2006-11-13 18:57:34.000000000 +0000
4+++ freebsd.c 4+++ freebsd.c
5@@ -14,7 +14,12 @@ 5@@ -14,7 +14,12 @@
6 #include <sys/time.h> 6 #include <sys/time.h>
7  7
8 #include <netinet/in.h> 8 #include <netinet/in.h>
9+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
10+#include <net/if.h> 10+#include <net/if.h>
11+#include <net/if_ether.h> 11+#include <net/if_ether.h>
12+#else 12+#else
13 #include <net/ethernet.h> 13 #include <net/ethernet.h>
14+#endif 14+#endif
15 #include <net/bpf.h> 15 #include <net/bpf.h>
16 #include <net/if.h> 16 #include <net/if.h>
17 #include <net/if_arp.h> 17 #include <net/if_arp.h>
18@@ -27,6 +32,9 @@ 18@@ -26,7 +31,13 @@
 19 #include <net/if.h>
19 #include <sys/stat.h> 20 #include <sys/stat.h>
20 #include <sys/disklabel.h> 21 #include <sys/disklabel.h>
 22+#ifdef __DragonFly__
 23+#include <sys/disklabel32.h>
 24+#endif
21 #include <sys/select.h> 25 #include <sys/select.h>
22+#ifdef __NetBSD__ 26+#ifdef __NetBSD__
23+#include <sys/param.h> 27+#include <sys/param.h>
24+#endif 28+#endif
25 #include <sys/sysctl.h> 29 #include <sys/sysctl.h>
26  30
27 #include <fcntl.h> 31 #include <fcntl.h>
 32@@ -302,10 +313,18 @@ getsize(int fd)
 33 vlong size;
 34 struct stat s;
 35 int n;
 36+#ifdef __DragonFly__
 37+ struct disklabel32 lab;
 38+#else
 39 struct disklabel lab;
 40+#endif
 41
 42 // Try getting disklabel from block dev
 43+#ifdef __DragonFly__
 44+ if ((n = ioctl(fd, DIOCGDINFO32, lab)) != -1) {
 45+#else
 46 if ((n = ioctl(fd, DIOCGDINFO, lab)) != -1) {
 47+#endif
 48 size = lab.d_secsize * lab.d_secperunit;
 49 } else {
 50 // must not be a block special dev