From owner-svn-ports-head@FreeBSD.ORG Sat Nov 9 21:13:58 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 6D6F2459; Sat, 9 Nov 2013 21:13:58 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) 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 3E23D239D; Sat, 9 Nov 2013 21:13:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9LDwJX043267; Sat, 9 Nov 2013 21:13:58 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA9LDvmE043264; Sat, 9 Nov 2013 21:13:57 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201311092113.rA9LDvmE043264@svn.freebsd.org> From: Josh Paetzel Date: Sat, 9 Nov 2013 21:13:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333337 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 21:13:58 -0000 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 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 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