Date: Sun, 24 Mar 2013 21:05:36 GMT From: Max Brazhnikov <makc@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/177356: Mk/bsd.port.mk: remove support for USE_CMAKE and KDE4_BUILDENV Message-ID: <201303242105.r2OL5a5F086388@red.freebsd.org> Resent-Message-ID: <201303242110.r2OLA0Qh039318@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303242105.r2OL5a5F086388>