From owner-svn-ports-head@FreeBSD.ORG  Tue Dec 30 09:51:00 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 B611449D;
 Tue, 30 Dec 2014 09:51:00 +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 A240F247D;
 Tue, 30 Dec 2014 09:51:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBU9p06w020002;
 Tue, 30 Dec 2014 09:51:00 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBU9p0vr020001;
 Tue, 30 Dec 2014 09:51:00 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201412300951.sBU9p0vr020001@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: Tue, 30 Dec 2014 09:51:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r375826 - 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: Tue, 30 Dec 2014 09:51:00 -0000

Author: rakuco
Date: Tue Dec 30 09:50:59 2014
New Revision: 375826
URL: https://svnweb.freebsd.org/changeset/ports/375826
QAT: https://qat.redports.org/buildarchive/r375826/

Log:
  Include bsd.port.pre.mk after setting OPTIONS.
  
  r375798 made the OPTIONS prompt show up on every build because
  bsd.port.pre.mk was being included too early. Move the inclusion down one
  section.
  
  PR:		196374
  Submitted by:	Tomoaki AOKI <junchoon@dec.sakura.ne.jp>

Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Tue Dec 30 09:46:39 2014	(r375825)
+++ head/devel/cmake/Makefile	Tue Dec 30 09:50:59 2014	(r375826)
@@ -23,12 +23,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--parallel=${MAKE_JOBS_NUMBER} \
 		--init="${PATCHDIR}/InitialCache.cmake"
 
-.include <bsd.port.pre.mk>
-
-.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
-INSTALL_TARGET=	install/strip
-.endif
-
 .if !defined(CMAKE_MODULES)
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
@@ -40,6 +34,12 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/
 RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
+INSTALL_TARGET=	install/strip
+.endif
+
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \