[pkgsrc/trunk]: pkgsrc/net/wmnet Add DragonFly support.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd3279c770ca
branches:  trunk
changeset: 510072:cd3279c770ca
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Mar 23 17:36:16 2006 +0000

description:
Add DragonFly support.

diffstat:

 net/wmnet/distinfo         |   8 ++++----
 net/wmnet/patches/patch-ab |   4 ++--
 net/wmnet/patches/patch-ac |  39 ++++++++++++++++++++++++---------------
 net/wmnet/patches/patch-ad |   4 ++--
 4 files changed, 32 insertions(+), 23 deletions(-)

diffs (147 lines):

diff -r 6016facfbe18 -r cd3279c770ca net/wmnet/distinfo
--- a/net/wmnet/distinfo        Thu Mar 23 17:31:05 2006 +0000
+++ b/net/wmnet/distinfo        Thu Mar 23 17:36:16 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/03/23 17:36:16 joerg Exp $
 
 SHA1 (wmnet-1.06.tar.gz) = 978364e0ab45c71730c196334e8fced4ac0a7853
 RMD160 (wmnet-1.06.tar.gz) = a6ac89507370acecc9673f52fd26ae896cc5da5c
 Size (wmnet-1.06.tar.gz) = 27506 bytes
 SHA1 (patch-aa) = d999f66818c05f2f9a58571abc0e548bb2938a4b
-SHA1 (patch-ab) = 2c2fbc065a49bc27dd42660dda23393e02269714
-SHA1 (patch-ac) = f8793a06cdf4ffd9e852dd802054734a566edb30
-SHA1 (patch-ad) = f66a39da4381feca668bde9bd5768c2e214868f6
+SHA1 (patch-ab) = 6a4b975a41204e7173c6f089052f2fbea8580484
+SHA1 (patch-ac) = 56250d7326159ccf3842ebe51bfcca478e8590d4
+SHA1 (patch-ad) = af762eb5d6d29685db4d9fc5f3464931e58e8b71
 SHA1 (patch-ae) = 09d413422b0074c29da7c8a9c271d9ddb2be04fb
 SHA1 (patch-af) = 70c0917b465acf778b6b744bef587bc8e41e49fb
diff -r 6016facfbe18 -r cd3279c770ca net/wmnet/patches/patch-ab
--- a/net/wmnet/patches/patch-ab        Thu Mar 23 17:31:05 2006 +0000
+++ b/net/wmnet/patches/patch-ab        Thu Mar 23 17:36:16 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2002/07/18 12:57:57 seb Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/23 17:36:16 joerg Exp $
 
 --- config.h.orig      Fri May  5 02:34:29 2000
 +++ config.h   Mon Jul  8 16:44:18 2002
 @@ -1,4 +1,4 @@
 -#if defined (__FreeBSD__) || defined (__OpenBSD__)
-+#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined(__DragonFly__)
  
  /* Our only FreeBSD driver, this goes straight into kernel memory 
   * and reads the raw structures from right underneath the kernel using the
diff -r 6016facfbe18 -r cd3279c770ca net/wmnet/patches/patch-ac
--- a/net/wmnet/patches/patch-ac        Thu Mar 23 17:31:05 2006 +0000
+++ b/net/wmnet/patches/patch-ac        Thu Mar 23 17:36:16 2006 +0000
@@ -1,24 +1,33 @@
-$NetBSD: patch-ac,v 1.4 2002/07/18 12:57:57 seb Exp $
+$NetBSD: patch-ac,v 1.5 2006/03/23 17:36:16 joerg Exp $
 
---- drivers.c.orig     Fri May  5 02:34:29 2000
-+++ drivers.c  Mon Jul  8 16:50:15 2002
-@@ -37,7 +37,15 @@
+--- drivers.c.orig     2000-05-05 00:34:29.000000000 +0000
++++ drivers.c
+@@ -24,6 +24,9 @@
+ /* For FreeBSD */
+ #ifdef USE_KVM
+ #include<net/if.h>
++#if defined(__DragonFly__)
++#include <net/if_var.h>
++#endif
+ #include<kvm.h>
+ #include<nlist.h>
+ 
+@@ -37,6 +40,14 @@ int kvm_test(void);
  int kvm_updateStats(void);
  #endif /* USE_KVM */
  
 +/* For Solaris */
 +#ifdef USE_KSTAT
 +#include <kstat.h>
