Changes 5.4:

- The default configuration now enables embedded Perl and the Perl
  modules by default when possible unless explicitly disabled. You
  may use the --disable-embedded-perl and --without-perl-modules
  configure options, respectively, to revert to the former default
  configuration.

33 files changed, 205 insertions, 585 deletions

diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 64528ced453..29a87eff74e 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2006/10/18 22:37:46 seb Exp $
+# $NetBSD: Makefile,v 1.56 2007/02/05 12:06:16 adam Exp $
 
-DISTNAME=	net-snmp-5.3.1
-PKGREVISION=	2
+DISTNAME=	net-snmp-5.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
 		ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
@@ -21,7 +20,7 @@ MAKE_ENV+=	OPSYS=${OPSYS:Q}
 # can't load the shared libraries from WRKSRC/
 # Until this is fixed you can test them after installation by doing
 # `make test TEST_TARGET=perltest'
-TEST_TARGET?=		test
+TEST_TARGET=		test
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -111,12 +110,12 @@ REPLACE_FILES.bash=	local/mib2c-update
 INSTALLATION_DIRS+=	share/examples/net-snmp
 
 post-extract:
-	${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/include/net-snmp/system
+	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/include/net-snmp/system
 
 post-wrapper:
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
-	${MKDIR} ${BUILDLINK_DIR}/include/sys
-	${CP} ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
+	mkdir ${BUILDLINK_DIR}/include/sys
+	cp ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
 .endif
 
 post-install:
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index 68f14a3bde7..785c77a0f2b 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/03/19 22:03:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/02/05 12:06:16 adam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -114,6 +114,7 @@ include/net-snmp/library/snmp_impl.h
 include/net-snmp/library/snmp_logging.h
 include/net-snmp/library/snmp_parse_args.h
 include/net-snmp/library/snmp_secmod.h
+include/net-snmp/library/snmp_service.h
 include/net-snmp/library/snmp_transport.h
 include/net-snmp/library/snmpusm.h
 include/net-snmp/library/snmpv3-security-includes.h
@@ -143,6 +144,7 @@ include/net-snmp/system/cygwin.h
 include/net-snmp/system/darwin.h
 include/net-snmp/system/darwin7.h
 include/net-snmp/system/darwin8.h
+include/net-snmp/system/darwin9.h
 include/net-snmp/system/dragonfly.h
 include/net-snmp/system/dynix.h
 include/net-snmp/system/freebsd.h
@@ -161,11 +163,10 @@ include/net-snmp/system/netbsd.h
 include/net-snmp/system/openbsd.h
 include/net-snmp/system/osf5.h
 include/net-snmp/system/solaris.h
-include/net-snmp/system/solaris2.10.h
+include/net-snmp/system/solaris2.3.h
+include/net-snmp/system/solaris2.4.h
+include/net-snmp/system/solaris2.5.h
 include/net-snmp/system/solaris2.6.h
-include/net-snmp/system/solaris2.7.h
-include/net-snmp/system/solaris2.8.h
-include/net-snmp/system/solaris2.9.h
 include/net-snmp/system/sunos.h
 include/net-snmp/system/svr5.h
 include/net-snmp/system/sysv.h
@@ -221,7 +222,11 @@ lib/libnetsnmphelpers.la
 lib/libnetsnmpmibs.la
 lib/libnetsnmptrapd.la
 lib/libsnmp.la
+man/man1/encode_keychange.1
+man/man1/fixproc.1
+man/man1/mib2c-update.1
 man/man1/mib2c.1
+man/man1/net-snmp-config.1
 man/man1/snmpbulkget.1
 man/man1/snmpbulkwalk.1
 man/man1/snmpcmd.1
@@ -241,9 +246,17 @@ man/man1/snmptrap.1
 man/man1/snmpusm.1
 man/man1/snmpvacm.1
 man/man1/snmpwalk.1
+man/man1/tkmib.1
+man/man1/traptoemail.1
 man/man3/add_mibdir.3
 man/man3/add_module_replacement.3
+man/man3/config_perror.3
+man/man3/config_pwarn.3
 man/man3/default_store.3
+man/man3/fprint_description.3
+man/man3/fprint_objid.3
+man/man3/fprint_value.3
+man/man3/fprint_variable.3
 man/man3/get_module_node.3
 man/man3/init_mib.3
 man/man3/init_mib_internals.3
@@ -255,6 +268,15 @@ man/man3/netsnmp_bulk_to_next.3
 man/man3/netsnmp_cache_handler.3
 man/man3/netsnmp_container.3
 man/man3/netsnmp_debug.3
+man/man3/netsnmp_ds_get_boolean.3
+man/man3/netsnmp_ds_get_int.3
+man/man3/netsnmp_ds_get_string.3
+man/man3/netsnmp_ds_register_config.3
+man/man3/netsnmp_ds_register_premib.3
+man/man3/netsnmp_ds_set_boolean.3
+man/man3/netsnmp_ds_set_int.3
+man/man3/netsnmp_ds_set_string.3
+man/man3/netsnmp_ds_shutdown.3
 man/man3/netsnmp_example_scalar_int.3
 man/man3/netsnmp_handler.3
 man/man3/netsnmp_instance.3
@@ -286,13 +308,27 @@ man/man3/print_value.3
 man/man3/print_variable.3
 man/man3/read_all_mibs.3
 man/man3/read_config.3
+man/man3/read_config_print_usage.3
+man/man3/read_configs.3
 man/man3/read_mib.3
 man/man3/read_module.3
 man/man3/read_module_node.3
 man/man3/read_objid.3
+man/man3/read_premib_configs.3
+man/man3/register_app_config_handler.3
+man/man3/register_app_premib_handler.3
+man/man3/register_config_handler.3
+man/man3/register_mib_handlers.3
+man/man3/register_premib_handler.3
+man/man3/send_easy_trap.3
+man/man3/send_trap_vars.3
+man/man3/send_v2trap.3
 man/man3/shutdown_mib.3
 man/man3/snmp_agent_api.3
 man/man3/snmp_alarm.3
+man/man3/snmp_alarm_register.3
+man/man3/snmp_alarm_register_hr.3
+man/man3/snmp_alarm_unregister.3
 man/man3/snmp_api.3
 man/man3/snmp_api_errstring.3
 man/man3/snmp_close.3
@@ -319,6 +355,14 @@ man/man3/snmp_set_mib_warnings.3
 man/man3/snmp_set_save_descriptions.3
 man/man3/snmp_timeout.3
 man/man3/snmp_trap_api.3
+man/man3/snprint_objid.3
+man/man3/snprint_value.3
+man/man3/snprint_variable.3
+man/man3/sprint_realloc_objid.3
+man/man3/sprint_realloc_value.3
+man/man3/sprint_realloc_variable.3
+man/man3/unregister_app_config_handler.3
+man/man3/unregister_config_handler.3
 man/man5/mib2c.conf.5
 man/man5/snmp.conf.5
 man/man5/snmp_config.5
@@ -446,6 +490,7 @@ share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
 share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
 share/snmp/mibs/NET-SNMP-MIB.txt
 share/snmp/mibs/NET-SNMP-TC.txt
+share/snmp/mibs/NET-SNMP-VACM-MIB.txt
 share/snmp/mibs/NOTIFICATION-LOG-MIB.txt
 share/snmp/mibs/RFC-1215.txt
 share/snmp/mibs/RFC1155-SMI.txt
@@ -475,6 +520,7 @@ share/snmp/mibs/UCD-DLMOD-MIB.txt
 share/snmp/mibs/UCD-IPFWACC-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
 share/snmp/mibs/UDP-MIB.txt
+share/snmp/snmp_perl.pl
 share/snmp/snmp_perl_trapd.pl
 share/snmp/snmpconf-data/snmp-data/authopts
 share/snmp/snmpconf-data/snmp-data/debugging
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index f7f559280ce..b1ceab0d375 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1,54 +1,43 @@
-$NetBSD: distinfo,v 1.35 2006/10/18 22:37:46 seb Exp $
+$NetBSD: distinfo,v 1.36 2007/02/05 12:06:16 adam Exp $
 
-SHA1 (net-snmp-5.3.1.tar.gz) = 8ddb5122769814f04a7d3d352dcc640df7c89d41
-RMD160 (net-snmp-5.3.1.tar.gz) = 7bcdd213fb2517d0927b030deab5146522b58b3d
-Size (net-snmp-5.3.1.tar.gz) = 4210843 bytes
-SHA1 (patch-aa) = 30a4d1546fe7022a0578d01004fc3f284e45c392
+SHA1 (net-snmp-5.4.tar.gz) = 8edb17509eba9f8c9cfb015fe35a1024048129eb
+RMD160 (net-snmp-5.4.tar.gz) = 8ad1f9a3def8022eea48d9b74ae71d8efb59ca61
+Size (net-snmp-5.4.tar.gz) = 5031685 bytes
+SHA1 (patch-aa) = 77d27909157fb2caa4efb4e587395c7998dade12
 SHA1 (patch-ab) = 3227eeb8b54b37813d8b6949f8c6ddc446038bf2
-SHA1 (patch-ae) = 750412088b9ccd5fb50bd6e7fc049903f6113a39
-SHA1 (patch-af) = a04f38cb26153947e9f3daa5c58cbec0ba5715e5
-SHA1 (patch-ag) = c6c355a48c28ae43ee96bff5d5b4b0f1fa9d69b8
+SHA1 (patch-ae) = 721e62bb42b6d3787f36316cf2628cd71ae6a6ce
+SHA1 (patch-af) = cbd871f747d14badb3e2859923d0340e590fbf0f
+SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f
 SHA1 (patch-aj) = eb17148368c9d02c0e589052b99003e7e21f2917
 SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08
-SHA1 (patch-am) = 237adef32b2121e95a9d7bcd332420efedd3dacd
+SHA1 (patch-am) = 64461aef9b4409cd7ed4941e5d5441710a6035d8
 SHA1 (patch-an) = 167f23c62c085efc96a25bc2be5dca3c746dde6f
 SHA1 (patch-da) = 7466445c8388492344acdee236b153cb5f5b45e1
 SHA1 (patch-db) = bec0bee1860ee42ba64b4c07df2280e206eaf582
-SHA1 (patch-dc) = 96fb6bca78a88bd2d9290bc8e47cc49893220104
-SHA1 (patch-dd) = 56957eaf21224d788baf315e35768d2c7b2f2c95
-SHA1 (patch-de) = f6e97f3cc60102c8542409a29fb744339569ef9f
-SHA1 (patch-df) = 3a82b023d3b284150562c66aa8f5c41c6c455367
+SHA1 (patch-dc) = f24a352a09bf6d9e1abb5077176ce3301ac07de7
+SHA1 (patch-dd) = 08da0d1da485959549ac461e5cbb7030f800e643
+SHA1 (patch-de) = 0c09ab5d8dae46b127cd969cbc1d168b307ffbc9
 SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c
-SHA1 (patch-dh) = 1c88c853f867aa363f8995df8ab7023daaba6509
+SHA1 (patch-dh) = c9a776d6574df008adae52a2f08930e0662f70b3
 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348
-SHA1 (patch-dj) = 392a5bcd7e63f0831fc6a6aa34904dd590b05703
-SHA1 (patch-dk) = fdd71ac507b0b589ae4464c2810300a5d2de17a0
-SHA1 (patch-dl) = 6bdf874319b9d2fa28aa5f2cbe9f5cc2697aea68
+SHA1 (patch-dj) = 4c7c759e1f62edf5db1ccf06a22ccee68f3353c5
+SHA1 (patch-dk) = 1025ce87163a45175cc4733b95af7db5fa3da4ff
+SHA1 (patch-dl) = 746d937ff861294f5b858bee8cc2a99c976e1907
 SHA1 (patch-dm) = 05c182f5bc1751ea0a0bcc7e21f24684b3c4933a
 SHA1 (patch-dn) = 16c68c667c129c4fcccdbff704d7d25481691710
 SHA1 (patch-do) = 7a69e6e81cbddbb7fc610f4260fe521a5e4c2348
 SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
 SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
 SHA1 (patch-dr) = ab75e5cf3448d9c0520b6e7d2c68adfbf3ab639b
-SHA1 (patch-ds) = e0319c5f63ed56ab8a9ddc96759f16fd43395096
-SHA1 (patch-dt) = a123c867d5c69bcc64b82a793036527c20a6397b
-SHA1 (patch-ea) = a53857229ff07b943c488b816d051ef7f369b5e2
-SHA1 (patch-eb) = 2685186d7b77481f8668fe63e83ce22a17679678
-SHA1 (patch-ec) = 35b431de21cebe3e11cefe363218e8ac8e202213
-SHA1 (patch-ed) = 078820662a1dccda93ca7b34572f6de968343717
-SHA1 (patch-ee) = 988ba7717a4e72cf12b7f27035062db66bc501ab
-SHA1 (patch-ef) = 9a1064c35e5d1982a12a2b71c37a7bf3ac15c81f
+SHA1 (patch-ds) = 4d59f016eca12660f94dcba89f94e395323ab7b4
+SHA1 (patch-dt) = a8d173926161e4fce26ee5fbf3aeee05802f2598
+SHA1 (patch-ea) = fb13d164075c804617fc73f4cfb51ed5fb25600c
+SHA1 (patch-ee) = ec2a41ba9489bf71412169c0f8367eac214e3738
 SHA1 (patch-eg) = 421ccf1c810a2b03d7ff10fe38e8a3eea62d9836
 SHA1 (patch-eh) = c2dbd651a0fcf6e20b8a9eee68f0ab30763af912
-SHA1 (patch-ei) = b32105823cca960d4ee224ca175fff6c00065df6
+SHA1 (patch-ei) = 6f792c47742a65061882705d5c4837b6f6e07cc4
 SHA1 (patch-ej) = c8047a6109bf6b833c56562d48b56b480c4299be
-SHA1 (patch-ek) = f8a9509b4e7c8fc8c64765525b852c75d5fad41f
-SHA1 (patch-el) = e9cde69d2c60047ad96e1ffe78fabad5bbcf355b
-SHA1 (patch-em) = eab7892fbbc37a3ee25b813a048e54645b6699e7
-SHA1 (patch-en) = 07fbbcf0477a71e1f71cb9d4292f8178323ab548
-SHA1 (patch-eo) = c1d0acc750c024428bea046fae001c8184242105
-SHA1 (patch-ep) = 952e24044ad8a5fe370166d61c76c4760196365c
-SHA1 (patch-eq) = 52f831c88fd7d1f2153686bb5288f4f093a0f41f
-SHA1 (patch-er) = 1ca5658a6c97210174c83f63cc5791d02037541b
+SHA1 (patch-el) = f80dc7058b8a60e3be53e5673538f6eb2d173b68
+SHA1 (patch-ep) = 82071d291813078d27552e5e16e1619e3b3a1bc2
 SHA1 (patch-es) = c26c048ccbda7e4d28cb0a2263cdaa71befb4f96
 SHA1 (patch-et) = 63e31a08413b004608540a28a8fc448966320e7f
diff --git a/net/net-snmp/patches/patch-aa b/net/net-snmp/patches/patch-aa
index 5de05cfbbea..994a26026f4 100644
--- a/net/net-snmp/patches/patch-aa
+++ b/net/net-snmp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2006/06/17 17:20:56 christos Exp $
+$NetBSD: patch-aa,v 1.6 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/host/hr_filesys.c.orig	2005-02-28 07:52:58.000000000 -0500
-+++ agent/mibgroup/host/hr_filesys.c	2006-06-17 12:21:40.000000000 -0400
-@@ -88,6 +88,7 @@
+--- agent/mibgroup/host/hr_filesys.c.orig	2006-08-06 02:01:01.000000000 +0200
++++ agent/mibgroup/host/hr_filesys.c
+@@ -93,6 +93,7 @@ struct mnttab  *HRFS_entry = &HRFS_entry
  
  #elif defined(HAVE_STATVFS) && defined(__NetBSD__)
  
diff --git a/net/net-snmp/patches/patch-ae b/net/net-snmp/patches/patch-ae
index 35628af1651..1d08fabe153 100644
--- a/net/net-snmp/patches/patch-ae
+++ b/net/net-snmp/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.4 2005/03/30 12:10:58 adam Exp $
+$NetBSD: patch-ae,v 1.5 2007/02/05 12:06:16 adam Exp $
 
---- snmplib/snmpUDPIPv6Domain.c.orig	2004-12-24 14:42:23.000000000 +0000
+--- snmplib/snmpUDPIPv6Domain.c.orig	2006-09-25 23:33:43.000000000 +0200
 +++ snmplib/snmpUDPIPv6Domain.c
-@@ -67,6 +67,10 @@ const struct in6_addr in6addr_any = IN6A
- #include <dmalloc.h>
+@@ -73,6 +73,10 @@ const struct in6_addr in6addr_any = IN6A
+ #define SS_FAMILY __ss_family
  #endif
  
 +#if defined(darwin)
diff --git a/net/net-snmp/patches/patch-af b/net/net-snmp/patches/patch-af
index 526e8cd1c8a..f499251ad27 100644
--- a/net/net-snmp/patches/patch-af
+++ b/net/net-snmp/patches/patch-af
@@ -1,17 +1,8 @@
-$NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
+$NetBSD: patch-af,v 1.9 2007/02/05 12:06:16 adam Exp $
 
---- configure.orig	2006-07-13 23:58:38.000000000 +0200
-+++ configure	2006-10-11 21:13:18.000000000 +0200
-@@ -13548,7 +13548,7 @@ else
-    default_mibs=IP-MIB:IF-MIB:TCP-MIB:UDP-MIB:HOST-RESOURCES-MIB:SNMPv2-MIB:RFC1213-MIB:NOTIFICATION-LOG-MIB:DISMAN-EVENT-MIB:DISMAN-SCHEDULE-MIB
- 
-    case $target_os in
--      linux* | freebsd* | dynix* | solaris2* | hpux* )
-+      linux* | freebsd* | dynix* | solaris2* | hpux* | dragonfly* )
-          new_module_list="$new_module_list host"
-          ;;
-       *)
-@@ -15630,6 +15630,53 @@ fi
+--- configure.orig	2006-11-24 18:56:15.000000000 +0100
++++ configure
+@@ -27031,6 +27031,53 @@ fi
  
  fi
  
