From owner-svn-ports-all@FreeBSD.ORG Fri May 31 16:03:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C9E05314; Fri, 31 May 2013 16:03:49 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BC5F2D8C; Fri, 31 May 2013 16:03:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4VG3nqE058769; Fri, 31 May 2013 16:03:49 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4VG3nV9058768; Fri, 31 May 2013 16:03:49 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201305311603.r4VG3nV9058768@svn.freebsd.org> From: Martin Wilke Date: Fri, 31 May 2013 16:03:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319529 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 31 May 2013 16:03:49 -0000 Author: miwi Date: Fri May 31 16:03:49 2013 New Revision: 319529 URL: http://svnweb.freebsd.org/changeset/ports/319529 Log: - Remove support for USE_CMAKE and KDE4_BUILDENV, they are no of use anymore. Unconditionally set CMAKE_ARGS in bsd.python.mk, as it don't affect non-cmake ports PR: 177356 Submitted by: makc@ Modified: head/Mk/bsd.python.mk Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Fri May 31 15:54:30 2013 (r319528) +++ head/Mk/bsd.python.mk Fri May 31 16:03:49 2013 (r319529) @@ -671,10 +671,9 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twist # This in turn might cause it to link against version X while using the # includes of version Y, leading to a broken port. # Enforce a certain Python version by using PYTHON_VER for cmake. -.if defined(USE_CMAKE) + CMAKE_ARGS+= -DPythonLibs_FIND_VERSION:STRING="${PYTHON_VER}" \ -DPythonInterp_FIND_VERSION:STRING="${PYTHON_VER}" -.endif .endif # !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)