- 
++
 +int kstat_test(void);
 +int kstat_updateStats(void);
 +#endif /* USE_KSTAT */
 +
-+
+ 
  #ifdef USE_LINUX_PPP
  #include<net/ppp_defs.h>
- 
-@@ -57,7 +65,7 @@
+@@ -57,7 +68,7 @@ static struct ifpppstatsreq ppp_stats_re
  #define ACCOUNT_IN_FOUND        1
  #define ACCOUNT_OUT_FOUND       2
  
@@ -27,7 +36,7 @@
  extern char *in_rule_string, *out_rule_string, *device;
  extern unsigned long totalbytes_in, totalbytes_out, lastbytes_in, lastbytes_out;
  extern unsigned long totalpackets_in, totalpackets_out, lastpackets_in, lastpackets_out;
-@@ -104,6 +112,9 @@
+@@ -104,6 +115,9 @@ static struct drivers_struct {
  #ifdef USE_KVM
   {"kmem",kvm_updateStats, kvm_test},
  #endif
@@ -37,7 +46,7 @@
   {NULL, NULL}
  };
  
-@@ -445,7 +456,7 @@
+@@ -445,7 +459,7 @@ int kvm_test(void) {
    if (((kvmfd = kvm_open(NULL, NULL, NULL, O_RDONLY, buffer)) == NULL) ||
        (kvm_nlist(kvmfd, symbols) < 0) ||
        kvm_read(kvmfd, (unsigned long)symbols[0].n_value, &ifnet_savedaddr, sizeof(unsigned long)) == -1 ) return False;
@@ -46,25 +55,25 @@
    fprintf(stderr, "wmnet: using kmem driver to monitor %s\n", device);
    return True;
  }
-@@ -457,7 +468,7 @@
+@@ -457,7 +471,7 @@ int kvm_updateStats(void) {
   int flag = 0;
   while (ifnet_addr && flag != (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND)) {
    kvm_read(kvmfd, ifnet_addr, buffer, sizeof(struct ifnet));
 -#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
    snprintf(devname, 15, "%s", ifnet->if_xname);
  #else
    kvm_read(kvmfd, (unsigned long)ifnet->if_name, devname, 15);
-@@ -487,7 +498,7 @@
+@@ -487,7 +501,7 @@ int kvm_updateStats(void) {
          flag = (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND);
  
    } else {
 -#ifdef __OpenBSD__
-+#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
          ifnet_addr = (unsigned long)ifnet->if_list.tqe_next;
  #else
          ifnet_addr = (unsigned long)ifnet->if_next;
-@@ -502,8 +513,119 @@
+@@ -502,8 +516,119 @@ int kvm_updateStats(void) {
  }
  
  
diff -r 6016facfbe18 -r cd3279c770ca net/wmnet/patches/patch-ad
--- a/net/wmnet/patches/patch-ad        Thu Mar 23 17:31:05 2006 +0000
+++ b/net/wmnet/patches/patch-ad        Thu Mar 23 17:36:16 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2002/09/18 10:40:13 tron Exp $
+$NetBSD: patch-ad,v 1.5 2006/03/23 17:36:16 joerg Exp $
 
 --- wmnet.c.orig       Fri May  5 03:01:14 2000
 +++ wmnet.c    Mon Jul  8 16:52:30 2002
@@ -7,7 +7,7 @@
  #include<X11/Xutil.h>
  #include<X11/Xatom.h>
 -#if defined (__FreeBSD__) || defined (__OpenBSD__)
-+#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
++#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined(__DragonFly__)
  # include<sys/socket.h>
  # include"getopt.h"
 +#elif defined (sun)