Adopt FreeBSD's patches to make this build with perl 5.24, ref.

https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
https://bugs.gentoo.org/show_bug.cgi?id=582368

Bump PKGREVISION.

19 files changed, 258 insertions, 56 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 7506bdc6bc8..556562de2ab 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.115 2016/06/06 14:11:35 he Exp $
 
 .include "Makefile.common"
 CATEGORIES=	net
-PKGREVISION=	3
+PKGREVISION=	4
 
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Extensible SNMP implementation
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index 284a6787c8a..1c0f67cb05f 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.88 2016/04/29 19:47:21 adam Exp $
+$NetBSD: distinfo,v 1.89 2016/06/06 14:11:35 he Exp $
 
 SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839
 RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2
 SHA512 (net-snmp-5.7.3.tar.gz) = 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
 Size (net-snmp-5.7.3.tar.gz) = 6382428 bytes
-SHA1 (patch-ac) = 59987ecb9467b1cead9af3d4432a4dd69be93480
+SHA1 (patch-ac) = fa5a32e497a7651f4804082d921bb2e91b17d098
 SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101
 SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
 SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4
@@ -23,10 +23,11 @@ SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = f547f3fd08848803cbf7ce08a41ba463c
 SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 2eb5e5c05ecb23f69cbb0d38a31e14d5b5ddc6b7
 SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
 SHA1 (patch-agent_snmp__agent.c) = 2dbfea907d0e1881f5d55c5b270984fc3a562da9
+SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8
 SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
 SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
 SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321
-SHA1 (patch-am) = 52858b71d4e75d813f134c2d006819108430c766
+SHA1 (patch-am) = d01e8a93f6e766cedfdc324efd69168f71aac76f
 SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
 SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
 SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
@@ -34,9 +35,21 @@ SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9
 SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0
 SHA1 (patch-dt) = 452fee78b37f8ce0eb30049f9f18b04cff9b6e6e
 SHA1 (patch-du) = 51d2c7e11b3d422e57ea2f5761aff624f7333842
-SHA1 (patch-el) = b85dbef28e14fe29c9fb944508a08e7423a37152
+SHA1 (patch-el) = b23d7ae82d367d457181d231a56c80e648b0ee6e
 SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee
 SHA1 (patch-include_net-snmp_agent_snmp__agent.h) = 2139d849b0ffe004a72f3276a98c0d2cb72dca18
 SHA1 (patch-include_net-snmp_system_netbsd.h) = 7880fded678147b2cc75e035234b89727e213d00
-SHA1 (patch-perl_agent_Makefile.PL) = 722380debeda1552b74b60ff91cea3cbbc716e74
+SHA1 (patch-perl_ASN_Makefile.PL) = 895ad5ccefee6a271650a822e2bac31c5b9d62d5
+SHA1 (patch-perl_AnyData__SNMP_Makefile.PL) = 6d99ac8db72682f9ff074ba8239d7242c149b9bf
+SHA1 (patch-perl_OID_Makefile.PL) = 8cbc9e6e3ee422851df62a400f6df30dfe271c88
+SHA1 (patch-perl_SNMP_Makefile.PL) = 252fe35a8d93f38ae2454e962546a7b77967d9c2
+SHA1 (patch-perl_SNMP_SNMP.xs) = 99860cdfea3170ed3777f61cb8b5abe9d49ce44c
+SHA1 (patch-perl_TrapReceiver_Makefile.PL) = b0e6350d3a4142e6b998ca11131279896abd4eb1
+SHA1 (patch-perl_TrapReceiver_TrapReceiver.xs) = 4a49bc4a767a1ff1ded925876470168baa86359b
+SHA1 (patch-perl_agent_Makefile.PL) = 267dbc5c663ca3823e37e8afcc42f19986bc1a9f
+SHA1 (patch-perl_agent_Support_Makefile.PL) = 7ee55ea96e2eeb275f7eed9d7bbc446c7195af4c
+SHA1 (patch-perl_agent_agent.xs) = de018255afd1790f7cab70591505dabd6cd15047
+SHA1 (patch-perl_agent_default__store_Makefile.PL) = 0599d99ce5226eaeaab3f1af76c68bfe7e57e1bd
+SHA1 (patch-perl_default__store_Makefile.PL) = ed5ad7385680632b2153fa572635c5aea83c9114
+SHA1 (patch-perl_manager_Makefile.PL) = bb34b119a2b3887a1af1f9b88e6d4bad6baf60bb
 SHA1 (patch-snmplib_snmp__api.c) = b4f498aa93b61f809e3696df1fc6bf32bd942233
