git: 77112137efe2 - main - databases/evolution-data-server: fix build for CMake 3.20
Adriaan de Groot
adridg at FreeBSD.org
Thu Apr 22 20:25:06 UTC 2021
The branch main has been updated by adridg:
URL: https://cgit.FreeBSD.org/ports/commit/?id=77112137efe2a4abc440092704df57131f4ff6a6
commit 77112137efe2a4abc440092704df57131f4ff6a6
Author: Adriaan de Groot <adridg at FreeBSD.org>
AuthorDate: 2021-04-22 20:05:11 +0000
Commit: Adriaan de Groot <adridg at FreeBSD.org>
CommitDate: 2021-04-22 20:21:05 +0000
databases/evolution-data-server: fix build for CMake 3.20
This is basically upstream commit
c95a70bfeae25ba11fbe50fe759a6cdb29388e44
but re-done independently by me because I fixed first and
then looked in source control.
---
databases/evolution-data-server/Makefile | 1 +
.../patch-cmake_modules_PrintableOptions.cmake | 53 ++++++++++++++++++++++
2 files changed, 54 insertions(+)
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 23f32410691b..7c46d5e6cc1c 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -2,6 +2,7 @@
PORTNAME= evolution-data-server
DISTVERSION= 3.40.0
+PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/databases/evolution-data-server/files/patch-cmake_modules_PrintableOptions.cmake b/databases/evolution-data-server/files/patch-cmake_modules_PrintableOptions.cmake
new file mode 100644
index 000000000000..3652dc21274c
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-cmake_modules_PrintableOptions.cmake
@@ -0,0 +1,53 @@
+--- cmake/modules/PrintableOptions.cmake.orig 2021-04-22 19:58:13 UTC
++++ cmake/modules/PrintableOptions.cmake
+@@ -19,40 +19,40 @@
+ # prints all the build options previously added with the above functions
+
+ macro(add_printable_variable_bare _name)
+- if(_name STREQUAL "")
++ if("${_name}" STREQUAL "")
+ message(FATAL_ERROR "variable name cannot be empty")
+- endif(_name STREQUAL "")
++ endif()
+ list(APPEND _printable_options ${_name})
+ endmacro()
+
+ macro(add_printable_option _name _description _default_value)
+- if(_name STREQUAL "")
++ if("${_name}" STREQUAL "")
+ message(FATAL_ERROR "option name cannot be empty")
+- endif(_name STREQUAL "")
++ endif()
+ option(${_name} ${_description} ${_default_value})
+ add_printable_variable_bare(${_name})
+ endmacro()
+
+ macro(add_printable_variable _name _description _default_value)
+- if(_name STREQUAL "")
++ if("${_name}" STREQUAL "")
+ message(FATAL_ERROR "variable name cannot be empty")
+- endif(_name STREQUAL "")
++ endif()
+ set(${_name} ${_default_value} CACHE STRING ${_description})
+ add_printable_variable_bare(${_name})
+ endmacro()
+
+ macro(add_printable_variable_path _name _description _default_value)
+- if(_name STREQUAL "")
++ if("${_name}" STREQUAL "")
+ message(FATAL_ERROR "path variable name cannot be empty")
+- endif(_name STREQUAL "")
++ endif()
+ set(${_name} ${_default_value} CACHE PATH ${_description})
+ add_printable_variable_bare(${_name})
+ endmacro()
+
+ macro(add_printable_variable_filepath _name _description _default_value)
+- if(_name STREQUAL "")
++ if("${_name}" STREQUAL "")
+ message(FATAL_ERROR "filepath variable name cannot be empty")
+- endif(_name STREQUAL "")
++ endif()
+ set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+ add_printable_variable_bare(${_name})
+ endmacro()
More information about the dev-commits-ports-all
mailing list