Update to 3.2.2

3 files changed, 136 insertions, 42 deletions

diff --git a/net-mgmt/py-snmp/Makefile b/net-mgmt/py-snmp/Makefile
index f7284debe4ab..375f8b1c53b3 100644
--- a/net-mgmt/py-snmp/Makefile
+++ b/net-mgmt/py-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	snmp
-PORTVERSION=	3.2.2
+PORTVERSION=	3.3.2
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pysnmp
diff --git a/net-mgmt/py-snmp/distinfo b/net-mgmt/py-snmp/distinfo
index 3ddd79d5d048..87a6a7ce4f28 100644
--- a/net-mgmt/py-snmp/distinfo
+++ b/net-mgmt/py-snmp/distinfo
@@ -1 +1 @@
-MD5 (pysnmp-3.2.2.tar.gz) = 68273e9e39bebb37c9b1352d64a093c4
+MD5 (pysnmp-3.3.2.tar.gz) = 8fba44e9008248b020b922457d639cad
diff --git a/net-mgmt/py-snmp/pkg-plist b/net-mgmt/py-snmp/pkg-plist
index a55aee009571..9d73f422b780 100644
--- a/net-mgmt/py-snmp/pkg-plist
+++ b/net-mgmt/py-snmp/pkg-plist
@@ -7,21 +7,30 @@
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.py
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/base.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/__init__.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/base.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/base.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/base.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/error.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/error.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/error.pyo
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/univ.py
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/univ.pyc
-%%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber/univ.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/base.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/error.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber/univ.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/error.pyo
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.py
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/error.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.py
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/asn1/oidtree.pyo
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.py
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/asn1/univ.pyo
@@ -106,6 +115,48 @@
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.py
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/error.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1157.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/rfc1905.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v1.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v1.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v1.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v2c.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v2c.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic/v2c.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/error.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1157.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/rfc1905.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v1.pyo
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.py
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.pyc
+%%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd/v2c.pyo
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/error.py
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/error.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/error.pyo
@@ -127,6 +178,10 @@
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.py
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.pyc
 %%PYTHON_SITELIBDIR%%/pysnmp/proto/v2c.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/cli/ucd
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/cli
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/api/generic
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto/api
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/proto
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/mapping/udp
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/mapping
@@ -134,22 +189,34 @@
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp2x
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat/pysnmp1x
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/compat
-@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1/ber
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding/ber
+@dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1/encoding
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp/asn1
 @dirrm %%PYTHON_SITELIBDIR%%/pysnmp
+%%PORTDOCS%%share/examples/py-snmp/asyncmgr.py
+%%PORTDOCS%%share/examples/py-snmp/snmpagent.py
+%%PORTDOCS%%share/examples/py-snmp/snmpbulk.py
+%%PORTDOCS%%share/examples/py-snmp/snmpbulkwalk.py
+%%PORTDOCS%%share/examples/py-snmp/snmpget.py
+%%PORTDOCS%%share/examples/py-snmp/snmpset.py
+%%PORTDOCS%%share/examples/py-snmp/snmptrap.py
+%%PORTDOCS%%share/examples/py-snmp/snmptrapd.py
+%%PORTDOCS%%share/examples/py-snmp/snmpwalk.py
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/base-fixed-objects.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/base-simple-objects.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/base-variable-objects.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/base.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/error.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/intro.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/ber/univ.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/error.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/encoding/intro.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base-asn1-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base-choicetypeasn1-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base-recordtypeasn1-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base-simpleasn1-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base-variabletypeasn1-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/base.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/base-fixed-objects.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/base-simple-objects.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/base-variable-objects.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/base.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/error.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/intro.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/ber/univ.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/error.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/intro.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-boolean-objects.html
@@ -157,19 +224,14 @@
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-integer-example.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-integer-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-oid-example.html
+%%PORTDOCS%%share/doc/py-snmp/asn1/univ.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-oid-objects.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-sequence-example.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-sequenceof-example.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-string-example.html
 %%PORTDOCS%%share/doc/py-snmp/asn1/univ-string-objects.html
-%%PORTDOCS%%share/doc/py-snmp/asn1/univ.html
-%%PORTDOCS%%share/doc/py-snmp/compat/intro.html
 %%PORTDOCS%%share/doc/py-snmp/compat/snmpy/intro.html
