From bc2e03280a35ddd8e194994cca7af202e233aaea Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <adridg@FreeBSD.org>
Date: Wed, 7 Apr 2021 00:35:26 +0200
Subject: 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(-)

(limited to 'science')

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})
-- 
cgit v1.2.3