6 files changed, 20 insertions, 40 deletions

diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 5ae0661227e3..ba0a302b18b2 100644
--- a/net-mgmt/py-snmp4-apps/Makefile
+++ b/net-mgmt/py-snmp4-apps/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	snmp4-apps
-PORTVERSION=	0.3.4
+PORTVERSION=	0.4.1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp-apps/${PORTVERSION}
@@ -14,17 +14,9 @@ COMMENT=	Command line utilities for pysnmp4
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.3.2:net-mgmt/py-snmp4@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
-
-PORTDOCS=	CHANGES README
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-snmp4-apps/distinfo b/net-mgmt/py-snmp4-apps/distinfo
index 103777673a72..4a9d01aecbdb 100644
--- a/net-mgmt/py-snmp4-apps/distinfo
+++ b/net-mgmt/py-snmp4-apps/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pysnmp-apps-0.3.4.tar.gz) = c96c32d543c8f3866ee551962f0e1a0a8440e965bbcd8c1ed67c9a56cd17d18c
-SIZE (pysnmp-apps-0.3.4.tar.gz) = 24617
+TIMESTAMP = 1523653364
+SHA256 (pysnmp-apps-0.4.1.tar.gz) = 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7
+SIZE (pysnmp-apps-0.4.1.tar.gz) = 25525
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index df70f8e381e4..d82fc532b9e4 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	snmp4-mibs
-PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTVERSION=	0.1.6
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp-mibs/${PORTVERSION}
@@ -15,20 +14,9 @@ COMMENT=	Additional python MIB files for pysnmp4 and friends
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.3.2:net-mgmt/py-snmp4@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
-DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
-
-PORTDOCS=	CHANGES README
-
-post-patch:
-	${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/tools/rebuild-pysnmp-mibs
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-snmp4-mibs/distinfo b/net-mgmt/py-snmp4-mibs/distinfo
index 1423a92ec895..519bef6aad75 100644
--- a/net-mgmt/py-snmp4-mibs/distinfo
+++ b/net-mgmt/py-snmp4-mibs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pysnmp-mibs-0.1.4.tar.gz) = a499ef45d942f42ab9e922c7da93efa084a7ec490ba6cad576b64a7d573ec043
-SIZE (pysnmp-mibs-0.1.4.tar.gz) = 1982745
+TIMESTAMP = 1523653156
+SHA256 (pysnmp-mibs-0.1.6.tar.gz) = 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c
+SIZE (pysnmp-mibs-0.1.6.tar.gz) = 2113334
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index c1248cc164fb..f4772d8a7709 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	snmp4
-PORTVERSION=	4.2.5
-PORTREVISION=	1
+PORTVERSION=	4.3.2
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp/${PORTVERSION}
@@ -18,6 +17,8 @@ LICENSE=	BSD2CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${FLAVOR}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USES=		python
 USE_PYTHON=	distutils autoplist
 
@@ -27,15 +28,11 @@ DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-BASEDOCS=	CHANGES README TODO
-
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${BASEDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/docs/source/docs && \
+	    ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-	(cd ${WRKSRC}/tools && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-snmp4/distinfo b/net-mgmt/py-snmp4/distinfo
index 4c3db53289f4..be2d39dc8b9d 100644
--- a/net-mgmt/py-snmp4/distinfo
+++ b/net-mgmt/py-snmp4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pysnmp-4.2.5.tar.gz) = c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f
-SIZE (pysnmp-4.2.5.tar.gz) = 225014
+TIMESTAMP = 1523652000
+SHA256 (pysnmp-4.3.2.tar.gz) = 7c2bd81df17aa7dca0057a68e7a32284a72231309a0237d66d5b803b5c118977
+SIZE (pysnmp-4.3.2.tar.gz) = 398593