From owner-svn-ports-all@freebsd.org Sun Nov 25 12:44:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8382D1152C43; Sun, 25 Nov 2018 12:44:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 289F58328B; Sun, 25 Nov 2018 12:44:54 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 09CD01CF9E; Sun, 25 Nov 2018 12:44:54 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAPCirWS022932; Sun, 25 Nov 2018 12:44:53 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAPCir9S022931; Sun, 25 Nov 2018 12:44:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201811251244.wAPCir9S022931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 25 Nov 2018 12:44:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485857 - head/math/plplot/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/math/plplot/files X-SVN-Commit-Revision: 485857 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 289F58328B X-Spamd-Result: default: False [1.69 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.41)[0.407,0]; NEURAL_SPAM_MEDIUM(0.64)[0.638,0]; NEURAL_SPAM_LONG(0.64)[0.643,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 25 Nov 2018 12:44:54 -0000 Author: tcberner Date: Sun Nov 25 12:44:53 2018 New Revision: 485857 URL: https://svnweb.freebsd.org/changeset/ports/485857 Log: math/plplot: prepare for cmake-3.13 PR: 233411 Reported by: antoine 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 Sun Nov 25 12:44:53 2018 (r485857) @@ -0,0 +1,19 @@ +The *internal* _pkg_check_modules_internal macro of cmake gained another +parameter in cmake-3.13. + +https://gitlab.kitware.com/cmake/cmake/commit/7aa26cf0e9319be3f7785763eb3699823453eb60 + +--- cmake/modules/pkg-config.cmake.orig 2018-11-25 12:01:15 UTC ++++ cmake/modules/pkg-config.cmake +@@ -122,8 +122,10 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_ + _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") + elseif(CMAKE_VERSION VERSION_LESS "3.6") + _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") +- else(CMAKE_VERSION VERSION_LESS "3.1") ++ elseif(CMAKE_VERSION VERSION_LESS "3.13") + _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}") ++ else(CMAKE_VERSION VERSION_LESS "3.1") ++ _pkg_check_modules_internal(0 0 0 0 0 0 ${_prefix} "${_package}") + endif(CMAKE_VERSION VERSION_LESS "3.1") + + if(${_prefix}_FOUND)