diff --git a/net/net-snmp/patches/patch-ac b/net/net-snmp/patches/patch-ac
index 41c16dc3791..c95e767adfb 100644
--- a/net/net-snmp/patches/patch-ac
+++ b/net/net-snmp/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.12 2013/03/17 00:15:29 gdt Exp $
+$NetBSD: patch-ac,v 1.13 2016/06/06 14:11:35 he Exp $
+
+Improve portability to newer NetBSD versions.
 
 --- agent/mibgroup/if-mib/data_access/interface.h.orig	2012-10-09 22:28:58.000000000 +0000
 +++ agent/mibgroup/if-mib/data_access/interface.h
diff --git a/net/net-snmp/patches/patch-agent_snmp__perl.c b/net/net-snmp/patches/patch-agent_snmp__perl.c
new file mode 100644
index 00000000000..f483f4c5fe6
--- /dev/null
+++ b/net/net-snmp/patches/patch-agent_snmp__perl.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-agent_snmp__perl.c,v 1.1 2016/06/06 14:11:35 he Exp $
+
+--- agent/snmp_perl.c.orig	2014-12-08 20:23:22.000000000 +0000
++++ agent/snmp_perl.c
+@@ -5,6 +5,10 @@
+ #include <EXTERN.h>
+ #include "perl.h"
+ 
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am
index 035132c7428..a6ebc3eb83c 100644
--- a/net/net-snmp/patches/patch-am
+++ b/net/net-snmp/patches/patch-am
@@ -1,16 +1,13 @@
-$NetBSD: patch-am,v 1.13 2013/03/17 00:17:34 gdt Exp $
+$NetBSD: patch-am,v 1.14 2016/06/06 14:11:35 he Exp $
 
---- agent/mibgroup/host/hr_swrun.c.orig	2012-10-09 22:28:58.000000000 +0000
+--- agent/mibgroup/host/hr_swrun.c.orig	2014-12-08 20:23:22.000000000 +0000
 +++ agent/mibgroup/host/hr_swrun.c
