- update py-snmp4 to 4.2.5 and py-snmp4-apps to 0.3.4

- convert to auto-generated auto-plist
- convert to optionsng for DOCS and EXAMPLES
- remove NO_STAGE

while here:
- update LICENSE (count clauses)
- do not use deprecated easy_install and unneeded PYDISTUTILS_* knobs
- make DOCSDIR and EXAPLESDIR contain ${PYTHON_PKGNAMEPREFIX} in it, because
  that ports may be installed for different python versions simultaneously
- use common idiom for installing DOCS and EXAMPLES
- install DOCS and EXAMPLES into stage area uncoditioanlly
- remove inclusions of bsd.port.options.mk
- bump PORTREVISION for py-snmp4-mibs, because package is changed
- replace /bin/bash with /bin/sh in py-snmp4-mibs rebuild-pysnmp-mibs script

PR:		186190
Submitted by:	olgeni
Approved by:	Martin Jackson <mhjacks@swbell.net> (maintainer)

7 files changed, 40 insertions, 124 deletions

diff --git a/net-mgmt/py-snmp4-apps/Makefile b/net-mgmt/py-snmp4-apps/Makefile
index 1df8ba850b1d..76fb01a00ed7 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.3
+PORTVERSION=	0.3.4
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp-apps/${PORTVERSION}
@@ -12,27 +12,20 @@ DISTNAME=	pysnmp-apps-${PORTVERSION}
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	Command line utilities for pysnmp4
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
 
-# Python3 ready
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pysnmp-apps
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-PORTDOCS=	CHANGES \
-		README
+PORTDOCS=	CHANGES README
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-. for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-. endfor
-.endif
+	@${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 a5a2ccd7a10f..103777673a72 100644
--- a/net-mgmt/py-snmp4-apps/distinfo
+++ b/net-mgmt/py-snmp4-apps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pysnmp-apps-0.3.3.tar.gz) = e073732ed34777bdeb018dcd8b3fa51bc85956da80b92da401a4436ee72350e0
-SIZE (pysnmp-apps-0.3.3.tar.gz) = 24193
+SHA256 (pysnmp-apps-0.3.4.tar.gz) = c96c32d543c8f3866ee551962f0e1a0a8440e965bbcd8c1ed67c9a56cd17d18c
+SIZE (pysnmp-apps-0.3.4.tar.gz) = 24617
diff --git a/net-mgmt/py-snmp4-apps/pkg-plist b/net-mgmt/py-snmp4-apps/pkg-plist
deleted file mode 100644
index ef69f05ff97d..000000000000
--- a/net-mgmt/py-snmp4-apps/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/pysnmpbulkwalk
-bin/pysnmpget
-bin/pysnmpset
-bin/pysnmptranslate
-bin/pysnmptrap
-bin/pysnmpwalk
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/net-mgmt/py-snmp4-mibs/Makefile b/net-mgmt/py-snmp4-mibs/Makefile
index 1928717e3a5c..873d02585c0b 100644
--- a/net-mgmt/py-snmp4-mibs/Makefile
+++ b/net-mgmt/py-snmp4-mibs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	snmp4-mibs
 PORTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp-mibs/${PORTVERSION}
@@ -12,30 +13,23 @@ DISTNAME=	pysnmp-mibs-${PORTVERSION}
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	Additional python MIB files for pysnmp4 and friends
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:${PORTSDIR}/net-mgmt/py-snmp4
 
-# Python3 ready
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pysnmp-mibs
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-PLIST_FILES+=	bin/rebuild-pysnmp-mibs \
-		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+PORTDOCS=	CHANGES README
 
-PORTDOCS=	CHANGES \
-		README
+post-patch:
+	${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/tools/rebuild-pysnmp-mibs
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-snmp4/Makefile b/net-mgmt/py-snmp4/Makefile
index a12bdaefe483..f1741d3dd8ed 100644
--- a/net-mgmt/py-snmp4/Makefile
+++ b/net-mgmt/py-snmp4/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	snmp4
-PORTVERSION=	4.2.3
+PORTVERSION=	4.2.5
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	CHEESESHOP \
 		SF/pysnmp/pysnmp/${PORTVERSION}
@@ -12,40 +12,30 @@ DISTNAME=	pysnmp-${PORTVERSION}
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	SNMP framework for Python
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.2:${PORTSDIR}/devel/py-asn1 \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:${PORTSDIR}/security/py-pycrypto
 
-CONFLICTS=	py??-snmp2-[0-9]*
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-# Python3 ready
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pysnmp
-EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
-BASEDOCS=	CHANGES \
-		README \
-		TODO
+BASEDOCS=	CHANGES README TODO
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for f in ${BASEDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	@${CP} -Rv ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-.for d in examples tools
-	@${CP} -Rv ${WRKSRC}/${d}/* ${EXAMPLESDIR}
-.endfor
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${BASEDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/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 5c89fae99c4f..4c3db53289f4 100644
--- a/net-mgmt/py-snmp4/distinfo
+++ b/net-mgmt/py-snmp4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pysnmp-4.2.3.tar.gz) = 4883e49c01570f23ab665cd9b046d8b42f9c652e36ea1cf6996823b283a74ece
-SIZE (pysnmp-4.2.3.tar.gz) = 200868
+SHA256 (pysnmp-4.2.5.tar.gz) = c46e65d99a604f690b3d5800e2f6e26e1ed9a3c7f7e17e7b4b4d897150f7077f
+SIZE (pysnmp-4.2.5.tar.gz) = 225014
diff --git a/net-mgmt/py-snmp4/pkg-plist b/net-mgmt/py-snmp4/pkg-plist
deleted file mode 100644
index 1c2369013795..000000000000
--- a/net-mgmt/py-snmp4/pkg-plist
+++ /dev/null
@@ -1,54 +0,0 @@
-bin/build-pysnmp-mib
-bin/libsmi2pysnmp
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build-pysnmp-mib
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/libsmi2pysnmp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smi/backend.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smi/instrum.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smi/view.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/agent/cmdrsp.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/agent/ntforg.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/manager/bulkgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/manager/getgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/manager/nextgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/manager/ntfrcv.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v1arch/manager/setgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/agent/cmdrsp.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/agent/ntforg.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/manager/bulkgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/manager/getgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/manager/nextgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/manager/ntfrcv.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/manager/setgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/agent/ntforg.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/async/getgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/async/nextgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/bulkgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/getgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/nextgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/oneliner/manager/setgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/proxy/1to3.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/proxy/cmdproxy.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/agent/cmdrsp.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/agent/ntforg.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/manager/bulkgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/manager/getgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/manager/nextgen.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/manager/ntfrcv.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/v3arch/twisted/manager/setgen.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/twisted/manager
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/twisted/agent
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/twisted
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/proxy
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/oneliner/manager/async
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/oneliner/manager
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/oneliner/agent
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/oneliner
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/manager
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch/agent
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v3arch
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v1arch/manager
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v1arch/agent
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/v1arch
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/smi
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%