@@ -65,7 +56,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  # Check for libraries that the agent needs
  # saving old libraries
  NONAGENTLIBS=$LIBS
-@@ -28131,7 +28178,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -40752,7 +40799,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -75,7 +66,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28229,7 +28278,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -40850,7 +40899,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -85,7 +76,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28327,10 +28378,14 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41144,7 +41195,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -94,14 +85,8 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
 +#endif
  #include <sys/socket.h>
  #undef KERNEL
--#undef _KERNEL
-+#if !defined(__DragonFly__)
-+#define _KERNEL
-+#endif
- #include <net/route.h>
- 
- 
-@@ -28414,7 +28469,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #undef _KERNEL
+@@ -41231,7 +41284,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -111,7 +96,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28481,7 +28538,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41298,7 +41353,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -121,7 +106,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28619,7 +28678,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41436,7 +41493,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -131,7 +116,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28714,7 +28775,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41531,7 +41590,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -141,7 +126,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28813,7 +28876,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41630,7 +41691,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -151,7 +136,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -28912,7 +28977,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41729,7 +41792,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
@@ -161,7 +146,7 @@ $NetBSD: patch-af,v 1.8 2006/10/11 19:15:19 rillig Exp $
  #include <sys/socket.h>
  #undef KERNEL
  #undef _KERNEL
