From owner-svn-ports-head@FreeBSD.ORG Tue Dec 30 20:57:22 2014 Return-Path: Delivered-To: svn-ports-head@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 68505F6F; Tue, 30 Dec 2014 20:57:22 +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 4A92924FE; Tue, 30 Dec 2014 20:57:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBUKvM7p054795; Tue, 30 Dec 2014 20:57:22 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBUKvMcR054794; Tue, 30 Dec 2014 20:57:22 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201412302057.sBUKvMcR054794@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 30 Dec 2014 20:57:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375856 - head/math/plplot/files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Dec 2014 20:57:22 -0000 Author: rakuco Date: Tue Dec 30 20:57:21 2014 New Revision: 375856 URL: https://svnweb.freebsd.org/changeset/ports/375856 QAT: https://qat.redports.org/buildarchive/r375856/ Log: Add upstream patch to make the port build with the upcoming CMake 3.1.0. Modified: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Modified: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Tue Dec 30 20:39:20 2014 (r375855) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Tue Dec 30 20:57:21 2014 (r375856) @@ -1,5 +1,43 @@ +Includes the following upstream commit to make the port work with CMake 3.1.0: + +commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2 +Author: Alan W. Irwin +Date: Sun Dec 7 09:06:08 2014 -0800 + + Adjust for internal CMake-3.1 pkg-config change. + + There is a report from Greg Jung that the + internal CMake command + + _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") + + must be changed to + + _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") + + for CMake-3.1 in order to build the cairo device properly. Accordingly, I have made that adjustment. + + Tested by Alan W. Irwin on Linux using CMake-3.0.2 + by building the cairo device. + + N.B. currently untested for CMake-3.1. + + ToDo: + + Extensive tests on CMake-3.1 (once that version is closer to release) + still need to be done since the change in the pkg-config support by + CMake may need other adjustments as well. + --- cmake/modules/pkg-config.cmake.orig 2014-02-06 00:06:07.000000000 -0500 +++ cmake/modules/pkg-config.cmake +@@ -1,6 +1,6 @@ + # cmake/modules/pkg-config.cmake + # +-# Copyright (C) 2006 Alan W. Irwin ++# Copyright (C) 2006-2015 Alan W. Irwin + # + # This file is part of PLplot. + # @@ -39,7 +39,7 @@ include(FindPkgConfig) if(PKG_CONFIG_EXECUTABLE) @@ -9,3 +47,17 @@ set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) # Will likely need WIN32 and CYGWIN stanzas as well +@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v + set(_xprefix ${_prefix}) + endif(FORCE_EXTERNAL_STATIC) + +- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") ++ if(CMAKE_VERSION VERSION_LESS "3.1") ++ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") ++ else(CMAKE_VERSION VERSION_LESS "3.1") ++ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") ++ endif(CMAKE_VERSION VERSION_LESS "3.1") ++ + if(${_prefix}_FOUND) + cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}") + # If libraries cannot be not found, then that is equivalent to whole