From owner-svn-ports-head@FreeBSD.ORG  Mon Dec 29 20:10:21 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4A1E8FEA;
 Mon, 29 Dec 2014 20:10:21 +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 3607336C7;
 Mon, 29 Dec 2014 20:10:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBTKALeC025401;
 Mon, 29 Dec 2014 20:10:21 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBTKALge025400;
 Mon, 29 Dec 2014 20:10:21 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201412292010.sBTKALge025400@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Mon, 29 Dec 2014 20:10:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375798 - head/devel/cmake
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Dec 2014 20:10:21 -0000

Author: rakuco
Date: Mon Dec 29 20:10:20 2014
New Revision: 375798
URL: https://svnweb.freebsd.org/changeset/ports/375798
QAT: https://qat.redports.org/buildarchive/r375798/

Log:
  Check for WITH_DEBUG when changing INSTALL_TARGET.
  
  We have the same problem described in https://reviews.freebsd.org/D875:
  > bsd.ports.mk sets STRIP= after all Uses files have been processed
  > initially. If you have WITH_DEBUG=yes set, cmake's INSTALL_TARGET has been
  > set already to install/strip, before STRIP is reset.
  
  In other words, INSTALL_TARGET would always be set to "install/strip"
  even when WITH_DEBUG was set.
  
  Since we do not use USES=cmake here the fix (check for WITH_DEBUG besides
  evaluating STRIP) needs to be duplicated in the Makefile.

Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Mon Dec 29 18:37:28 2014	(r375797)
+++ head/devel/cmake/Makefile	Mon Dec 29 20:10:20 2014	(r375798)
@@ -23,7 +23,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${PATCHDIR}/InitialCache.cmake"
 
-.if defined(STRIP) && ${STRIP} != ""
+.include <bsd.port.pre.mk>
+
+.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
 INSTALL_TARGET=	install/strip
 .endif
 
@@ -62,4 +64,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>