-@@ -29011,7 +29078,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -41828,7 +41893,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
  #include <sys/types.h>
  #define KERNEL
diff --git a/net/net-snmp/patches/patch-ag b/net/net-snmp/patches/patch-ag
index d9427e73f26..1c0bbd760cb 100644
--- a/net/net-snmp/patches/patch-ag
+++ b/net/net-snmp/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.9 2006/07/30 06:38:10 adam Exp $
+$NetBSD: patch-ag,v 1.10 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/host/hr_storage.c.orig	2006-06-05 19:38:24.000000000 +0200
+--- agent/mibgroup/host/hr_storage.c.orig	2006-10-12 11:54:57.000000000 +0200
 +++ agent/mibgroup/host/hr_storage.c
-@@ -73,6 +73,13 @@
+@@ -75,6 +75,13 @@
  #endif
  #endif                          /* vm/vm.h */
  #endif                          /* sys/vm.h */
@@ -16,7 +16,7 @@ $NetBSD: patch-ag,v 1.9 2006/07/30 06:38:10 adam Exp $
  #if defined(HAVE_UVM_UVM_PARAM_H) && defined(HAVE_UVM_UVM_EXTERN_H)
  #include <uvm/uvm_param.h>
  #include <uvm/uvm_extern.h>
-@@ -80,20 +87,13 @@
+@@ -82,20 +89,13 @@
  #include <vm/vm_param.h>
  #include <vm/vm_extern.h>
  #endif
@@ -38,36 +38,3 @@ $NetBSD: patch-ag,v 1.9 2006/07/30 06:38:10 adam Exp $
  #if HAVE_SYS_MBUF_H
  #include <sys/mbuf.h>
  #endif
