From owner-svn-ports-head@FreeBSD.ORG Sun Feb 16 14:41:43 2014 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 ESMTPS id D7CD9CDE; Sun, 16 Feb 2014 14:41:43 +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 AAE511349; Sun, 16 Feb 2014 14:41:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1GEfhTc072931; Sun, 16 Feb 2014 14:41:43 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1GEfhdG072930; Sun, 16 Feb 2014 14:41:43 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201402161441.s1GEfhdG072930@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 16 Feb 2014 14:41:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344573 - head/Mk 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.17 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: Sun, 16 Feb 2014 14:41:43 -0000 Author: koobs Date: Sun Feb 16 14:41:43 2014 New Revision: 344573 URL: http://svnweb.freebsd.org/changeset/ports/344573 QAT: https://qat.redports.org/buildarchive/r344573/ Log: Any python package that uses console_scripts in setup.py needs the pkg_resources module from setuptools at run time. This generally means anything that installs a CLI utility. Package-only users do not get setuptools installed when they install the packages of these ports currently, because USE_PYDISTUTILS=yes doesnt set a RUN_DEPENDS on it. This breaks console script invocation, with the following error: Traceback (most recent call last): File "/usr/local/bin/", line 5, in from pkg_resources import load_entry_point ImportError: No module named pkg_resources The FreeBSD Python team has recently standardised on a consistent installation pattern for all python software, whether pure-distutils or setuptools based, and this run-time requirement is currently not being satisfied, breaking ports that use that functionality. This commit moves RUN_DEPENDS+=setuptools from the =easy_install *only* case, to the default case. This does mean that py27-setuptools and py33-setuptools cannot be installed concurrently, precluding dual stack Python installations. The FreeBSD Python team is working hard towards a future where multiple python and packages versions *can* be installed concurrently, but it is not explicitly supported in the current state. Improvements to FreeBSD's ports and package frameworks will help achieve that goal. [1] http://lists.freebsd.org/pipermail/freebsd-python/2014-February/006592.html [2] http://lists.freebsd.org/pipermail/freebsd-python/2014-February/006609.html PR: ports/186706 Reported by: Scott Sturdivant Reviewed by: antoine, rm, mva MFH: 2014Q1 Modified: head/Mk/bsd.python.mk Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Sun Feb 16 14:41:04 2014 (r344572) +++ head/Mk/bsd.python.mk Sun Feb 16 14:41:43 2014 (r344573) @@ -414,11 +414,11 @@ PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELI _CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME} .if defined(USE_PYDISTUTILS) && ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools .endif # setuptools support .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" -RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools PYDISTUTILS_BUILD_TARGET?= bdist_egg PYDISTUTILS_INSTALL_TARGET?= easy_install