Update to newest version 3.3.1 for -stable,

-current needs some fine tuning, later this evening or week ...

21 files changed, 336 insertions, 357 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net-mgmt/net-snmp-devel/distinfo b/net-mgmt/net-snmp-devel/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net-mgmt/net-snmp-devel/distinfo
+++ b/net-mgmt/net-snmp-devel/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net-mgmt/net-snmp-devel/pkg-plist
+++ b/net-mgmt/net-snmp-devel/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net-mgmt/net-snmp/distinfo b/net-mgmt/net-snmp/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net-mgmt/net-snmp/distinfo
+++ b/net-mgmt/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net-mgmt/net-snmp4/distinfo b/net-mgmt/net-snmp4/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net-mgmt/net-snmp4/distinfo
+++ b/net-mgmt/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net-mgmt/net-snmp4/pkg-plist
+++ b/net-mgmt/net-snmp4/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net-mgmt/net-snmp53/distinfo b/net-mgmt/net-snmp53/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net-mgmt/net-snmp53/distinfo
+++ b/net-mgmt/net-snmp53/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net-mgmt/net-snmp53/pkg-plist
+++ b/net-mgmt/net-snmp53/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net/net-snmp/distinfo
+++ b/net/net-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net/net-snmp/pkg-plist b/net/net-snmp/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net/net-snmp/pkg-plist
+++ b/net/net-snmp/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net/net-snmp4/distinfo b/net/net-snmp4/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net/net-snmp4/distinfo
+++ b/net/net-snmp4/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net/net-snmp4/pkg-plist b/net/net-snmp4/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net/net-snmp4/pkg-plist
+++ b/net/net-snmp4/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index c747f598c27f..986ec17d56c1 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -3,32 +3,30 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.14 1997/11/22 01:27:13 asami Exp $
+# $Id: Makefile,v 1.15 1997/11/23 16:59:12 asami Exp $
 #
 
-DISTNAME=	ucd-snmp-3.2
+DISTNAME=	ucd-snmp-3.3.1
 CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-.if defined(PACKAGE_BUILDING)
+.if defined(BATCH)
 CONFIGURE_ARGS=	--with-defaults --with-sys-contact=nobody@no.where
 .else
 IS_INTERACTIVE= yes
 .endif
-MAN1=		snmpget.1 snmpset.1 snmpwalk.1 snmpbulkwalk.1 \
-		snmpgetnext.1 snmptest.1 snmpnetstat.1 snmptranslate.1 \
-		snmptrap.1 snmpstatus.1
-MAN3=		snmp_api.3 mib_api.3
-MAN5=		variables.5 snmpd.conf.5
-MAN8=		snmptrapd.8 snmpd.8
-
-BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat \
-		snmpset snmpstatus snmptest snmptranslate \
-		snmptrap snmptrapd snmpwalk
-SBIN=		snmpd
+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
+MAN3=		mib_api.3 snmp_api.3
+MAN5=		snmpd.conf.5 variables.5
+MAN8=		snmptrapd.8
+BIN=		snmpbulkwalk snmpget snmpgetnext snmpnetstat snmpset \
+		snmpstatus snmptest snmptranslate snmptrap snmpwalk
+SBIN=		snmpd snmptrapd
 
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
diff --git a/net/ucd-snmp/distinfo b/net/ucd-snmp/distinfo
index f0ca03cb70dd..d059cd54729f 100644
--- a/net/ucd-snmp/distinfo
+++ b/net/ucd-snmp/distinfo
@@ -1 +1 @@
-MD5 (ucd-snmp-3.2.tar.gz) = 9c7a51add40325f296146a058379d764
+MD5 (ucd-snmp-3.3.1.tar.gz) = d5e19a77474080706b30930553f0311b
diff --git a/net/ucd-snmp/pkg-plist b/net/ucd-snmp/pkg-plist
index bc51520320b5..ad36d50cc7f8 100644
--- a/net/ucd-snmp/pkg-plist
+++ b/net/ucd-snmp/pkg-plist
@@ -1,54 +1,34 @@
 bin/snmpbulkwalk
 bin/snmpcheck
