From nobody@FreeBSD.org  Sun Mar 24 21:05:38 2013
Return-Path: <nobody@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 2B08D552
	for <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <makc@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Mk/bsd.port.mk: remove support for USE_CMAKE and KDE4_BUILDENV
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>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:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 24 21:10:00 UTC 2013
>Closed-Date:    Fri May 31 16:03:58 UTC 2013
>Last-Modified:  Fri May 31 16:10:00 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Mar 24 21:10:08 UTC 2013 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177356 
Responsible-Changed-From-To: portmgr->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Mar 24 23:08:28 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177356 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Fri May 31 16:03:57 UTC 2013 
State-Changed-Why:  
q 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177356 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177356: commit references a PR
Date: Fri, 31 May 2013 16:03:56 +0000 (UTC)

 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)
  
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
