--- net-snmp-5.4/agent/mibgroup/hardware/cpu.h	2006-08-27 10:04:22.000000000 -0700
+++ net-snmp/agent/mibgroup/hardware/cpu.h	2006-10-03 17:18:30.000000000 -0700
@@ -6,7 +6,7 @@
 #elif (defined(freebsd2) || defined(freebsd3) || defined(freebsd4)  || defined(freebsd5)|| defined(freebsd6))
 config_require(hardware/cpu/cpu_nlist)
 
-#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3))
+#elif (defined(netbsd) || defined(netbsd1) || defined(netbsdelf) || defined(netbsdelf2)|| defined(netbsdelf3) || defined(openbsd2)|| defined(openbsd3)) || defined(darwin)
 config_require(hardware/cpu/cpu_sysctl)
 
 #elif (defined(aix4) || defined(aix5))
--- net-snmp-5.4/agent/mibgroup/hardware/memory.h	2006-09-26 15:39:32.000000000 -0700
+++ net-snmp/agent/mibgroup/hardware/memory.h	2006-10-03 18:12:56.000000000 -0700
@@ -2,6 +2,7 @@
 config_arch_require(aix4,      hardware/memory/memory_aix)
 config_arch_require(aix5,      hardware/memory/memory_aix)
 config_arch_require(darwin8,   hardware/memory/memory_darwin)
+config_arch_require(darwin9,   hardware/memory/memory_darwin)
 config_arch_require(dynix,     hardware/memory/memory_dynix)
 config_arch_require(freebsd2,  hardware/memory/memory_freebsd)
 config_arch_require(freebsd3,  hardware/memory/memory_freebsd)