From owner-svn-ports-all@FreeBSD.ORG  Thu Oct  2 07:26:48 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6B760D2C;
 Thu,  2 Oct 2014 07:26:48 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 57FFE30C;
 Thu,  2 Oct 2014 07:26:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s927QmS8006416;
 Thu, 2 Oct 2014 07:26:48 GMT (envelope-from mva@FreeBSD.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s927QmGf006415;
 Thu, 2 Oct 2014 07:26:48 GMT (envelope-from mva@FreeBSD.org)
Message-Id: <201410020726.s927QmGf006415@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org
 using -f
From: Marcus von Appen <mva@FreeBSD.org>
Date: Thu, 2 Oct 2014 07:26:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369796 - head/Mk/Uses
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Oct 2014 07:26:48 -0000

Author: mva
Date: Thu Oct  2 07:26:47 2014
New Revision: 369796
URL: https://svnweb.freebsd.org/changeset/ports/369796
QAT: https://qat.redports.org/buildarchive/r369796/

Log:
  - Fix WITH_DEBUG with USES=cmake. bsd.ports.mk sets STRIP= after all Uses
    files have been processed initially. If one has WITH_DEBUG=yes set, the
    INSTALL_TARGET for USES=cmake has been set already to install/strip, before
    STRIP is reset.
  
  Differential Revision:	D875
  Approved by:	makc@ (kde), bapt@ (portmgr)

Modified:
  head/Mk/Uses/cmake.mk

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Thu Oct  2 06:17:58 2014	(r369795)
+++ head/Mk/Uses/cmake.mk	Thu Oct  2 07:26:47 2014	(r369796)
@@ -64,7 +64,7 @@ CMAKE_BUILD_TYPE?=	Release
 
 PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
-.if defined(STRIP) && ${STRIP} != ""
+.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET?=	install/strip
 .endif