From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 24 21:10:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 A8CFC780 for ; Sun, 24 Mar 2013 21:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 8EB9D665 for ; Sun, 24 Mar 2013 21:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r2OLA0E5039319 for ; Sun, 24 Mar 2013 21:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r2OLA0Qh039318; Sun, 24 Mar 2013 21:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 24 Mar 2013 21:10:00 GMT Resent-Message-Id: <201303242110.r2OLA0Qh039318@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Max Brazhnikov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2B08D552 for ; Sun, 24 Mar 2013 21:05:38 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB21638 for ; Sun, 24 Mar 2013 21:05:38 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2OL5alK086389 for ; Sun, 24 Mar 2013 21:05:36 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r2OL5a5F086388; Sun, 24 Mar 2013 21:05:36 GMT (envelope-from nobody) Message-Id: <201303242105.r2OL5a5F086388@red.freebsd.org> Date: Sun, 24 Mar 2013 21:05:36 GMT From: Max Brazhnikov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/177356: Mk/bsd.port.mk: remove support for USE_CMAKE and KDE4_BUILDENV X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Mar 2013 21:10:00 -0000 >Number: 177356 >Category: ports >Synopsis: Mk/bsd.port.mk: remove support for USE_CMAKE and KDE4_BUILDENV >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 24 21:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Max Brazhnikov >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: >Description: Remove support for USE_CMAKE and KDE4_BUILDENV, they are no of use anymore. Unconditionally set CMAKE_ARGS in bsd.python.mk, as it shouldn't affect non-cmake ports >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Uses/cmake.mk =================================================================== --- Uses/cmake.mk (revision 315161) +++ Uses/cmake.mk (working copy) @@ -36,9 +36,6 @@ # CMAKE_SOURCE_PATH - Path to the source directory # Default: ${WRKSRC} # -# Deprecated variables: -# CMAKE_OUTSOURCE - Instruct to perform an out-of-source build. -# Deprecated, use 'USES+= cmake:outsource' instead. .if !defined(_INCLUDE_USES_CMAKE_MK) _INCLUDE_USES_CMAKE_MK= yes Index: bsd.port.mk =================================================================== --- bsd.port.mk (revision 315161) +++ bsd.port.mk (working copy) @@ -1496,7 +1496,7 @@ .include "${PORTSDIR}/Mk/bsd.xfce.mk" .endif -.if defined(USE_KDE4) || defined(KDE4_BUILDENV) +.if defined(USE_KDE4) .include "${PORTSDIR}/Mk/bsd.kde4.mk" .endif @@ -1506,14 +1506,6 @@ .include "${PORTSDIR}/Mk/bsd.pbi.mk" -.if defined(USE_CMAKE) -. if defined(CMAKE_OUTSOURCE) -USES+= cmake:outsource -. else -USES+= cmake -. endif -.endif - # Loading features .for f in ${USES} _f=${f:C/\:.*//g} Index: bsd.python.mk =================================================================== --- bsd.python.mk (revision 315161) +++ bsd.python.mk (working copy) @@ -669,10 +669,8 @@ # 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) >Release-Note: >Audit-Trail: >Unformatted: