Date: Thu, 20 Feb 2003 21:12:27 +0000 (GMT) From: Dominic Mitchell <dom@happygiraffe.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48502: make net/net-snmp work under -CURRENT Message-ID: <20030220211227.ADD3D5C20@happygiraffe.net>
next in thread | raw e-mail | index | archive | help
>Number: 48502
>Category: ports
>Synopsis: make net/net-snmp work under -CURRENT
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 20 13:20:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Dominic Mitchell
>Release: FreeBSD 5.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD ppe.happygiraffe.net 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Thu Jan 16 22:16:53 GMT 2003 root@hollin.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
net/net-snmp (5.0.6) does not build under -CURRENT because it
uses <sys/dktab.h>, instead of <sys/resource.h>.
>How-To-Repeat:
Attempt to build net/net-snmp on a recent -CURRENT
>Fix:
Apply this patch to the net/net-snmp port. It adds two patch
files.
diff -ruN /usr/ports/net/net-snmp/files/patch-diskio.c net-snmp/files/patch-diskio.c
--- /usr/ports/net/net-snmp/files/patch-diskio.c Thu Jan 1 01:00:00 1970
+++ net-snmp/files/patch-diskio.c Thu Feb 20 20:40:19 2003
@@ -0,0 +1,19 @@
+--- agent/mibgroup/ucd-snmp/diskio.c.orig Thu Feb 20 20:38:07 2003
++++ agent/mibgroup/ucd-snmp/diskio.c Thu Feb 20 20:39:45 2003
+@@ -48,10 +48,15 @@
+ #include <sys/diskstats.h>
+ #endif /* bsdi */
+
+-#if defined (freebsd4) || defined(freebsd5)
++#if defined (freebsd4)
+ #include <sys/dkstat.h>
+ #include <devstat.h>
+ #endif /* freebsd */
++
++#if defined(freebsd5)
++#include <sys/resource.h>
++#include <devstat.h>
++#endif /* freebsd5 */
+
+ static char type[20];
+ void diskio_parse_config(const char *, char *);
diff -ruN /usr/ports/net/net-snmp/files/patch-vmstat_freebsd2.c net-snmp/files/patch-vmstat_freebsd2.c
--- /usr/ports/net/net-snmp/files/patch-vmstat_freebsd2.c Thu Jan 1 01:00:00 1970
+++ net-snmp/files/patch-vmstat_freebsd2.c Thu Feb 20 20:51:19 2003
@@ -0,0 +1,14 @@
+--- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c.orig Thu Feb 20 20:50:08 2003
++++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c Thu Feb 20 20:50:52 2003
+@@ -10,7 +10,11 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/proc.h>
++#ifdef freebsd5
++#include <sys/resource.h>
++#else
+ #include <sys/dkstat.h>
++#endif
+ #ifdef freebsd5
+ #include <sys/bio.h>
+ #endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030220211227.ADD3D5C20>