From 9208fd7439c3c45aa6af5b44d89d1a7e2113d3e1 Mon Sep 17 00:00:00 2001
From: Bill Fumerola <billf@FreeBSD.org>
Date: Sun, 31 Dec 2000 05:17:01 +0000
Subject: From the submitter:

- <sys/conf.h> requires 'SPECNAMELEN'.
- 'SPECNAMELEN' is defined in <sys/param.h>
- however, disk.c includes <sys/conf.h> before including <sys/param.h>

Submitted by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
---
 net-mgmt/net-snmp-devel/files/patch-ab | 20 ++++++++++++++++++--
 net-mgmt/net-snmp/files/patch-ab       | 20 ++++++++++++++++++--
 net-mgmt/net-snmp4/files/patch-ab      | 20 ++++++++++++++++++--
 net-mgmt/net-snmp53/files/patch-ab     | 20 ++++++++++++++++++--
 4 files changed, 72 insertions(+), 8 deletions(-)

(limited to 'net-mgmt')

diff --git a/net-mgmt/net-snmp-devel/files/patch-ab b/net-mgmt/net-snmp-devel/files/patch-ab
index 4658da4119df..4a8f9a65a244 100644
--- a/net-mgmt/net-snmp-devel/files/patch-ab
+++ b/net-mgmt/net-snmp-devel/files/patch-ab
@@ -1,7 +1,23 @@
 --- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
 +++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
-@@ -79,6 +79,7 @@
- #define statvfs statfs
+@@ -24,12 +24,12 @@
+ #include <sys/vmmeter.h>
+ #endif
+ #endif
+-#if HAVE_SYS_CONF_H
+-#include <sys/conf.h>
+-#endif
+ #if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#if HAVE_SYS_CONF_H
++#include <sys/conf.h>
++#endif
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+ #endif
+@@ -86,6 +86,7 @@
+ #include <vm/vm.h>
  #endif
  #if HAVE_VM_SWAP_PAGER_H
 +#include <vm/vm.h>
diff --git a/net-mgmt/net-snmp/files/patch-ab b/net-mgmt/net-snmp/files/patch-ab
index 4658da4119df..4a8f9a65a244 100644
--- a/net-mgmt/net-snmp/files/patch-ab
+++ b/net-mgmt/net-snmp/files/patch-ab
@@ -1,7 +1,23 @@
 --- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
 +++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
-@@ -79,6 +79,7 @@
- #define statvfs statfs
+@@ -24,12 +24,12 @@
+ #include <sys/vmmeter.h>
+ #endif
+ #endif
+-#if HAVE_SYS_CONF_H
+-#include <sys/conf.h>
+-#endif
+ #if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#if HAVE_SYS_CONF_H
++#include <sys/conf.h>
++#endif
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+ #endif
+@@ -86,6 +86,7 @@
+ #include <vm/vm.h>
  #endif
  #if HAVE_VM_SWAP_PAGER_H
 +#include <vm/vm.h>
diff --git a/net-mgmt/net-snmp4/files/patch-ab b/net-mgmt/net-snmp4/files/patch-ab
index 4658da4119df..4a8f9a65a244 100644
--- a/net-mgmt/net-snmp4/files/patch-ab
+++ b/net-mgmt/net-snmp4/files/patch-ab
@@ -1,7 +1,23 @@
 --- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
 +++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
-@@ -79,6 +79,7 @@
- #define statvfs statfs
+@@ -24,12 +24,12 @@
+ #include <sys/vmmeter.h>
+ #endif
+ #endif
+-#if HAVE_SYS_CONF_H
+-#include <sys/conf.h>
+-#endif
+ #if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#if HAVE_SYS_CONF_H
++#include <sys/conf.h>
++#endif
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+ #endif
+@@ -86,6 +86,7 @@
+ #include <vm/vm.h>
  #endif
  #if HAVE_VM_SWAP_PAGER_H
 +#include <vm/vm.h>
diff --git a/net-mgmt/net-snmp53/files/patch-ab b/net-mgmt/net-snmp53/files/patch-ab
index 4658da4119df..4a8f9a65a244 100644
--- a/net-mgmt/net-snmp53/files/patch-ab
+++ b/net-mgmt/net-snmp53/files/patch-ab
@@ -1,7 +1,23 @@
 --- agent/mibgroup/ucd-snmp/disk.c~	Fri Mar  5 08:45:00 1999
 +++ agent/mibgroup/ucd-snmp/disk.c	Sat Apr  3 13:33:11 1999
-@@ -79,6 +79,7 @@
- #define statvfs statfs
+@@ -24,12 +24,12 @@
+ #include <sys/vmmeter.h>
+ #endif
+ #endif
+-#if HAVE_SYS_CONF_H
+-#include <sys/conf.h>
+-#endif
+ #if HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#if HAVE_SYS_CONF_H
++#include <sys/conf.h>
++#endif
+ #if HAVE_ASM_PAGE_H
+ #include <asm/page.h>
+ #endif
+@@ -86,6 +86,7 @@
+ #include <vm/vm.h>
  #endif
  #if HAVE_VM_SWAP_PAGER_H
 +#include <vm/vm.h>
-- 
cgit v1.2.3