svn commit: r347674 - in head/devel/cmake: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Mar  9 17:58:30 2014
New Revision: 347674
URL: http://svnweb.freebsd.org/changeset/ports/347674
QAT: https://qat.redports.org/buildarchive/r347674/

Log:
  Make the port build with security/openssl installed after r347541.
  
  Add a patch sent upstream that makes sure the bundled curl's include paths
  are passed to the compiler before any other ones, since they could include
  the system's curl include directory.
  
  One way to trigger this was to build the port with security/openssl
  installed: CMake would detect OpenSSL's include path (${LOCALBASE}/include)
  and pass it to the compiler. If ftp/curl is also installed, the compiler
  would end up picking its headers instead of the ones in cmcurl's own
  directory.
  
  Reported by:	Terry Kennedy <terry at tmk.com>
  MFH:		2014Q1

Added:
  head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt   (contents, props changed)
Modified:
  head/devel/cmake/Makefile

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Sun Mar  9 17:42:56 2014	(r347673)
+++ head/devel/cmake/Makefile	Sun Mar  9 17:58:30 2014	(r347674)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmake
 PORTVERSION=	2.8.12.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.cmake.org/files/v2.8/
 

Added: head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cmake/files/patch-Utilities__cmcurl__CMakeLists.txt	Sun Mar  9 17:58:30 2014	(r347674)
@@ -0,0 +1,36 @@
+cmcurl: Include the local curl directories before all others.
+
+In some cases, it was possible for the include directory of the system-wide
+libcurl to be added to the include path before cmcurl's, which would result
+in them being picked up and causing the build to fail if the curl versions
+differ too much.
+
+One way to trigger this is to have OpenSSL installed into a non-default
+location together with libcurl (/usr/local, for example). If cmcurl is built
+with CMAKE_USE_OPENSSL on, -I/usr/local/include would end up being added
+before -I${PATH_TO_CMCURL}.
+
+Sent upstream: http://public.kitware.com/pipermail/cmake-developers/2014-March/010000.html
+--- Utilities/cmcurl/CMakeLists.txt
++++ Utilities/cmcurl/CMakeLists.txt
+@@ -172,6 +172,11 @@ IF(NOT CURL_SPECIAL_LIBZ)
+   CHECK_LIBRARY_EXISTS_CONCAT("z"      inflateEnd   HAVE_LIBZ)
+ ENDIF(NOT CURL_SPECIAL_LIBZ)
+ 
++# Include the local directories before any others so that we do not end up
++# including system curl's include directory first by mistake.
++INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
++
+ OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code with curl." OFF)
+ MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
+ IF(CMAKE_USE_OPENSSL)
+@@ -679,8 +684,6 @@ INCLUDE(CMake/OtherTests.cmake)
+ 
+ # The rest of the build
+ 
+-INCLUDE_DIRECTORIES(${LIBCURL_SOURCE_DIR})
+-INCLUDE_DIRECTORIES(${LIBCURL_BINARY_DIR})
+ OPTION(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" TRUE)
+ IF(CMAKE_BUILD_CURL_SHARED)
+   SET(LIBRARY_TYPE SHARED)