svn commit: r375826 - head/devel/cmake
Raphael Kubo da Costa
rakuco at FreeBSD.org
Tue Dec 30 09:51:00 UTC 2014
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 at 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 ) | \
More information about the svn-ports-head
mailing list