-%%PORTDOCS%%share/doc/py-snmp/error-objects.html
-%%PORTDOCS%%share/doc/py-snmp/error.html
-%%PORTDOCS%%share/doc/py-snmp/intro.html
-%%PORTDOCS%%share/doc/py-snmp/mapping/error.html
-%%PORTDOCS%%share/doc/py-snmp/mapping/intro.html
+%%PORTDOCS%%share/doc/py-snmp/compat/intro.html
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/asynrole-objects-agent.html
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/asynrole-objects-manager.html
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/asynrole.html
@@ -180,6 +242,40 @@
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/role-agent-objects.html
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/role-manager-objects.html
 %%PORTDOCS%%share/doc/py-snmp/mapping/udp/role.html
+%%PORTDOCS%%share/doc/py-snmp/mapping/error.html
+%%PORTDOCS%%share/doc/py-snmp/mapping/intro.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/error.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/intro.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1157-getrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1157-getresponsepdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1157-trappdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1157.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1905-getbulkrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1905-getrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1905-responsepdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/rfc1905.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/v1-message-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/v1.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/v2c-message-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/generic/v2c.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/error.html
+%%PORTDOCS%%share/doc/py-snmp/proto/api/intro.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/error.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/intro.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1157-getrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1157-setrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1157-trappdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1157.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1905-getrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1905-setrequestpdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1905-trappdu-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/rfc1905.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/v1-message-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/v1.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/v2c-message-objects.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/ucd/v2c.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/error.html
+%%PORTDOCS%%share/doc/py-snmp/proto/cli/intro.html
 %%PORTDOCS%%share/doc/py-snmp/proto/error.html
 %%PORTDOCS%%share/doc/py-snmp/proto/intro.html
 %%PORTDOCS%%share/doc/py-snmp/proto/rfc1155-example.html
@@ -194,29 +290,27 @@
 %%PORTDOCS%%share/doc/py-snmp/proto/v1-getrequest-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v1-getrequest-objects.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v1-getresponse-example.html
-%%PORTDOCS%%share/doc/py-snmp/proto/v1-request-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v1.html
+%%PORTDOCS%%share/doc/py-snmp/proto/v1-request-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v2c-getrequest-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v2c-getrequest-objects.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v2c-request-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v2c-response-example.html
 %%PORTDOCS%%share/doc/py-snmp/proto/v2c.html
-%%PORTDOCS%%share/examples/py-snmp/asyncmgr.py
-%%PORTDOCS%%share/examples/py-snmp/snmpagent.py
-%%PORTDOCS%%share/examples/py-snmp/snmpbulk.py
-%%PORTDOCS%%share/examples/py-snmp/snmpbulkwalk.py
-%%PORTDOCS%%share/examples/py-snmp/snmpget.py
-%%PORTDOCS%%share/examples/py-snmp/snmpset.py
-%%PORTDOCS%%share/examples/py-snmp/snmptable.py
-%%PORTDOCS%%share/examples/py-snmp/snmptrap.py
-%%PORTDOCS%%share/examples/py-snmp/snmptrapd.py
-%%PORTDOCS%%share/examples/py-snmp/snmpwalk.py
-%%PORTDOCS%%@dirrm share/examples/py-snmp
+%%PORTDOCS%%share/doc/py-snmp/error-objects.html
+%%PORTDOCS%%share/doc/py-snmp/error.html
+%%PORTDOCS%%share/doc/py-snmp/intro.html
+%%PORTDOCS%%@dirrm share/doc/py-snmp/proto/cli/ucd
+%%PORTDOCS%%@dirrm share/doc/py-snmp/proto/cli
+%%PORTDOCS%%@dirrm share/doc/py-snmp/proto/api/generic
+%%PORTDOCS%%@dirrm share/doc/py-snmp/proto/api
 %%PORTDOCS%%@dirrm share/doc/py-snmp/proto
 %%PORTDOCS%%@dirrm share/doc/py-snmp/mapping/udp
 %%PORTDOCS%%@dirrm share/doc/py-snmp/mapping
 %%PORTDOCS%%@dirrm share/doc/py-snmp/compat/snmpy
 %%PORTDOCS%%@dirrm share/doc/py-snmp/compat
-%%PORTDOCS%%@dirrm share/doc/py-snmp/asn1/ber
+%%PORTDOCS%%@dirrm share/doc/py-snmp/asn1/encoding/ber
+%%PORTDOCS%%@dirrm share/doc/py-snmp/asn1/encoding
 %%PORTDOCS%%@dirrm share/doc/py-snmp/asn1
 %%PORTDOCS%%@dirrm share/doc/py-snmp
+%%PORTDOCS%%@dirrm share/examples/py-snmp