-@@ -732,11 +732,6 @@ really_try_next:
-             case HRS_TYPE_SWAP:
-                 long_return = -1;
- 	        break;
--#if defined(MBSTAT_SYMBOL)
--           case HRS_TYPE_MBUF:
--                long_return = mbstat.m_mbufs;
--                break;
--#endif
- #elif defined(TOTAL_MEMORY_SYMBOL) || defined(USE_SYSCTL_VM)
-             case HRS_TYPE_MEM:
-                 long_return = memory_totals.t_rm;
-@@ -764,6 +759,8 @@ really_try_next:
-             case HRS_TYPE_MBUF:
- #ifdef linux
-                 long_return = linux_mem(store_idx, HRSTORE_SIZE);
-+#elif defined(darwin8) && defined(MBSTAT_SYMBOL)
-+            long_return = mbstat.m_mbufs;
- #elif HAVE_SYS_POOL_H
-                 long_return = 0;
-                 for (i = 0;
-@@ -821,11 +818,6 @@ really_try_next:
- 	    case HRS_TYPE_SWAP:
- 		long_return = -1;
- 		break;
--#if defined(MBSTAT_SYMBOL)
--           case HRS_TYPE_MBUF:
--                long_return = mbstat.m_mbufs;
--                break;
--#endif
- #elif defined(TOTAL_MEMORY_SYMBOL) || defined(USE_SYSCTL_VM)
-             case HRS_TYPE_MEM:
-                 long_return = memory_totals.t_arm;
diff --git a/net/net-snmp/patches/patch-am b/net/net-snmp/patches/patch-am
index ada7cab7d84..100642032a6 100644
--- a/net/net-snmp/patches/patch-am
+++ b/net/net-snmp/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.5 2006/07/29 16:48:27 adam Exp $
+$NetBSD: patch-am,v 1.6 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/host/hr_swrun.c.orig	2006-06-01 15:29:13.000000000 +0200
+--- agent/mibgroup/host/hr_swrun.c.orig	2006-10-17 16:26:21.000000000 +0200
 +++ agent/mibgroup/host/hr_swrun.c
-@@ -896,6 +896,8 @@ var_hrswrun(struct variable * vp,
+@@ -926,6 +926,8 @@ var_hrswrun(struct variable * vp,
  	else
  	    long_return = 4;	/* application */
      #endif
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.5 2006/07/29 16:48:27 adam Exp $
  #else
  	long_return = 4;	/* application */
  #endif
-@@ -1037,6 +1039,10 @@ var_hrswrun(struct variable * vp,
+@@ -1069,6 +1071,10 @@ var_hrswrun(struct variable * vp,
          long_return = 0;
      #elif defined(freebsd5)
          long_return = proc_table[LowProcIndex].ki_runtime / 100000;
diff --git a/net/net-snmp/patches/patch-dc b/net/net-snmp/patches/patch-dc
index b52c30207e7..938a52eecde 100644
--- a/net/net-snmp/patches/patch-dc
+++ b/net/net-snmp/patches/patch-dc
@@ -1,22 +1,22 @@
-$NetBSD: patch-dc,v 1.2 2006/07/29 16:48:27 adam Exp $
+$NetBSD: patch-dc,v 1.3 2007/02/05 12:06:16 adam Exp $
 
---- include/net-snmp/net-snmp-config.h.in.orig	2006-05-26 18:36:06.000000000 +0200
+--- include/net-snmp/net-snmp-config.h.in.orig	2006-10-12 11:54:57.000000000 +0200
 +++ include/net-snmp/net-snmp-config.h.in
-@@ -1225,6 +1225,7 @@
- #define HPUX11ID 14
- #define AIXID 15
- #define MACOSXID 16
-+#define DRAGONFLYID 17
- #define UNKNOWNID 255
+@@ -1418,6 +1418,7 @@
+ #define NETSNMP_HPUX11ID 14
+ #define NETSNMP_AIXID 15
+ #define NETSNMP_MACOSXID 16
++#define NETSNMP_DRAGONFLYID 17
+ #define NETSNMP_UNKNOWNID 255
  
  #ifdef hpux9
-@@ -1254,6 +1255,9 @@
+@@ -1447,6 +1448,9 @@
  #if defined(__FreeBSD__)
- #define OSTYPE FREEBSDID
+ #define NETSNMP_OSTYPE NETSNMP_FREEBSDID
  #endif
 +#if defined(__DragonFly__)
 +#define OSTYPE DRAGONFLYID
 +#endif
  #if defined(irix6) || defined(irix5)
- #define OSTYPE IRIXID
+ #define NETSNMP_OSTYPE NETSNMP_IRIXID
  #endif
diff --git a/net/net-snmp/patches/patch-dd b/net/net-snmp/patches/patch-dd
index 1916627b968..7c48a58e417 100644
--- a/net/net-snmp/patches/patch-dd
+++ b/net/net-snmp/patches/patch-dd
@@ -1,8 +1,8 @@
-$NetBSD: patch-dd,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dd,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- sedscript.in.orig	2006-03-19 18:22:17.000000000 +0000
+--- sedscript.in.orig	2006-11-24 18:53:18.000000000 +0100
 +++ sedscript.in
-@@ -88,6 +88,7 @@ s/FREMOVEMEREEBSDID/FREEBSDID/g
+@@ -96,6 +96,7 @@ s/FREMOVEMEREEBSDID/FREEBSDID/g
  s/IREMOVEMERIXID/IRIXID/g
  s/LREMOVEMEINUXID/LINUXID/g
  s/BREMOVEMESDIID/BSDIID/g
diff --git a/net/net-snmp/patches/patch-de b/net/net-snmp/patches/patch-de
index b8f1e4c65cc..b889c17e100 100644
--- a/net/net-snmp/patches/patch-de
+++ b/net/net-snmp/patches/patch-de
@@ -1,6 +1,6 @@
-$NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-de,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/mibII/ipv6.c.orig	2005-11-16 19:44:51.000000000 +0000
+--- agent/mibgroup/mibII/ipv6.c.orig	2006-11-07 00:43:27.000000000 +0100
 +++ agent/mibgroup/mibII/ipv6.c
 @@ -11,7 +11,7 @@
  #include <sys/types.h>
@@ -20,7 +20,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
  # if HAVE_NETINET_IN_PCB_H
  #  include <netinet/in_pcb.h>
  # endif
-@@ -575,7 +575,7 @@ if_getifnet(int idx, struct ifnet *resul
+@@ -578,7 +578,7 @@ if_getifnet(int idx, struct ifnet *resul
              memcpy(result, &tmp, sizeof(tmp));
              return 0;
          }
@@ -29,7 +29,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
          q = (caddr_t) TAILQ_NEXT(&tmp, if_link);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -806,7 +806,7 @@ var_ifv6Entry(register struct variable *
+@@ -809,7 +809,7 @@ var_ifv6Entry(register struct variable *
  
              if (if_getifnet(interface, &ifnet) < 0)
                  break;
@@ -38,7 +38,16 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
              ifa = (caddr_t) TAILQ_FIRST(&ifnet.if_addrhead);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -827,7 +827,7 @@ var_ifv6Entry(register struct variable *
+@@ -823,7 +823,7 @@ var_ifv6Entry(register struct variable *
+                     DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup failed\n"));
+                     break;
+                 }
+-                if (!NETSNMP_KLOOKUP(ifaddr.ifa_addr, (char *) &sdl, sizeof(sdl));
++                if (!NETSNMP_KLOOKUP(ifaddr.ifa_addr, (char *) &sdl, sizeof(sdl))) {
+                     DEBUGMSGTL(("mibII/ipv6:var_ipv6", "klookup failed\n"));
+                     break;
+                 }
+@@ -835,7 +835,7 @@ var_ifv6Entry(register struct variable *
                      *var_len = sdl.sdl_alen;
                      return (u_char *) (sdl.sdl_data + sdl.sdl_nlen);
                  }
@@ -47,7 +56,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
                  ifa = (caddr_t) TAILQ_NEXT(&ifaddr, ifa_link);
  #else
  # if defined(__NetBSD__) || defined(__OpenBSD__)
-@@ -1230,7 +1230,11 @@ var_udp6(register struct variable * vp,
+@@ -1238,7 +1238,11 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable udbtable;
      caddr_t	    first;
@@ -60,7 +69,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1245,10 +1249,31 @@ var_udp6(register struct variable * vp,
+@@ -1253,10 +1257,31 @@ var_udp6(register struct variable * vp,
      if (!auto_nlist("udbtable", (char *) &udbtable, sizeof(udbtable)))
          return NULL;
      first = p = (caddr_t)udbtable.inpt_queue.cqh_first;
@@ -93,7 +102,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
  #else
      {
          const char     *udblist = "net.inet.udp.pcblist";
-@@ -1276,15 +1301,17 @@ var_udp6(register struct variable * vp,
+@@ -1284,15 +1309,17 @@ var_udp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -101,7 +110,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
 +#elif !defined(freebsd3) && !defined(darwin)
                p && (u_long) p != auto_nlist_value("udb6")
 +#elif defined(dragonfly)
-+              (char *)xig + xig->xi_len <= sysctl_buf + sysctl_len
++	      (char *)xig + xig->xi_len <= sysctl_buf + sysctl_len
  #else
                xig->xig_len > sizeof(struct xinpgen)
  #endif
@@ -110,10 +119,10 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
  
 -#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
 +#if !defined(freebsd3) && !defined(darwin)
-         if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) {
+         if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for udb6 at %x\n",
                          p));
-@@ -1297,7 +1324,7 @@ var_udp6(register struct variable * vp,
+@@ -1305,7 +1332,7 @@ var_udp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -122,7 +131,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1340,13 +1367,15 @@ var_udp6(register struct variable * vp,
+@@ -1348,13 +1375,15 @@ var_udp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -140,7 +149,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1405,7 +1434,7 @@ var_tcp6(register struct variable * vp,
+@@ -1413,7 +1442,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -149,7 +158,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1435,7 +1464,7 @@ var_tcp6(register struct variable * vp,
+@@ -1443,7 +1472,7 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -158,7 +167,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      if (!auto_nlist("tcb6", (char *) &tcb6, sizeof(tcb6)))
          return NULL;
      p = (caddr_t) tcb6.in6p_next;
-@@ -1466,7 +1495,7 @@ var_tcp6(register struct variable * vp,
+@@ -1474,7 +1503,7 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p &&  p != first
@@ -167,16 +176,16 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
                p && (u_long) p != auto_nlist_value("tcb6")
  #else
                xig->xig_len > sizeof(struct xinpgen)
-@@ -1474,7 +1503,7 @@ var_tcp6(register struct variable * vp,
+@@ -1482,7 +1511,7 @@ var_tcp6(register struct variable * vp,
          ) {
          DEBUGMSGTL(("mibII/ipv6", "looping: p=%x\n", p));
  
 -#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
 +#if !defined(freebsd3) && !defined(darwin)
-         if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) {
+         if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n",
                          p));
-@@ -1487,7 +1516,7 @@ var_tcp6(register struct variable * vp,
+@@ -1495,7 +1524,7 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
@@ -185,7 +194,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1546,13 +1575,13 @@ var_tcp6(register struct variable * vp,
+@@ -1552,13 +1581,13 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
@@ -201,7 +210,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      free(sysctl_buf);
  #endif
      DEBUGMSGTL(("mibII/ipv6", "found=%d\n", found));
-@@ -1644,7 +1673,11 @@ var_tcp6(register struct variable * vp,
+@@ -1650,7 +1679,11 @@ var_tcp6(register struct variable * vp,
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
      struct inpcbtable tcbtable;
      caddr_t	    first;
@@ -214,7 +223,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
      char           *sysctl_buf;
      struct xinpgen *xig, *oxig;
  #else
-@@ -1659,10 +1692,31 @@ var_tcp6(register struct variable * vp,
+@@ -1665,10 +1698,31 @@ var_tcp6(register struct variable * vp,
      if (!auto_nlist("tcbtable", (char *) &tcbtable, sizeof(tcbtable)))
          return NULL;
      first = p = (caddr_t)tcbtable.inpt_queue.cqh_first;
@@ -247,7 +256,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
  #else
      {
          const char     *tcblist = "net.inet.tcp.pcblist";
-@@ -1679,7 +1733,8 @@ var_tcp6(register struct variable * vp,
+@@ -1685,7 +1739,8 @@ var_tcp6(register struct variable * vp,
              return NULL;
          }
          oxig = (struct xinpgen *) sysctl_buf;
@@ -257,7 +266,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
          p = (caddr_t) ((char *) xig); /* silence compiler warning */
      }
  #endif
-@@ -1690,28 +1745,32 @@ var_tcp6(register struct variable * vp,
+@@ -1696,28 +1751,32 @@ var_tcp6(register struct variable * vp,
      while (
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
                p && p != first
@@ -265,7 +274,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
 +#elif !defined(freebsd3) && !defined(darwin)
                p && (u_long) p != auto_nlist_value("tcb6")
 +#elif defined(dragonfly)
-+              (char *)xtp + xtp->xt_len < sysctl_buf + sysctl_len
++	      (char *)xtp + xtp->xt_len < sysctl_buf + sysctl_len
  #else
                xig->xig_len > sizeof(struct xinpgen)
  #endif
@@ -274,7 +283,7 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
  
 -#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(darwin)
 +#if !defined(freebsd3) && !defined(darwin)
-         if (klookup((u_long) p, (char *) &in6pcb, sizeof(in6pcb)) < 0) {
+         if (!NETSNMP_KLOOKUP(p, (char *) &in6pcb, sizeof(in6pcb))) {
              DEBUGMSGTL(("mibII/ipv6", "klookup fail for tcb6 at %x\n",
                          p));
              found = 0;
@@ -289,11 +298,11 @@ $NetBSD: patch-de,v 1.1 2006/03/19 22:03:29 joerg Exp $
          if (in6pcb.in6p_af != AF_INET6)
              goto skip;
 -#elif (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(darwin)
-+#elif defined(freebsd3) || defined(darwin)
++#elif (defined(freebsd3) || defined(darwin)
          if (0 == (in6pcb.inp_vflag & INP_IPV6))
              goto skip;
  #endif
-@@ -1769,13 +1828,15 @@ var_tcp6(register struct variable * vp,
+@@ -1773,13 +1832,15 @@ var_tcp6(register struct variable * vp,
        skip:
  #if defined(__NetBSD__) && __NetBSD_Version__ >= 106250000	/*1.6Y*/
          p = (caddr_t)in6pcb.in6p_queue.cqe_next;
diff --git a/net/net-snmp/patches/patch-df b/net/net-snmp/patches/patch-df
deleted file mode 100644
index 6efb2d21791..00000000000
--- a/net/net-snmp/patches/patch-df
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-df,v 1.1 2006/03/19 22:03:29 joerg Exp $
-
---- agent/mibgroup/ucd_snmp.h.orig	2006-03-19 19:01:01.000000000 +0000
-+++ agent/mibgroup/ucd_snmp.h
-@@ -41,6 +41,8 @@ config_arch_require(freebsd5, ucd-snmp/v
- config_arch_require(freebsd5, ucd-snmp/memory_freebsd2)
- config_arch_require(freebsd6, ucd-snmp/vmstat_freebsd2)
- config_arch_require(freebsd6, ucd-snmp/memory_freebsd2)
-+config_arch_require(dragonfly, ucd-snmp/vmstat_freebsd2)
-+config_arch_require(dragonfly, ucd-snmp/memory_freebsd2)
- config_arch_require(netbsd1, ucd-snmp/vmstat_netbsd1)
- config_arch_require(netbsd1, ucd-snmp/memory_netbsd1)
- config_arch_require(netbsd, ucd-snmp/vmstat_netbsd1)
diff --git a/net/net-snmp/patches/patch-dh b/net/net-snmp/patches/patch-dh
index acd1e9ed739..bf436853440 100644
--- a/net/net-snmp/patches/patch-dh
+++ b/net/net-snmp/patches/patch-dh
@@ -1,8 +1,8 @@
-$NetBSD: patch-dh,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dh,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- mibs/UCD-SNMP-MIB.txt.orig	2006-03-19 19:02:22.000000000 +0000
+--- mibs/UCD-SNMP-MIB.txt.orig	2006-11-22 17:49:28.000000000 +0100
 +++ mibs/UCD-SNMP-MIB.txt
-@@ -122,6 +122,9 @@ bsdi              OBJECT IDENTIFIER ::= 
+@@ -127,6 +127,9 @@ bsdi              OBJECT IDENTIFIER ::= 
  openbsd           OBJECT IDENTIFIER ::= { ucdSnmpAgent 12 }
  win32		  OBJECT IDENTIFIER ::= { ucdSnmpAgent 13 } -- unlucky
  hpux11            OBJECT IDENTIFIER ::= { ucdSnmpAgent 14 }
diff --git a/net/net-snmp/patches/patch-dj b/net/net-snmp/patches/patch-dj
index 85a1ffb045c..5ef12b290d8 100644
--- a/net/net-snmp/patches/patch-dj
+++ b/net/net-snmp/patches/patch-dj
@@ -1,11 +1,11 @@
-$NetBSD: patch-dj,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dj,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- Makefile.in.orig	2006-03-19 19:14:48.000000000 +0000
+--- Makefile.in.orig	2006-11-07 15:54:25.000000000 +0100
 +++ Makefile.in
 @@ -20,7 +20,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.
  	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \
  	irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
- 	solaris2.6.h solaris2.7.h solaris2.8.h solaris2.9.h solaris2.10.h \
+ 	solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
 -	solaris.h sunos.h svr5.h sysv.h ultrix4.h
 +	solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
  INCLUDESUBDIR2=machine
diff --git a/net/net-snmp/patches/patch-dk b/net/net-snmp/patches/patch-dk
index 2f314a43e3d..2fe796f9672 100644
--- a/net/net-snmp/patches/patch-dk
+++ b/net/net-snmp/patches/patch-dk
@@ -1,8 +1,8 @@
-$NetBSD: patch-dk,v 1.1 2006/03/19 22:03:29 joerg Exp $
+$NetBSD: patch-dk,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/mibII/ip.c.orig	2006-03-19 19:56:46.000000000 +0000
+--- agent/mibgroup/mibII/ip.c.orig	2006-09-15 02:48:40.000000000 +0200
 +++ agent/mibgroup/mibII/ip.c
-@@ -201,6 +201,11 @@ long            ipTTL, oldipTTL;
+@@ -212,6 +212,11 @@ long            ipTTL, oldipTTL;
  #define	USES_TRADITIONAL_IPSTAT
  #endif
  
diff --git a/net/net-snmp/patches/patch-dl b/net/net-snmp/patches/patch-dl
index 9f0278f6ab5..3f006cdf9cc 100644
--- a/net/net-snmp/patches/patch-dl
+++ b/net/net-snmp/patches/patch-dl
@@ -1,8 +1,8 @@
-$NetBSD: patch-dl,v 1.2 2006/07/29 16:48:27 adam Exp $
+$NetBSD: patch-dl,v 1.3 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/mibII/tcp.c.orig	2006-01-06 01:21:52.000000000 +0100
+--- agent/mibgroup/mibII/tcp.c.orig	2006-09-15 02:48:40.000000000 +0200
 +++ agent/mibgroup/mibII/tcp.c
-@@ -166,6 +166,11 @@ init_tcp(void)
+@@ -177,6 +177,11 @@ init_tcp(void)
  #define USES_TRADITIONAL_TCPSTAT
  #endif
  
diff --git a/net/net-snmp/patches/patch-ds b/net/net-snmp/patches/patch-ds
index b15fc4c324a..7f74cde7d4d 100644
--- a/net/net-snmp/patches/patch-ds
+++ b/net/net-snmp/patches/patch-ds
@@ -1,8 +1,8 @@
-$NetBSD: patch-ds,v 1.2 2006/07/29 16:48:27 adam Exp $
+$NetBSD: patch-ds,v 1.3 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/mibII/udpTable.c.orig	2006-06-27 17:25:38.000000000 +0200
+--- agent/mibgroup/mibII/udpTable.c.orig	2006-11-07 00:43:27.000000000 +0100
 +++ agent/mibgroup/mibII/udpTable.c
-@@ -615,7 +615,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -617,7 +617,11 @@ udpTable_load(netsnmp_cache *cache, void
      size_t   len;
      int      sname[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST };
      char     *udpcb_buf = NULL;
@@ -14,7 +14,7 @@ $NetBSD: patch-ds,v 1.2 2006/07/29 16:48:27 adam Exp $
      UDPTABLE_ENTRY_TYPE  *nnew;
  
      udpTable_free(NULL, NULL);
-@@ -636,10 +640,18 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -638,10 +642,18 @@ udpTable_load(netsnmp_cache *cache, void
       *  Unpick this into the constituent 'xinpgen' structures, and extract
       *     the 'inpcb' elements into a linked list (built in reverse)
       */
@@ -33,7 +33,7 @@ $NetBSD: patch-ds,v 1.2 2006/07/29 16:48:27 adam Exp $
          nnew = SNMP_MALLOC_TYPEDEF(UDPTABLE_ENTRY_TYPE);
          if (!nnew)
              break;
-@@ -652,7 +664,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -654,7 +666,11 @@ udpTable_load(netsnmp_cache *cache, void
  #endif
  
  	udp_head   = nnew;
diff --git a/net/net-snmp/patches/patch-dt b/net/net-snmp/patches/patch-dt
index 39fd895267e..cf3b85d2ee7 100644
--- a/net/net-snmp/patches/patch-dt
+++ b/net/net-snmp/patches/patch-dt
@@ -1,13 +1,13 @@
-$NetBSD: patch-dt,v 1.4 2006/09/24 15:04:35 joerg Exp $
+$NetBSD: patch-dt,v 1.5 2007/02/05 12:06:16 adam Exp $
 
---- agent/Makefile.in.orig	2006-03-19 21:34:14.000000000 +0000
+--- agent/Makefile.in.orig	2006-11-07 15:54:25.000000000 +0100
 +++ agent/Makefile.in
-@@ -137,7 +137,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
+@@ -141,7 +141,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
  	$(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
  
  libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
--	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS)
-+	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) $(MIB_SYSTEM_LIBS)
+-	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@
++	$(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@ $(MIB_SYSTEM_LIBS)
  	$(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
  
  agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
diff --git a/net/net-snmp/patches/patch-ea b/net/net-snmp/patches/patch-ea
index c5b3de1274c..026589f251d 100644
--- a/net/net-snmp/patches/patch-ea
+++ b/net/net-snmp/patches/patch-ea
@@ -1,10 +1,10 @@
-$NetBSD: patch-ea,v 1.2 2006/10/01 20:08:29 seb Exp $
+$NetBSD: patch-ea,v 1.3 2007/02/05 12:06:16 adam Exp $
 
---- snmplib/snmp_api.c.orig	2006-03-09 22:01:14.000000000 +0000
+--- snmplib/snmp_api.c.orig	2006-10-25 18:16:24.000000000 +0200
 +++ snmplib/snmp_api.c
-@@ -6781,7 +6781,7 @@ snmp_add_var(netsnmp_pdu *pdu,
+@@ -6818,7 +6818,7 @@ snmp_add_var(netsnmp_pdu *pdu,
          }
- #endif /* DISABLE_MIB_LOADING */
+ #endif /* NETSNMP_DISABLE_MIB_LOADING */
          atmp = inet_addr(value);
 -        if (atmp != (long) -1 || !strcmp(value, "255.255.255.255"))
 +        if (atmp != (in_addr_t) -1 || !strcmp(value, "255.255.255.255"))
diff --git a/net/net-snmp/patches/patch-eb b/net/net-snmp/patches/patch-eb
deleted file mode 100644
index 94cea3b1188..00000000000
--- a/net/net-snmp/patches/patch-eb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-eb,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- agent/agent_registry.c.orig	2006-06-13 12:50:36.000000000 +0000
-+++ agent/agent_registry.c
-@@ -1458,7 +1458,7 @@ netsnmp_subtree_find_prev(oid *name, siz
-     lookup_cache *lookup_cache = NULL;
-     netsnmp_subtree *myptr = NULL, *previous = NULL;
-     int cmp = 1;
--    int ll_off = 0;
-+    size_t ll_off = 0;
- 
-     if (subtree) {
-         myptr = subtree;
diff --git a/net/net-snmp/patches/patch-ec b/net/net-snmp/patches/patch-ec
deleted file mode 100644
index 81247c497f7..00000000000
--- a/net/net-snmp/patches/patch-ec
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ec,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- agent/helpers/row_merge.c.orig	2006-01-25 16:26:38.000000000 +0000
-+++ agent/helpers/row_merge.c
-@@ -31,7 +31,7 @@ netsnmp_get_row_merge_handler(int prefix
-     ret = netsnmp_create_handler("row_merge",
-                                   netsnmp_row_merge_helper_handler);
-     if (ret) {
--        ret->myvoid = (void *) prefix_len;
-+        ret->myvoid = (void *)(long)prefix_len;
-     }
-     return ret;
- }
-@@ -165,7 +165,7 @@ netsnmp_row_merge_helper_handler(netsnmp
-      * Use the prefix length as supplied during registration, rather
-      *  than trying to second-guess what the MIB implementer wanted.
-      */
--    int SKIP_OID = (int)handler->myvoid;
-+    int SKIP_OID = (int)(long)handler->myvoid;
- 
-     DEBUGMSGTL(("helper:row_merge", "Got request (%d): ", SKIP_OID));
-     DEBUGMSGOID(("helper:row_merge", reginfo->rootoid, reginfo->rootoid_len));
diff --git a/net/net-snmp/patches/patch-ed b/net/net-snmp/patches/patch-ed
deleted file mode 100644
index 6a9e5c4cfdc..00000000000
--- a/net/net-snmp/patches/patch-ed
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- agent/mibgroup/agent/nsDebug.c.orig	2005-04-21 13:32:20.000000000 +0000
-+++ agent/mibgroup/agent/nsDebug.c
-@@ -291,7 +291,7 @@ get_first_debug_entry(void **loop_contex
- 
-     snmp_set_var_value(index, dbg_tokens[i].token_name,
- 		       strlen(dbg_tokens[i].token_name));
--    *loop_context = (void*)i;
-+    *loop_context = (void*)(long)i;
-     *data_context = (void*)&dbg_tokens[i];
-     return index;
- }
-@@ -301,7 +301,7 @@ get_next_debug_entry(void **loop_context
-                       netsnmp_variable_list *index,
-                       netsnmp_iterator_info *data)
- {
--    int i = (int)*loop_context;
-+    int i = (int)(long)*loop_context;
- 
-     for (i++; i<debug_num_tokens; i++) {
-         /* skip excluded til mib is updated */
-@@ -313,7 +313,7 @@ get_next_debug_entry(void **loop_context
- 
-     snmp_set_var_value(index, dbg_tokens[i].token_name,
- 		       strlen(dbg_tokens[i].token_name));
--    *loop_context = (void*)i;
-+    *loop_context = (void*)(long)i;
-     *data_context = (void*)&dbg_tokens[i];
-     return index;
- }
diff --git a/net/net-snmp/patches/patch-ee b/net/net-snmp/patches/patch-ee
index 81d2e626ff6..66252a0fe4d 100644
--- a/net/net-snmp/patches/patch-ee
+++ b/net/net-snmp/patches/patch-ee
@@ -1,6 +1,6 @@
-$NetBSD: patch-ee,v 1.1 2006/10/01 20:08:29 seb Exp $
+$NetBSD: patch-ee,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/host/hr_device.c.orig	2005-11-18 01:44:47.000000000 +0000
+--- agent/mibgroup/host/hr_device.c.orig	2006-09-15 02:48:39.000000000 +0200
 +++ agent/mibgroup/host/hr_device.c
 @@ -222,7 +222,7 @@ var_hrdevice(struct variable *vp,
  {
@@ -10,4 +10,4 @@ $NetBSD: patch-ee,v 1.1 2006/10/01 20:08:29 seb Exp $
 +    const char           *tmp_str;
      static char     string[1024];
  
-     dev_idx =
+ really_try_next:
diff --git a/net/net-snmp/patches/patch-ef b/net/net-snmp/patches/patch-ef
deleted file mode 100644
index 5339209f626..00000000000
--- a/net/net-snmp/patches/patch-ef
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ef,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- agent/mibgroup/if-mib/ifTable/ifTable_interface.c.orig	2006-02-10 22:58:26.000000000 +0000
-+++ agent/mibgroup/if-mib/ifTable/ifTable_interface.c
-@@ -1409,7 +1409,7 @@ _mfd_ifTable_undo_setup_allocate(ifTable
-         netsnmp_assert(NULL != dl);
-         ++(*(int*)&dl->data);
-         DEBUGMSGTL(("internal:ifTable:_mfd_ifTable_undo_setup_allocate",
--                    "++refcount = %d\n",(int)dl->data));
-+                    "++refcount = %d\n",(int)(long)dl->data));
-     }
- 
-     return rc;
-@@ -1487,9 +1487,9 @@ _mfd_ifTable_undo_setup_release(ifTable_
-         return; /* better to lead than double free */
- 
-     --(*(int*)&dl->data);
--    snmp_log(LOG_ERR, "--refcount at %d\n", (int)dl->data);
-+    snmp_log(LOG_ERR, "--refcount at %d\n", (int)(long)dl->data);
- 
--    if (0 == (int)dl->data) {
-+    if (0 == (int)(long)dl->data) {
-         netsnmp_access_interface_entry_free(rowreq_ctx->undo->ifentry);
-         ifTable_release_data(rowreq_ctx->undo);
-         rowreq_ctx->undo = NULL;
diff --git a/net/net-snmp/patches/patch-ei b/net/net-snmp/patches/patch-ei
index 84a00aaae52..7db8d673ec7 100644
--- a/net/net-snmp/patches/patch-ei
+++ b/net/net-snmp/patches/patch-ei
@@ -1,13 +1,13 @@
-$NetBSD: patch-ei,v 1.1 2006/10/01 20:08:29 seb Exp $
+$NetBSD: patch-ei,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- agent/mibgroup/util_funcs.c.orig	2005-12-05 12:15:27.000000000 +0000
+--- agent/mibgroup/util_funcs.c.orig	2006-10-18 04:59:10.000000000 +0200
 +++ agent/mibgroup/util_funcs.c
 @@ -237,7 +237,7 @@ get_exec_output(struct extensible *ex)
  #if HAVE_EXECV
      char            cachefile[STRMAX];
-     char            cache[MAXCACHESIZE];
+     char            cache[NETSNMP_MAXCACHESIZE];
 -    ssize_t         cachebytes;
 +    int             cachebytes;
      int             cfd;
- #ifdef EXCACHETIME
+ #ifdef NETSNMP_EXCACHETIME
      long            curtime;
diff --git a/net/net-snmp/patches/patch-ek b/net/net-snmp/patches/patch-ek
deleted file mode 100644
index 01c996b56bc..00000000000
--- a/net/net-snmp/patches/patch-ek
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ek,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- include/net-snmp/types.h.orig	2006-05-26 16:36:06.000000000 +0000
-+++ include/net-snmp/types.h
-@@ -162,7 +162,7 @@ typedef unsigned INT64_T uint64_t;
-  */
- 
-     typedef struct netsnmp_index_s {
--       int          len;
-+       size_t       len;
-        oid         *oids;
-     } netsnmp_index;
- 
diff --git a/net/net-snmp/patches/patch-el b/net/net-snmp/patches/patch-el
index 91269c47b6a..526d23c5e44 100644
--- a/net/net-snmp/patches/patch-el
+++ b/net/net-snmp/patches/patch-el
@@ -1,16 +1,16 @@
-$NetBSD: patch-el,v 1.1 2006/10/01 20:08:29 seb Exp $
+$NetBSD: patch-el,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- perl/OID/OID.xs.orig	2005-09-09 10:09:31.000000000 +0000
+--- perl/OID/OID.xs.orig	2006-10-25 18:16:24.000000000 +0200
 +++ perl/OID/OID.xs
-@@ -177,17 +177,21 @@ MODULE = NetSNMP::OID		PACKAGE = NetSNMP
+@@ -177,16 +177,21 @@ MODULE = NetSNMP::OID		PACKAGE = NetSNMP
  netsnmp_oid *
  nso_newptr(initstring)
      char *initstring
 +    PREINIT:
-+	STRLEN		len;
++	STRLEN	len;
      CODE:
          if (get_tree_head() == NULL)
-             init_mib();
+             netsnmp_init_mib();
          RETVAL = SNMP_MALLOC_TYPEDEF(netsnmp_oid);
          RETVAL->name = RETVAL->namebuf;
 -        RETVAL->len = sizeof(RETVAL->namebuf)/sizeof(RETVAL->namebuf[0]);
@@ -20,10 +20,9 @@ $NetBSD: patch-el,v 1.1 2006/10/01 20:08:29 seb Exp $
              snmp_log(LOG_ERR, "Can't parse: %s\n", initstring);
              RETVAL->len = 0;
              RETVAL = NULL;
--        }
-+        } else {
-+	    RETVAL->len = len;
 +	}
++	else {
++	    RETVAL->len = len;
+         }
      OUTPUT:
          RETVAL
- 
diff --git a/net/net-snmp/patches/patch-em b/net/net-snmp/patches/patch-em
deleted file mode 100644
index 31f4b3cdf85..00000000000
--- a/net/net-snmp/patches/patch-em
+++ /dev/null
@@ -1,178 +0,0 @@
-$NetBSD: patch-em,v 1.2 2006/10/18 22:37:46 seb Exp $
-
-This contains local (pkgsrc) LP64 patches as well as
-http://net-snmp.cvs.sourceforge.net/net-snmp/net-snmp/perl/SNMP/SNMP.xs?r1=5.50.2.6&r2=5.50.2.7&view=patch&pathrev=V5-3-patches
-
---- perl/SNMP/SNMP.xs.orig	2006-05-26 16:59:15.000000000 +0000
-+++ perl/SNMP/SNMP.xs
-@@ -117,15 +117,15 @@ static int __snprint_value _((char *, si
-                               netsnmp_variable_list*, struct tree *,
-                              int, int));
- static int __sprint_num_objid _((char *, oid *, int));
--static int __scan_num_objid _((char *, oid *, int *));
-+static int __scan_num_objid _((char *, oid *, size_t *));
- static int __get_type_str _((int, char *));
- static int __get_label_iid _((char *, char **, char **, int));
- static int __oid_cmp _((oid *, int, oid *, int));
- static int __tp_sprint_num_objid _((char*,SnmpMibNode *));
- static SnmpMibNode * __get_next_mib_node _((SnmpMibNode *));
- static struct tree * __oid2tp _((oid*, int, struct tree *, int*));
--static struct tree * __tag2oid _((char *, char *, oid  *, int  *, int *, int));
--static int __concat_oid_str _((oid *, int *, char *));
-+static struct tree * __tag2oid _((char *, char *, oid  *, size_t  *, int *, int));
-+static int __concat_oid_str _((oid *, size_t *, char *));
- static int __add_var_val_str _((netsnmp_pdu *, oid *, int, char *,
-                                  int, int));
- static int __send_sync_pdu _((netsnmp_session *, netsnmp_pdu *,
-@@ -583,7 +583,7 @@ static int
- __scan_num_objid (buf, objid, len)
- char *buf;
- oid *objid;
--int *len;
-+size_t *len;
- {
-    char *cp;
-    *len = 0;
-@@ -874,14 +874,14 @@ __tag2oid(tag, iid, oid_arr, oid_arr_len
- char * tag;
- char * iid;
- oid  * oid_arr;
--int  * oid_arr_len;
-+size_t  * oid_arr_len;
- int  * type;
- int    best_guess;
- {
-    struct tree *tp = NULL;
-    struct tree *rtp = NULL;
-    oid newname[MAX_OID_LEN], *op;
--   int newname_len = 0;
-+   size_t newname_len = 0;
-    const char *cp = NULL;
-    char *module = NULL;
- 
-@@ -1022,7 +1022,7 @@ found:
- static int
- __concat_oid_str(doid_arr, doid_arr_len, soid_str)
- oid *doid_arr;
--int *doid_arr_len;
-+size_t *doid_arr_len;
- char * soid_str;
- {
-    char soid_buf[STR_BUF_SIZE];
-@@ -1911,7 +1911,7 @@ _bulkwalk_send_pdu(walk_context *context
-       ** we sent in this request.  Note that this is not a valid SNMP PDU,
-       ** but that's because a response has not yet been received.
-       */
--      return (netsnmp_pdu *)reqid;
-+      return (netsnmp_pdu *)(long)reqid;
-    }
- 
-    /* This code is for synchronous mode support.
-@@ -2320,6 +2320,8 @@ _bulkwalk_finish(walk_context *context, 
-    SV **err_num_svp = hv_fetch((HV*)SvRV(context->sess_ref), "ErrorNum", 8, 1);
- 
-    dSP;
-+   dMARK;
-+   dITEMS;
- 
-    async = SvTRUE(context->perl_cb);
- 
-@@ -2328,6 +2330,8 @@ _bulkwalk_finish(walk_context *context, 
-    ** items pushed onto the stack.  For async, create a new array and push
-    ** the references onto it.  The array is then passed to the Perl callback.
-    */
-+   if(!async)
-+       SP -= items;
- 
-    DBPRT(1, (DBOUT "Bulwalk %s (saved %d/%d), ", okay ? "completed" : "had error",
- 					context->oid_saved, context->oid_total));
-@@ -3006,7 +3010,7 @@ snmp_set(sess_ref, varlist_ref, perl_cal
-            netsnmp_pdu *pdu, *response;
-            struct tree *tp;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            char *tag_pv;
-            snmp_xs_cb_data *xs_cb_data;
-            SV **sess_ptr_sv;
-@@ -3207,7 +3211,7 @@ snmp_get(sess_ref, retry_nosuch, varlist
-            struct tree *tp;
-            int len;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            SV *tmp_sv;
-            int type;
- 	   char tmp_type_str[MAX_TYPE_NAME_LEN];
-@@ -3425,7 +3429,7 @@ snmp_getnext(sess_ref, varlist_ref, perl
-            struct tree *tp;
-            int len;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            SV *tmp_sv;
-            int type;
- 	   char tmp_type_str[MAX_TYPE_NAME_LEN];
-@@ -3669,7 +3673,7 @@ snmp_getbulk(sess_ref, nonrepeaters, max
-            struct tree *tp;
-            int len;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            SV *tmp_sv;
-            int type;
- 	   char tmp_type_str[MAX_TYPE_NAME_LEN];
-@@ -3897,7 +3901,7 @@ snmp_bulkwalk(sess_ref, nonrepeaters, ma
-            netsnmp_session *ss;
-            netsnmp_pdu *pdu = NULL;
- 	   oid oid_arr[MAX_OID_LEN];
--	   int oid_arr_len;
-+	   size_t oid_arr_len;
-            SV **sess_ptr_sv;
-            SV **err_str_svp;
-            SV **err_num_svp;
-@@ -4115,7 +4119,7 @@ snmp_bulkwalk(sess_ref, nonrepeaters, ma
- 	      /* Sent okay...  Return the request ID in 'pdu' as an SvIV. */
- 	      DBPRT(1,(DBOUT "Okay, request id is %d\n", (intptr_t) pdu));
- /*	      XSRETURN_IV((intptr_t)pdu); */
--	      XPUSHs(sv_2mortal(newSViv(pdu)));
-+	      XPUSHs(sv_2mortal(newSViv((intptr_t)pdu)));
- 	      XSRETURN(1);
- 	   }
- 
-@@ -4208,7 +4212,7 @@ snmp_trapV1(sess_ref,enterprise,agent,ge
-            netsnmp_pdu *pdu = NULL;
-            struct tree *tp;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            SV **sess_ptr_sv;
-            SV **err_str_svp;
-            SV **err_num_svp;
-@@ -4347,7 +4351,7 @@ snmp_trapV2(sess_ref,uptime,trap_oid,var
-            netsnmp_pdu *pdu = NULL;
-            struct tree *tp;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            SV **sess_ptr_sv;
-            SV **err_str_svp;
-            SV **err_num_svp;
-@@ -4484,7 +4488,7 @@ snmp_inform(sess_ref,uptime,trap_oid,var
-            netsnmp_pdu *response;
-            struct tree *tp;
- 	   oid *oid_arr;
--	   int oid_arr_len = MAX_OID_LEN;
-+	   size_t oid_arr_len = MAX_OID_LEN;
-            snmp_xs_cb_data *xs_cb_data;
-            SV **sess_ptr_sv;
-            SV **err_str_svp;
-@@ -4715,7 +4719,7 @@ snmp_translate_obj(var,mode,use_long,aut
-            char str_buf[STR_BUF_SIZE];
-            char str_buf_temp[STR_BUF_SIZE];
-            oid oid_arr[MAX_OID_LEN];
--           int oid_arr_len = MAX_OID_LEN;
-+           size_t oid_arr_len = MAX_OID_LEN;
-            char * label;
-            char * iid;
-            int status = FAILURE;
diff --git a/net/net-snmp/patches/patch-en b/net/net-snmp/patches/patch-en
deleted file mode 100644
index 1ab6cda7d63..00000000000
--- a/net/net-snmp/patches/patch-en
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-en,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- snmplib/container_binary_array.c.orig	2005-12-11 19:13:15.000000000 +0000
-+++ snmplib/container_binary_array.c
-@@ -405,7 +405,7 @@ netsnmp_binary_array_insert(netsnmp_cont
-     /*
-      * Insert the new entry into the data array
-      */
--    t->data[t->count++] = entry;
-+    t->data[t->count++] = (void *)(unsigned long)entry;
-     t->dirty = 1;
-     return 0;
- }
diff --git a/net/net-snmp/patches/patch-eo b/net/net-snmp/patches/patch-eo
deleted file mode 100644
index 3cac76c1465..00000000000
--- a/net/net-snmp/patches/patch-eo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-eo,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- snmplib/md5.c.orig	2004-04-19 22:09:07.000000000 +0000
-+++ snmplib/md5.c
-@@ -465,7 +465,7 @@ MDsign(u_char * data, size_t len, u_char
-         goto update_end;
- 
-     i = len;
--    if (((unsigned int) data) % sizeof(long) != 0) {
-+    if (((unsigned long) data) % sizeof(int) != 0) {
-         /*
-          * this relies on the ability to use integer math and thus we
-          * must rely on data that aligns on 32-bit-word-boundries 
diff --git a/net/net-snmp/patches/patch-ep b/net/net-snmp/patches/patch-ep
index ffd75265ade..bcd72034dd5 100644
--- a/net/net-snmp/patches/patch-ep
+++ b/net/net-snmp/patches/patch-ep
@@ -1,11 +1,11 @@
-$NetBSD: patch-ep,v 1.1 2006/10/01 20:08:29 seb Exp $
+$NetBSD: patch-ep,v 1.2 2007/02/05 12:06:16 adam Exp $
 
---- snmplib/scapi.c.orig	2006-01-30 12:08:15.000000000 +0000
+--- snmplib/scapi.c.orig	2006-09-15 14:47:00.000000000 +0200
 +++ snmplib/scapi.c
 @@ -272,7 +272,7 @@ sc_generate_keyed_hash(const oid * autht
  
      u_char          buf[SNMP_MAXBUF_SMALL];
- #if  defined(USE_OPENSSL) || defined(USE_PKCS)
+ #if  defined(NETSNMP_USE_OPENSSL) || defined(NETSNMP_USE_PKCS11)
 -    size_t             buf_len = sizeof(buf);
 +    unsigned int    buf_len = sizeof(buf);
  #endif
diff --git a/net/net-snmp/patches/patch-eq b/net/net-snmp/patches/patch-eq
deleted file mode 100644
index e342b7c2ca9..00000000000
--- a/net/net-snmp/patches/patch-eq
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-eq,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- snmplib/snmp_logging.c.orig	2006-01-25 16:27:41.000000000 +0000
-+++ snmplib/snmp_logging.c
-@@ -380,7 +380,7 @@ snmp_log_options(char *optarg, int argc,
-             if (facility == -1)  return -1;
-             logh->pri_max = pri_max;
-             logh->token   = strdup(snmp_log_syslogname(0));
--            logh->magic   = (void *)facility;
-+            logh->magic   = (void *)(long)facility;
- 	    snmp_enable_syslog_ident(snmp_log_syslogname(0), facility);
- 	}
-         break;
-@@ -600,7 +600,7 @@ netsnmp_logging_restart(void)
-             continue;
-         if (logh->type == NETSNMP_LOGHANDLER_SYSLOG) {
-             snmp_disable_syslog_entry(logh);
--            snmp_enable_syslog_ident(logh->token,(int)logh->magic);
-+            snmp_enable_syslog_ident(logh->token,(int)(long)logh->magic);
-         }
-         else if (logh->type == NETSNMP_LOGHANDLER_FILE) {
-             snmp_disable_filelog_entry(logh);
-@@ -1016,7 +1016,7 @@ log_handler_syslog(  netsnmp_log_handler
- 	 */
-     if (!(logh->imagic)) {
-         const char *ident    = logh->token;
--        int   facility = (int)logh->magic;
-+        int   facility = (int)(long)logh->magic;
-         if (!ident)
-             ident = netsnmp_ds_get_string(NETSNMP_DS_LIBRARY_ID,
-                                           NETSNMP_DS_LIB_APPTYPE);
diff --git a/net/net-snmp/patches/patch-er b/net/net-snmp/patches/patch-er
deleted file mode 100644
index 3317fa450b9..00000000000
--- a/net/net-snmp/patches/patch-er
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-er,v 1.1 2006/10/01 20:08:29 seb Exp $
-
---- snmplib/text_utils.c.orig	2006-03-09 20:57:35.000000000 +0000
-+++ snmplib/text_utils.c
-@@ -461,7 +461,7 @@ _process_line_tvi(netsnmp_line_info *lin
-     /*
-      * get value
-      */
--    switch((int)lpi->user_context) {
-+    switch((int)(long)lpi->user_context) {
- 
-         case PMLP_TYPE_UNSIGNED:
-             tvi->value.ul = strtoul(ptr, NULL, 0);
-@@ -497,7 +497,7 @@ _process_line_tvi(netsnmp_line_info *lin
- 
-         default:
-             snmp_log(LOG_ERR,"unsupported value type %d\n",
--                     (int)lpi->user_context);
-+                     (int)(long)lpi->user_context);
-             break;
-     }
-