-@@ -1012,8 +1012,10 @@ var_hrswrun(struct variable * vp,
+@@ -1027,6 +1027,8 @@ var_hrswrun(struct variable * vp,
  	else
  	    long_return = 4;	/* application */
      #endif
--#else
 +#elif defined darwin
 +	long_return = -1;
-+#else
+ #else
  	long_return = 4;	/* application */
  #endif
-         return (u_char *) & long_return;
-     case HRSWRUN_STATUS:
diff --git a/net/net-snmp/patches/patch-el b/net/net-snmp/patches/patch-el
index 7164b1a20f8..9bc025a4499 100644
--- a/net/net-snmp/patches/patch-el
+++ b/net/net-snmp/patches/patch-el
@@ -1,29 +1,20 @@
-$NetBSD: patch-el,v 1.4 2013/03/17 00:15:29 gdt Exp $
+$NetBSD: patch-el,v 1.5 2016/06/06 14:11:35 he Exp $
 
---- perl/OID/OID.xs.orig	2012-10-09 22:28:58.000000000 +0000
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/OID/OID.xs.orig	2016-06-06 13:52:38.000000000 +0000
 +++ perl/OID/OID.xs
-@@ -157,17 +157,22 @@ MODULE = NetSNMP::OID		PACKAGE = NetSNMP
- netsnmp_oid *
- nso_newptr(initstring)
-     char *initstring
-+    PREINIT:
-+	STRLEN	len;
-     CODE:
-         if (get_tree_head() == NULL)
-             netsnmp_init_mib();
-         RETVAL = malloc(sizeof(netsnmp_oid));
-         RETVAL->name = RETVAL->namebuf;
--        RETVAL->len = sizeof(RETVAL->namebuf)/sizeof(RETVAL->namebuf[0]);
--        if (!snmp_parse_oid(initstring, (oid *) RETVAL->name, &RETVAL->len)) {
-+        len = sizeof(RETVAL->namebuf)/sizeof(RETVAL->namebuf[0]);
-+        if (!snmp_parse_oid(initstring, (oid *) RETVAL->name, &len)) {
-             snmp_log(LOG_ERR, "Can't parse: %s\n", initstring);
-             RETVAL->len = 0;
-             free(RETVAL);
-             RETVAL = NULL;
-+	}
-+	else {
-+	    RETVAL->len = len;
-         }
-     OUTPUT:
-         RETVAL
+@@ -7,6 +7,10 @@
+ #include "perl.h"
+ #include "XSUB.h"
+ 
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ 
diff --git a/net/net-snmp/patches/patch-perl_ASN_Makefile.PL b/net/net-snmp/patches/patch-perl_ASN_Makefile.PL
new file mode 100644
index 00000000000..540c7e6ae4e
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_ASN_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_ASN_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/ASN/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/ASN/Makefile.PL
+@@ -1,3 +1,4 @@
++package ASN;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_AnyData__SNMP_Makefile.PL b/net/net-snmp/patches/patch-perl_AnyData__SNMP_Makefile.PL
new file mode 100644
index 00000000000..5498f636dd3
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_AnyData__SNMP_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_AnyData__SNMP_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/AnyData_SNMP/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/AnyData_SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package AnyData_SNMP;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
diff --git a/net/net-snmp/patches/patch-perl_OID_Makefile.PL b/net/net-snmp/patches/patch-perl_OID_Makefile.PL
new file mode 100644
index 00000000000..fccd39bd1b3
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_OID_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_OID_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/OID/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/OID/Makefile.PL
+@@ -1,3 +1,4 @@
++package OID;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.
+ 
diff --git a/net/net-snmp/patches/patch-perl_SNMP_Makefile.PL b/net/net-snmp/patches/patch-perl_SNMP_Makefile.PL
new file mode 100644
index 00000000000..8a3b82880a1
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_SNMP_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_SNMP_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/SNMP/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/SNMP/Makefile.PL
+@@ -1,3 +1,4 @@
++package SNMP;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_SNMP_SNMP.xs b/net/net-snmp/patches/patch-perl_SNMP_SNMP.xs
new file mode 100644
index 00000000000..df7a8b519ec
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_SNMP_SNMP.xs
@@ -0,0 +1,20 @@
+$NetBSD: patch-perl_SNMP_SNMP.xs,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/SNMP/SNMP.xs.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/SNMP/SNMP.xs
+@@ -16,6 +16,10 @@
+ #include "perl.h"
+ #include "XSUB.h"
+ 
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <sys/types.h>
diff --git a/net/net-snmp/patches/patch-perl_TrapReceiver_Makefile.PL b/net/net-snmp/patches/patch-perl_TrapReceiver_Makefile.PL
new file mode 100644
index 00000000000..4bfc3381323
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_TrapReceiver_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_TrapReceiver_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/TrapReceiver/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/TrapReceiver/Makefile.PL
+@@ -1,3 +1,4 @@
++package TrapReceiver;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_TrapReceiver_TrapReceiver.xs b/net/net-snmp/patches/patch-perl_TrapReceiver_TrapReceiver.xs
new file mode 100644
index 00000000000..eb870d41dc7
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_TrapReceiver_TrapReceiver.xs
@@ -0,0 +1,20 @@
+$NetBSD: patch-perl_TrapReceiver_TrapReceiver.xs,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/TrapReceiver/TrapReceiver.xs.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/TrapReceiver/TrapReceiver.xs
+@@ -9,6 +9,10 @@
+ 
+ #include "ppport.h"
+ 
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
diff --git a/net/net-snmp/patches/patch-perl_agent_Makefile.PL b/net/net-snmp/patches/patch-perl_agent_Makefile.PL
index d73e758320b..d2cbd638209 100644
--- a/net/net-snmp/patches/patch-perl_agent_Makefile.PL
+++ b/net/net-snmp/patches/patch-perl_agent_Makefile.PL
@@ -1,16 +1,14 @@
-$NetBSD: patch-perl_agent_Makefile.PL,v 1.1 2013/11/05 17:40:30 joerg Exp $
+$NetBSD: patch-perl_agent_Makefile.PL,v 1.2 2016/06/06 14:11:35 he Exp $
 
---- perl/agent/Makefile.PL.orig	2012-10-09 22:28:58.000000000 +0000
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/agent/Makefile.PL.orig	2016-06-06 13:52:38.000000000 +0000
 +++ perl/agent/Makefile.PL
-@@ -79,7 +79,10 @@ sub InitMakeParams {
-     else {
- 	$opts = NetSNMPGetOpts();
- 	$Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
--	$Params{'LIBS'}   = `$opts->{'nsconfig'} --base-agent-libs`;
-+	chomp($Params{'LDDLFLAGS'});
-+	$Params{'LDDLFLAGS'} = $Params{'LDDLFLAGS'} . " " . $Config{'ccdlflags'};
-+	chomp($Params{'LDDLFLAGS'});
-+	$Params{'LIBS'} = `$opts->{'nsconfig'} --base-agent-libs`;
- 	chomp($Params{'LIBS'});
- 	$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
- 	chomp($Params{'CCFLAGS'});
+@@ -1,3 +1,4 @@
++package agent;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_agent_Support_Makefile.PL b/net/net-snmp/patches/patch-perl_agent_Support_Makefile.PL
new file mode 100644
index 00000000000..ec5de6003bd
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_agent_Support_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_agent_Support_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/agent/Support/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/agent/Support/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_Support;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_agent_agent.xs b/net/net-snmp/patches/patch-perl_agent_agent.xs
new file mode 100644
index 00000000000..17cfb76e785
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_agent_agent.xs
@@ -0,0 +1,20 @@
+$NetBSD: patch-perl_agent_agent.xs,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/agent/agent.xs.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/agent/agent.xs
+@@ -9,6 +9,10 @@
+ #include <netdb.h>
+ #include <sys/socket.h>
+ 
++#ifdef U64TYPE
++#define U64 U64pairU32
++#endif
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
diff --git a/net/net-snmp/patches/patch-perl_agent_default__store_Makefile.PL b/net/net-snmp/patches/patch-perl_agent_default__store_Makefile.PL
new file mode 100644
index 00000000000..cad28df86e9
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_agent_default__store_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_agent_default__store_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/agent/default_store/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/agent/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package agent_default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_default__store_Makefile.PL b/net/net-snmp/patches/patch-perl_default__store_Makefile.PL
new file mode 100644
index 00000000000..ee46d9ae026
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_default__store_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_default__store_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/default_store/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/default_store/Makefile.PL
+@@ -1,3 +1,4 @@
++package default_store;
+ use ExtUtils::MakeMaker;
+ require 5;
+ use Config;
diff --git a/net/net-snmp/patches/patch-perl_manager_Makefile.PL b/net/net-snmp/patches/patch-perl_manager_Makefile.PL
new file mode 100644
index 00000000000..b948cf0a82a
--- /dev/null
+++ b/net/net-snmp/patches/patch-perl_manager_Makefile.PL
@@ -0,0 +1,14 @@
+$NetBSD: patch-perl_manager_Makefile.PL,v 1.1 2016/06/06 14:11:35 he Exp $
+
+Adopt FreeBSD's patch to make this build with perl 5.24, ref.
+https://svnweb.freebsd.org/ports/head/net-mgmt/net-snmp/files/patch-perl5.23?view=co
+https://rt.perl.org/Public/Bug/Display.html?id=125907#txn-1363270
+https://bugs.gentoo.org/show_bug.cgi?id=582368
+
+--- perl/manager/Makefile.PL.orig	2014-12-08 20:23:22.000000000 +0000
++++ perl/manager/Makefile.PL
+@@ -1,3 +1,4 @@
++package manager;
+ use ExtUtils::MakeMaker;
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.