From owner-svn-ports-all@freebsd.org Sat Jul 16 10:52:15 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C1AAB9B346; Sat, 16 Jul 2016 10:52:15 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 588231D0B; Sat, 16 Jul 2016 10:52:15 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6GAqEWK033745; Sat, 16 Jul 2016 10:52:14 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6GAqECU033744; Sat, 16 Jul 2016 10:52:14 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201607161052.u6GAqECU033744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 16 Jul 2016 10:52:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418628 - 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2016 10:52:15 -0000 Author: rakuco Date: Sat Jul 16 10:52:14 2016 New Revision: 418628 URL: https://svnweb.freebsd.org/changeset/ports/418628 Log: Add a patch (sent upstream) to make configuration work with CMake 3.6.0. PR: 210988 Added: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake (contents, props changed) Added: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Sat Jul 16 10:52:14 2016 (r418628) @@ -0,0 +1,18 @@ +Adjust parameters passed to _pkg_check_modules_internal(). +Required for building with CMake 3.6.0. + +Submitted upstream: https://sourceforge.net/p/plplot/patches/33/ +--- cmake/modules/pkg-config.cmake.orig 2016-07-16 10:36:31 UTC ++++ cmake/modules/pkg-config.cmake +@@ -120,8 +120,10 @@ macro(pkg_check_pkgconfig _package _incl + + if(CMAKE_VERSION VERSION_LESS "3.1") + _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") +- else(CMAKE_VERSION VERSION_LESS "3.1") ++ elseif(CMAKE_VERSION VERSION_LESS "3.6") + _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") ++ else(CMAKE_VERSION VERSION_LESS "3.1") ++ _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") + endif(CMAKE_VERSION VERSION_LESS "3.1") + + if(${_prefix}_FOUND)