From owner-dev-commits-ports-all@freebsd.org Tue Apr 6 23:03:12 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DE3F5C130D; Tue, 6 Apr 2021 23:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFNNS6RDfz555f; Tue, 6 Apr 2021 23:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92BC414C4D; Tue, 6 Apr 2021 23:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136N333D004768; Tue, 6 Apr 2021 23:03:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136N338I004767; Tue, 6 Apr 2021 23:03:03 GMT (envelope-from git) Date: Tue, 6 Apr 2021 23:03:03 GMT Message-Id: <202104062303.136N338I004767@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: bc2e03280a35 - main - science/kst2: fix build ahead of CMake 3.20 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc2e03280a35ddd8e194994cca7af202e233aaea Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 23:03:12 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc2e03280a35ddd8e194994cca7af202e233aaea commit bc2e03280a35ddd8e194994cca7af202e233aaea Author: Adriaan de Groot AuthorDate: 2021-04-06 22:35:26 +0000 Commit: Adriaan de Groot CommitDate: 2021-04-06 23:02:53 +0000 science/kst2: fix build ahead of CMake 3.20 Multiple else() blocks with one if() were treated as if they were elseif() blocks except for the last one; this is now a syntax error. --- science/kst2/files/patch-CMakeLists.txt | 17 +++++++++++++++-- science/kst2/files/patch-src__kst__CMakeLists.txt | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/science/kst2/files/patch-CMakeLists.txt b/science/kst2/files/patch-CMakeLists.txt index b2a33544ebd0..324cf2ae729f 100644 --- a/science/kst2/files/patch-CMakeLists.txt +++ b/science/kst2/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2018-04-05 13:33:30 UTC +--- CMakeLists.txt.orig 2021-01-24 05:51:19 UTC +++ CMakeLists.txt @@ -72,12 +72,6 @@ endif() project(Kst) @@ -13,7 +13,20 @@ if(kst_sanitize) -@@ -239,11 +233,6 @@ message(STATUS) +@@ -116,10 +110,10 @@ elseif(kst_3rdparty_download) + elseif(GCC_VERSION VERSION_EQUAL 4.7 OR GCC_VERSION VERSION_GREATER 4.7) + set(ver 4.7) + set(md5 de6e8dbab1bb17eee6057941fddc93e3) +- else(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) ++ elseif(GCC_VERSION VERSION_EQUAL 4.6 OR GCC_VERSION VERSION_GREATER 4.6) + set(ver 4.6) + set(md5 70d8670af9c21eb8fb466654c95d8e4d) +- else(GCC_VERSION VERSION_GREATER 4.4) ++ elseif(GCC_VERSION VERSION_GREATER 4.4) + set(ver 4.4) + set(md5 999248fb40a44543af4dd4cd1be0ceeb) + else() +@@ -240,11 +234,6 @@ message(STATUS) # React on options diff --git a/science/kst2/files/patch-src__kst__CMakeLists.txt b/science/kst2/files/patch-src__kst__CMakeLists.txt index c73b8e0b6ec9..c137cdd65d1c 100644 --- a/science/kst2/files/patch-src__kst__CMakeLists.txt +++ b/science/kst2/files/patch-src__kst__CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/kst/CMakeLists.txt.orig 2018-04-05 13:33:30 UTC +--- src/kst/CMakeLists.txt.orig 2021-01-24 05:51:19 UTC +++ src/kst/CMakeLists.txt -@@ -37,9 +37,7 @@ kst_install_executable() +@@ -38,9 +38,7 @@ kst_install_executable() if(UNIX AND NOT APPLE) set(man ${CMAKE_BINARY_DIR}/${kst_binary_name}.1) configure_file(${kst_dir}/src/kst/kst.1.txt ${man})