Fix building on OS X 10.9 Mavericks

3 files changed, 14 insertions, 8 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index c6bd66b24d5..29f01ab1a9a 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2014/08/05 12:25:13 he Exp $
+# $NetBSD: Makefile,v 1.106 2014/08/22 16:27:18 adam Exp $
 
 .include "Makefile.common"
 PKGREVISION=	1
@@ -111,6 +111,9 @@ INSTALLATION_DIRS+=	share/examples/net-snmp
 post-extract:
 .if ${OPSYS} == "DragonFly"
 	cp ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
+# XXX make it build on OS X 10.9 Mavericks; remove on the next update
+.elif ${OPSYS} == "Darwin"
+	ln -s ${WRKSRC}/include/net-snmp/system/darwin12.h ${WRKSRC}/include/net-snmp/system/darwin13.h
 .endif
 
 post-wrapper:
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index df1c4cb4930..a08ad0282e3 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.81 2014/04/08 14:10:25 he Exp $
+$NetBSD: distinfo,v 1.82 2014/08/22 16:27:18 adam Exp $
 
 SHA1 (net-snmp-5.7.2.1.tar.gz) = 815d4e5520a1ed96a27def33e7534b4190599f0f
 RMD160 (net-snmp-5.7.2.1.tar.gz) = 129b74e70a5027749c766ea9cdb53a3c4a3cf40b
@@ -9,7 +9,7 @@ SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
 SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4
 SHA1 (patch-agent_mibgroup_agentx_master_admin.c) = 3c233c1e3113fbc9c1de34cb4cbacca9ef4a6fe2
 SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 346bb4cb0e905821aa3bbdda4ae0fd8526d35854
-SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = 7fc48c58c8f5bc73caaf3990ef61a94fb856e208
+SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = f04d66f823bf2b49401e6d9a62db4b39ed679907
 SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 054866e7c3ac90f183fd4a6d53763a5bba50572c
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
diff --git a/net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c b/net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c
index 8da5ac961fb..e8499703306 100644
--- a/net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c
+++ b/net/net-snmp/patches/patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c
@@ -1,13 +1,16 @@
-$NetBSD: patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c,v 1.1 2013/04/05 18:20:08 christos Exp $
+$NetBSD: patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c,v 1.2 2014/08/22 16:27:18 adam Exp $
 
---- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig	2013-04-05 13:53:53.000000000 -0400
-+++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c	2013-04-05 13:54:19.000000000 -0400
-@@ -154,7 +154,7 @@
+--- agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig	2014-02-20 00:36:42.000000000 +0000
++++ agent/mibgroup/hardware/fsys/fsys_getfsstats.c
+@@ -154,7 +154,11 @@ netsnmp_fsys_arch_load( void )
          entry->path[sizeof(entry->path)-1] = '\0';
          strlcpy( entry->device, stats[i].f_mntfromname, sizeof(entry->device));
          entry->device[sizeof(entry->device)-1] = '\0';
--        entry->units = stats[i].f_bsize;    /* or f_frsize */
++#ifdef __APPLE__
+         entry->units = stats[i].f_bsize;    /* or f_frsize */
++#else
 +        entry->units = stats[i].f_frsize;
++#endif
          entry->size  = stats[i].f_blocks;
          entry->used  = (stats[i].f_blocks - stats[i].f_bfree);
          /* entry->avail is currently unsigned, so protect against negative