From owner-svn-ports-all@FreeBSD.ORG Sun Feb 9 16:41:55 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46B4AF63; Sun, 9 Feb 2014 16:41:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2F36A1366; Sun, 9 Feb 2014 16:41:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19Gft7x015146; Sun, 9 Feb 2014 16:41:55 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19GfsSQ015141; Sun, 9 Feb 2014 16:41:54 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201402091641.s19GfsSQ015141@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Sun, 9 Feb 2014 16:41:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343520 - in head/net-mgmt: py-snmp4 py-snmp4-apps py-snmp4-mibs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 16:41:55 -0000 Author: rm Date: Sun Feb 9 16:41:53 2014 New Revision: 343520 URL: http://svnweb.freebsd.org/changeset/ports/343520 QAT: https://qat.redports.org/buildarchive/r343520/ Log: - 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 (maintainer) Deleted: head/net-mgmt/py-snmp4-apps/pkg-plist head/net-mgmt/py-snmp4/pkg-plist Modified: head/net-mgmt/py-snmp4-apps/Makefile head/net-mgmt/py-snmp4-apps/distinfo head/net-mgmt/py-snmp4-mibs/Makefile head/net-mgmt/py-snmp4/Makefile head/net-mgmt/py-snmp4/distinfo Modified: head/net-mgmt/py-snmp4-apps/Makefile ============================================================================== --- head/net-mgmt/py-snmp4-apps/Makefile Sun Feb 9 16:36:35 2014 (r343519) +++ head/net-mgmt/py-snmp4-apps/Makefile Sun Feb 9 16:41:53 2014 (r343520) @@ -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 Modified: head/net-mgmt/py-snmp4-apps/distinfo ============================================================================== --- head/net-mgmt/py-snmp4-apps/distinfo Sun Feb 9 16:36:35 2014 (r343519) +++ head/net-mgmt/py-snmp4-apps/distinfo Sun Feb 9 16:41:53 2014 (r343520) @@ -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 Modified: head/net-mgmt/py-snmp4-mibs/Makefile ============================================================================== --- head/net-mgmt/py-snmp4-mibs/Makefile Sun Feb 9 16:36:35 2014 (r343519) +++ head/net-mgmt/py-snmp4-mibs/Makefile Sun Feb 9 16:41:53 2014 (r343520) @@ -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 Modified: head/net-mgmt/py-snmp4/Makefile ============================================================================== --- head/net-mgmt/py-snmp4/Makefile Sun Feb 9 16:36:35 2014 (r343519) +++ head/net-mgmt/py-snmp4/Makefile Sun Feb 9 16:41:53 2014 (r343520) @@ -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 Modified: head/net-mgmt/py-snmp4/distinfo ============================================================================== --- head/net-mgmt/py-snmp4/distinfo Sun Feb 9 16:36:35 2014 (r343519) +++ head/net-mgmt/py-snmp4/distinfo Sun Feb 9 16:41:53 2014 (r343520) @@ -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