+bin/snmpdelta
 bin/snmpget
 bin/snmpgetnext
 bin/snmpnetstat
 bin/snmpset
 bin/snmpstatus
+bin/snmptable
 bin/snmptest
 bin/snmptranslate
 bin/snmptrap
-bin/snmptrapd
 bin/snmpwalk
 etc/rc.d/snmpd.sh
-include/snmp/acl.h
-include/snmp/asn1.h
-include/snmp/context.h
-include/snmp/md5.h
-include/snmp/mib.h
-include/snmp/parse.h
-include/snmp/party.h
-include/snmp/snmp.h
-include/snmp/snmp_api.h
-include/snmp/snmp_client.h
-include/snmp/snmp_impl.h
-include/snmp/system.h
-include/snmp/view.h
+include/ucd-snmp/asn1.h
+include/ucd-snmp/mib.h
+include/ucd-snmp/parse.h
+include/ucd-snmp/snmp.h
+include/ucd-snmp/snmp_api.h
+include/ucd-snmp/snmp_client.h
+include/ucd-snmp/snmp_impl.h
 lib/libsnmp.a
-lib/snmp/mibs/EtherLike-MIB.txt
-lib/snmp/mibs/HOST-RESOURCES-MIB.txt
-lib/snmp/mibs/IANAifType-MIB.txt
-lib/snmp/mibs/IF-MIB.txt
-lib/snmp/mibs/IP-MIB.txt
-lib/snmp/mibs/RFC1155-SMI.txt
-lib/snmp/mibs/RFC1213-MIB.txt
-lib/snmp/mibs/RFC1271-MIB.txt
-lib/snmp/mibs/SNMPv2-CONF.txt
-lib/snmp/mibs/SNMPv2-M2M-MIB.txt
-lib/snmp/mibs/SNMPv2-MIB.txt
-lib/snmp/mibs/SNMPv2-PARTY-MIB.txt
-lib/snmp/mibs/SNMPv2-SMI.txt
-lib/snmp/mibs/SNMPv2-TC.txt
-lib/snmp/mibs/SNMPv2-TM.txt
-lib/snmp/mibs/TCP-MIB.txt
-lib/snmp/mibs/UCD-SNMP-MIB.txt
-lib/snmp/mibs/UDP-MIB.txt
 man/man1/snmpbulkwalk.1.gz
+man/man1/snmpd.1.gz
+man/man1/snmpdelta.1.gz
 man/man1/snmpget.1.gz
 man/man1/snmpgetnext.1.gz
 man/man1/snmpnetstat.1.gz
 man/man1/snmpset.1.gz
 man/man1/snmpstatus.1.gz
+man/man1/snmptable.1.gz
 man/man1/snmptest.1.gz
 man/man1/snmptranslate.1.gz
 man/man1/snmptrap.1.gz
@@ -57,15 +37,34 @@ man/man3/mib_api.3.gz
 man/man3/snmp_api.3.gz
 man/man5/snmpd.conf.5.gz
 man/man5/variables.5.gz
-man/man8/snmpd.8.gz
 man/man8/snmptrapd.8.gz
 sbin/snmpd
+sbin/snmptrapd
 share/examples/ucd-snmp/README
 share/examples/ucd-snmp/acl.conf
 share/examples/ucd-snmp/context.conf
 share/examples/ucd-snmp/party.conf
 share/examples/ucd-snmp/view.conf
-@dirrm lib/snmp/mibs
-@dirrm lib/snmp
-@dirrm include/snmp
+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/RFC1155-SMI.txt
+share/snmp/mibs/RFC1213-MIB.txt
+share/snmp/mibs/RFC1271-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/UCD-SNMP-MIB.txt
+share/snmp/mibs/UDP-MIB.txt
+@dirrm share/snmp/mibs/ucd-snmp
+@dirrm share/snmp/mibs
+@dirrm share/snmp
 @dirrm share/examples/ucd-snmp
+@dirrm include/ucd-snmp