21 files changed, 280 insertions, 245 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net-mgmt/net-snmp-devel/distinfo
+++ b/net-mgmt/net-snmp-devel/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net-mgmt/net-snmp4/distinfo
+++ b/net-mgmt/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net-mgmt/net-snmp53/distinfo
+++ b/net-mgmt/net-snmp53/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net/net-snmp/pkg-plist
+++ b/net/net-snmp/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net/net-snmp4/distinfo
+++ b/net/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net/net-snmp4/pkg-plist
+++ b/net/net-snmp4/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 0402cdee8f39..f71ff9f88b16 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -3,10 +3,10 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.28 1999/04/30 12:59:50 kris Exp $
+# $Id: Makefile,v 1.29 1999/08/22 18:59:35 mharo Exp $
 #
 
-DISTNAME=	ucd-snmp-3.6.1
+DISTNAME=	ucd-snmp-4.0
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
@@ -27,7 +27,7 @@ IS_INTERACTIVE= yes
 
 MAN1=		snmpbulkwalk.1 snmpd.1 snmpdelta.1 snmpget.1 snmpgetnext.1 \
 		snmpnetstat.1 snmpset.1 snmpstatus.1 snmptable.1 snmptest.1 \
-		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1
+		snmptranslate.1 snmptrap.1 snmpwalk.1 snmpcmd.1 snmpusm.1
 MAN3=		read_config.3 mib_api.3 snmp_api.3 snmp_sess_api.3
 MAN5=		snmp.conf.5 snmp_config.5 snmpd.conf.5 \
 		snmptrapd.conf.5 variables.5
@@ -43,11 +43,15 @@ STARTUP_FILE=	${PREFIX}/etc/rc.d/snmpd.sh.sample
 .if ${PORTOBJFORMAT} == "aout"
 BROKEN=		"aout build breaks: ld: internal error: RRS relocs exceed allocation 343"
 .endif
+.if ${OSVERSION} >= 400000
+BROKEN=		"Uses the old VM system interfaces"
+.endif
 
 SHLIB_VERSION=3
+PLIST_SUB= shlib=${SHLIB_VERSION}
 
 post-patch:
-	${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
+	@${CP} ${FILESDIR}/freebsd4.h ${WRKSRC}/s
 
 post-install:
 	( cd ${PREFIX}/bin && strip ${BIN} )
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo
index d3bd2ef7d60a..094df6eaf696 100644
--- a/net/ucd-snmp/distinfo
+++ b/net/ucd-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.6.1.tar.gz) = 4ebb94d59c086cef4dbb27396f9b77cb
+MD5 (ucd-snmp-4.0.tar.gz) = 1bec9424e42a906726bd7dbb2d1ca2a8
diff --git a/net/ucd-snmp/pkg-plist b/net/ucd-snmp/pkg-plist
index 7945090e103b..5e1fb0b00e9d 100644
--- a/net/ucd-snmp/pkg-plist
+++ b/net/ucd-snmp/pkg-plist
@@ -1,38 +1,39 @@
-bin/snmpnetstat
-bin/snmpwalk
+bin/encode_keychange
 bin/snmpbulkwalk
-bin/snmptest
-bin/snmptranslate
+bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
-bin/snmpset
 bin/snmpgetnext
-bin/snmptrap
+bin/snmpnetstat
+bin/snmpset
 bin/snmpstatus
-bin/snmpdelta
 bin/snmptable
-bin/snmpcheck
+bin/snmptest
+bin/snmptranslate
+bin/snmptrap
+bin/snmpusm
+bin/snmpwalk
 bin/tkmib
 etc/rc.d/snmpd.sh.sample
-include/ucd-snmp/acl.h
 include/ucd-snmp/asn1.h
-include/ucd-snmp/context.h
+include/ucd-snmp/callback.h
+include/ucd-snmp/default_store.h
 include/ucd-snmp/int64.h
 include/ucd-snmp/mib.h
 include/ucd-snmp/parse.h
-include/ucd-snmp/party.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_alarm.h
 include/ucd-snmp/snmp_api.h
 include/ucd-snmp/snmp_client.h
 include/ucd-snmp/snmp_debug.h
 include/ucd-snmp/snmp_impl.h
-include/ucd-snmp/snmp.h
 include/ucd-snmp/system.h
 include/ucd-snmp/ucd-snmp-config.h
 include/ucd-snmp/ucd-snmp-includes.h
 include/ucd-snmp/version.h
-include/ucd-snmp/view.h
 @dirrm include/ucd-snmp
 lib/libsnmp.so
-lib/libsnmp.so.3.5
+lib/libsnmp.so.%%shlib%%
 sbin/snmpd
 sbin/snmptrapd
 share/examples/ucd-snmp/README
@@ -42,32 +43,32 @@ share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
 @dirrm share/examples/ucd-snmp
 share/snmp/mibs/DLMOD-MIB.txt
+share/snmp/mibs/EtherLike-MIB.txt
+share/snmp/mibs/HOST-RESOURCES-MIB.txt
+share/snmp/mibs/IANAifType-MIB.txt
+share/snmp/mibs/IF-MIB.txt
+share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/IPFWACC-MIB.txt
 share/snmp/mibs/RFC1155-SMI.txt
 share/snmp/mibs/RFC1213-MIB.txt
-share/snmp/mibs/SNMPv2-CONF.txt
-share/snmp/mibs/SNMPv2-SMI.txt
-share/snmp/mibs/SNMPv2-TC.txt
-share/snmp/mibs/SNMPv2-TM.txt
-share/snmp/mibs/SNMPv2-MIB.txt
-share/snmp/mibs/SNMPv2-M2M-MIB.txt
-share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
 share/snmp/mibs/SNMP-MPD-MIB.txt
-share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
 share/snmp/mibs/SNMP-PROXY-MIB.txt
+share/snmp/mibs/SNMP-TARGET-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
-share/snmp/mibs/IANAifType-MIB.txt
-share/snmp/mibs/IF-MIB.txt
-share/snmp/mibs/IP-MIB.txt
+share/snmp/mibs/SNMPv2-CONF.txt
+share/snmp/mibs/SNMPv2-M2M-MIB.txt
+share/snmp/mibs/SNMPv2-MIB.txt
+share/snmp/mibs/SNMPv2-PARTY-MIB.txt
+share/snmp/mibs/SNMPv2-SMI.txt
+share/snmp/mibs/SNMPv2-TC.txt
+share/snmp/mibs/SNMPv2-TM.txt
 share/snmp/mibs/TCP-MIB.txt
-share/snmp/mibs/UDP-MIB.txt
-share/snmp/mibs/EtherLike-MIB.txt
-share/snmp/mibs/HOST-RESOURCES-MIB.txt
-share/snmp/mibs/RFC1271-MIB.txt
 share/snmp/mibs/UCD-SNMP-MIB.txt
-share/snmp/mibs/IPFWACC-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
 @unexec rm -f %D/share/snmp/mibs/.index
 @dirrm share/snmp/mibs
 @dirrm share/snmp