Date: Sat, 9 Nov 2013 21:13:57 +0000 (UTC) From: Josh Paetzel <jpaetzel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333337 - head/devel/py-yaml Message-ID: <201311092113.rA9LDvmE043264@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jpaetzel Date: Sat Nov 9 21:13:57 2013 New Revision: 333337 URL: http://svnweb.freebsd.org/changeset/ports/333337 Log: Make port option less confusing. In the context of this port, turning on yaml support doesn't enable the optional yaml support like it does for other ports. It compiles the yaml support against textproc/libyaml, which provides for yaml parsing with the speed of C in the ease of use of a scripting language. PR: ports/183763 Submitted by: Michael Gmelin <freebsd@grem.de> Modified: head/devel/py-yaml/Makefile head/devel/py-yaml/pkg-plist Modified: head/devel/py-yaml/Makefile ============================================================================== --- head/devel/py-yaml/Makefile Sat Nov 9 20:53:16 2013 (r333336) +++ head/devel/py-yaml/Makefile Sat Nov 9 21:13:57 2013 (r333337) @@ -11,7 +11,8 @@ DISTNAME= PyYAML-${PORTVERSION} MAINTAINER= jpaetzel@FreeBSD.org COMMENT= Python YAML parser -OPTIONS_DEFINE= YAML +OPTIONS_DEFINE= LIBYAML +LIBYAML_DESC= Use textproc/libyaml for faster parsing USE_PYTHON= yes USE_PYDISTUTILS= yes @@ -36,7 +37,7 @@ post-install: .include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" .endif -.if ${PORT_OPTIONS:MYAML} +.if ${PORT_OPTIONS:MLIBYAML} PYSETUP= setup.py --with-libyaml PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ @@ -44,11 +45,11 @@ PYDISTUTILS_BUILDARGS+= --include-dirs=$ LIB_DEPENDS+= yaml-0.2:${PORTSDIR}/textproc/libyaml -PLIST_SUB+= YAML="" +PLIST_SUB+= LIBYAML="" .else PYSETUP= setup.py --without-libyaml -PLIST_SUB+= YAML="@comment " +PLIST_SUB+= LIBYAML="@comment " .endif .include <bsd.port.post.mk> Modified: head/devel/py-yaml/pkg-plist ============================================================================== --- head/devel/py-yaml/pkg-plist Sat Nov 9 20:53:16 2013 (r333336) +++ head/devel/py-yaml/pkg-plist Sat Nov 9 21:13:57 2013 (r333337) @@ -1,4 +1,4 @@ -%%YAML%%%%PYTHON_SITELIBDIR%%/_yaml.so +%%LIBYAML%%%%PYTHON_SITELIBDIR%%/_yaml.so %%PYTHON_SITELIBDIR%%/yaml/__init__.py %%PYTHON_SITELIBDIR%%/yaml/__init__.pyc %%PYTHON_SITELIBDIR%%/yaml/__init__.pyo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311092113.rA9LDvmE043264>