From owner-svn-ports-all@FreeBSD.ORG Sun Feb 9 11:57:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70546CE3; Sun, 9 Feb 2014 11:57:32 +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 4C0F41E3A; Sun, 9 Feb 2014 11:57:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19BvWwk093338; Sun, 9 Feb 2014 11:57:32 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19BvVCF093336; Sun, 9 Feb 2014 11:57:31 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201402091157.s19BvVCF093336@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 9 Feb 2014 11:57:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343474 - head/devel/py-yaml 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 11:57:32 -0000 Author: koobs Date: Sun Feb 9 11:57:31 2014 New Revision: 343474 URL: http://svnweb.freebsd.org/changeset/ports/343474 QAT: https://qat.redports.org/buildarchive/r343474/ Log: devel/py-yaml: Modernise: STAGE, AUTOPLIST & more - Enable STAGE support - Enable AUTOPLIST support, update pkg-plist - Use PyPi (CHEESESHOP) master site, Geo-CDN backed - Add LICENSE (MIT) - Deprecate PYDISTUTILS_PKGNAME, not needed with AUTOPLIST - Remove PLIST_SUB, not necessary with AUTOPLIST - Deprecate OPTIONSFILE override - Deprecate py3k-fix-pkg-plist.inc hack - Use new LIB_DEPENDS convention - Makefile: Whitespace alignment - Bump PORTREVISION Approved by: portmgr (blanket) Modified: head/devel/py-yaml/Makefile head/devel/py-yaml/pkg-plist Modified: head/devel/py-yaml/Makefile ============================================================================== --- head/devel/py-yaml/Makefile Sun Feb 9 11:57:11 2014 (r343473) +++ head/devel/py-yaml/Makefile Sun Feb 9 11:57:31 2014 (r343474) @@ -3,53 +3,43 @@ PORTNAME= yaml PORTVERSION= 3.10 +PORTREVISION= 1 CATEGORIES= devel python -MASTER_SITES= http://pyyaml.org/download/pyyaml/ +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= PyYAML-${PORTVERSION} MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Python YAML parser +LICENSE= MIT + OPTIONS_DEFINE= LIBYAML LIBYAML_DESC= Use textproc/libyaml for faster parsing -USE_PYTHON= yes +USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= PyYAML - -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options +PYDISTUTILS_AUTOPLIST= yes EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MEXAMPLES} post-install: - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/) + @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) .endif .include -.if ${PYTHON_REL} >= 320 -.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" -.endif - .if ${PORT_OPTIONS:MLIBYAML} -PYDISTUTILS_SETUP+= --with-libyaml +PYDISTUTILS_SETUP+= --with-libyaml PYDISTUTILS_BUILD_TARGET= build_ext -PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ - --library-dirs=${LOCALBASE}/lib - -LIB_DEPENDS+= yaml-0.2:${PORTSDIR}/textproc/libyaml - -PLIST_SUB+= LIBYAML="" +PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ + --library-dirs=${LOCALBASE}/lib +LIB_DEPENDS+= libyaml.so:${PORTSDIR}/textproc/libyaml .else -PYDISTUTILS_SETUP+= --without-libyaml - -PLIST_SUB+= LIBYAML="@comment " +PYDISTUTILS_SETUP+= --without-libyaml .endif .include Modified: head/devel/py-yaml/pkg-plist ============================================================================== --- head/devel/py-yaml/pkg-plist Sun Feb 9 11:57:11 2014 (r343473) +++ head/devel/py-yaml/pkg-plist Sun Feb 9 11:57:31 2014 (r343474) @@ -1,56 +1,3 @@ -%%LIBYAML%%%%PYTHON_SITELIBDIR%%/_yaml.so -%%PYTHON_SITELIBDIR%%/yaml/__init__.py -%%PYTHON_SITELIBDIR%%/yaml/__init__.pyc -%%PYTHON_SITELIBDIR%%/yaml/__init__.pyo -%%PYTHON_SITELIBDIR%%/yaml/composer.py -%%PYTHON_SITELIBDIR%%/yaml/composer.pyc -%%PYTHON_SITELIBDIR%%/yaml/composer.pyo -%%PYTHON_SITELIBDIR%%/yaml/constructor.py -%%PYTHON_SITELIBDIR%%/yaml/constructor.pyc -%%PYTHON_SITELIBDIR%%/yaml/constructor.pyo -%%PYTHON_SITELIBDIR%%/yaml/cyaml.py -%%PYTHON_SITELIBDIR%%/yaml/cyaml.pyc -%%PYTHON_SITELIBDIR%%/yaml/cyaml.pyo -%%PYTHON_SITELIBDIR%%/yaml/dumper.py -%%PYTHON_SITELIBDIR%%/yaml/dumper.pyc -%%PYTHON_SITELIBDIR%%/yaml/dumper.pyo -%%PYTHON_SITELIBDIR%%/yaml/emitter.py -%%PYTHON_SITELIBDIR%%/yaml/emitter.pyc -%%PYTHON_SITELIBDIR%%/yaml/emitter.pyo -%%PYTHON_SITELIBDIR%%/yaml/error.py -%%PYTHON_SITELIBDIR%%/yaml/error.pyc -%%PYTHON_SITELIBDIR%%/yaml/error.pyo -%%PYTHON_SITELIBDIR%%/yaml/events.py -%%PYTHON_SITELIBDIR%%/yaml/events.pyc -%%PYTHON_SITELIBDIR%%/yaml/events.pyo -%%PYTHON_SITELIBDIR%%/yaml/loader.py -%%PYTHON_SITELIBDIR%%/yaml/loader.pyc -%%PYTHON_SITELIBDIR%%/yaml/loader.pyo -%%PYTHON_SITELIBDIR%%/yaml/nodes.py -%%PYTHON_SITELIBDIR%%/yaml/nodes.pyc -%%PYTHON_SITELIBDIR%%/yaml/nodes.pyo -%%PYTHON_SITELIBDIR%%/yaml/parser.py -%%PYTHON_SITELIBDIR%%/yaml/parser.pyc -%%PYTHON_SITELIBDIR%%/yaml/parser.pyo -%%PYTHON_SITELIBDIR%%/yaml/reader.py -%%PYTHON_SITELIBDIR%%/yaml/reader.pyc -%%PYTHON_SITELIBDIR%%/yaml/reader.pyo -%%PYTHON_SITELIBDIR%%/yaml/representer.py -%%PYTHON_SITELIBDIR%%/yaml/representer.pyc -%%PYTHON_SITELIBDIR%%/yaml/representer.pyo -%%PYTHON_SITELIBDIR%%/yaml/resolver.py -%%PYTHON_SITELIBDIR%%/yaml/resolver.pyc -%%PYTHON_SITELIBDIR%%/yaml/resolver.pyo -%%PYTHON_SITELIBDIR%%/yaml/scanner.py -%%PYTHON_SITELIBDIR%%/yaml/scanner.pyc -%%PYTHON_SITELIBDIR%%/yaml/scanner.pyo -%%PYTHON_SITELIBDIR%%/yaml/serializer.py -%%PYTHON_SITELIBDIR%%/yaml/serializer.pyc -%%PYTHON_SITELIBDIR%%/yaml/serializer.pyo -%%PYTHON_SITELIBDIR%%/yaml/tokens.py -%%PYTHON_SITELIBDIR%%/yaml/tokens.pyc -%%PYTHON_SITELIBDIR%%/yaml/tokens.pyo -@dirrm %%PYTHON_SITELIBDIR%%/yaml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygments-lexer/yaml.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pygments-lexer/example.yaml %%PORTEXAMPLES%%%%EXAMPLESDIR%%/yaml-highlight/yaml_hl.cfg