o Fix not to define "freebsd[234]" definition on freebsd5 environment.

o Fix related patch to fit freebsd5 environment.
o Implement tcp.tcpCurrEstab to return correct value.

PR:		ports/54551
Submitted by:	sub_0@netcabo.pt

1 files changed, 27 insertions, 3 deletions

diff --git a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c
index 8ddf778aea0d..47f5da45ccc7 100644
--- a/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c
+++ b/net-mgmt/net-snmp-devel/files/patch-memory_freebsd2.c
@@ -1,6 +1,30 @@
---- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	Sat Apr 20 16:30:08 2002
-+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed Apr 24 01:49:01 2002
-@@ -274,7 +274,7 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig	Sat Nov  9 23:59:53 2002
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Sat Aug 16 17:09:01 2003
+@@ -207,11 +207,13 @@
+     auto_nlist(NSWDEV_SYMBOL, (char *) &nswdev, sizeof(nswdev));
+     auto_nlist(DMMAX_SYMBOL, (char *) &dmmax, sizeof(dmmax));
+ 
++#if !defined(freebsd5)
+     sw = (struct swdevt *) malloc(nswdev * sizeof(*sw));
+     if (sw == NULL)
+         return;
+ 
+     auto_nlist(SWDEVT_SYMBOL, (char *) sw, nswdev * sizeof(*sw));
++#endif
+ 
+     n = kvm_getswapinfo(kd, kswap, sizeof(kswap) / sizeof(kswap[0]), 0);
+ 
+@@ -242,7 +244,9 @@
+     swapUsed *= pagesize;
+     swapFree *= pagesize;
+ 
++#if !defined(freebsd5)
+     free(sw);
++#endif
+ }
+ #endif
+ 
+@@ -274,7 +278,7 @@
      size_t          total_size = sizeof(total);
      int             total_mib[] = { CTL_VM, VM_METER };