mail/evolution: Update to 3.40.1

5 files changed, 24 insertions, 77 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9be25802c86c..c4bf8e09f602 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
 # Created by: Ade Lovett <ade@FreeBSD.org>
 
 PORTNAME=	evolution
-DISTVERSION=	3.40.0
+DISTVERSION=	3.40.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 8ad847469c4b..28ca06697207 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617742080
-SHA256 (gnome/evolution-3.40.0.tar.xz) = 030a27b46c971835821c1b04d9023f9ff8f4113e1a411633dee403112033d51b
-SIZE (gnome/evolution-3.40.0.tar.xz) = 12215660
+TIMESTAMP = 1621742766
+SHA256 (gnome/evolution-3.40.1.tar.xz) = 2f7962bc9fd0263822c6fbd1f74aa1b418a80af1bb7a516c86c903a8dfd2c41e
+SIZE (gnome/evolution-3.40.1.tar.xz) = 12223944
diff --git a/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake b/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake
deleted file mode 100644
index f9287b27e8ce..000000000000
--- a/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake
+++ /dev/null
@@ -1,53 +0,0 @@
---- cmake/modules/PrintableOptions.cmake.orig	2021-03-19 06:41:05 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("${_name}" STREQUAL "")
- 	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("${_name}" STREQUAL "")
- 	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("${_name}" STREQUAL "")
- 	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("${_name}" STREQUAL "")
- 	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("${_name}" STREQUAL "")
- 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
- 	add_printable_variable_bare(${_name})
- endmacro()
diff --git a/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake b/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake
deleted file mode 100644
index f3fc4a82a8b0..000000000000
--- a/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/modules/SetupBuildFlags.cmake.orig	2021-03-19 06:41:05 UTC
-+++ cmake/modules/SetupBuildFlags.cmake
-@@ -20,7 +20,7 @@ macro(setup_build_flags _maintainer_mode)
- 		-Wundef
- 		-Wwrite-strings
- 		-Wno-cast-function-type
--		-no-undefined
-+		-Wl,--no-undefined
- 		-fno-strict-aliasing
- 	)
- 
-@@ -34,7 +34,7 @@ macro(setup_build_flags _maintainer_mode)
- 	else(${_maintainer_mode})
- 		list(APPEND proposed_flags
- 			-Wno-deprecated-declarations
--			-Wno-missing-include-dir)
-+			-Wno-missing-include-dirs)
- 	endif(${_maintainer_mode})
- 
- 	list(APPEND proposed_c_flags
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 9816d6930b0f..6400bbd6075d 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -951,6 +951,7 @@ share/help/C/evolution/figures/color-5c3566.png
 share/help/C/evolution/figures/color-8f5902.png
 share/help/C/evolution/figures/color-a40000.png
 share/help/C/evolution/figures/color-c4a000.png
+share/help/C/evolution/figures/color-ccccccffffff.png
 share/help/C/evolution/figures/color-ce5c00.png
 share/help/C/evolution/figures/evolutionlogo.png
 share/help/C/evolution/figures/html-composer-insert-image.png
@@ -1180,6 +1181,7 @@ share/help/ca/evolution/figures/color-5c3566.png
 share/help/ca/evolution/figures/color-8f5902.png
 share/help/ca/evolution/figures/color-a40000.png
 share/help/ca/evolution/figures/color-c4a000.png
+share/help/ca/evolution/figures/color-ccccccffffff.png
 share/help/ca/evolution/figures/color-ce5c00.png
 share/help/ca/evolution/figures/evolutionlogo.png
 share/help/ca/evolution/figures/html-composer-insert-image.png
@@ -1409,6 +1411,7 @@ share/help/cs/evolution/figures/color-5c3566.png
 share/help/cs/evolution/figures/color-8f5902.png
 share/help/cs/evolution/figures/color-a40000.png
 share/help/cs/evolution/figures/color-c4a000.png
+share/help/cs/evolution/figures/color-ccccccffffff.png
 share/help/cs/evolution/figures/color-ce5c00.png
 share/help/cs/evolution/figures/evolutionlogo.png
 share/help/cs/evolution/figures/html-composer-insert-image.png
@@ -1638,6 +1641,7 @@ share/help/de/evolution/figures/color-5c3566.png
 share/help/de/evolution/figures/color-8f5902.png
 share/help/de/evolution/figures/color-a40000.png
 share/help/de/evolution/figures/color-c4a000.png
+share/help/de/evolution/figures/color-ccccccffffff.png
 share/help/de/evolution/figures/color-ce5c00.png
 share/help/de/evolution/figures/evolutionlogo.png
 share/help/de/evolution/figures/html-composer-insert-image.png
@@ -1867,6 +1871,7 @@ share/help/el/evolution/figures/color-5c3566.png
 share/help/el/evolution/figures/color-8f5902.png
 share/help/el/evolution/figures/color-a40000.png
 share/help/el/evolution/figures/color-c4a000.png
+share/help/el/evolution/figures/color-ccccccffffff.png
 share/help/el/evolution/figures/color-ce5c00.png
 share/help/el/evolution/figures/evolutionlogo.png
 share/help/el/evolution/figures/html-composer-insert-image.png
@@ -2096,6 +2101,7 @@ share/help/en_GB/evolution/figures/color-5c3566.png
 share/help/en_GB/evolution/figures/color-8f5902.png
 share/help/en_GB/evolution/figures/color-a40000.png
 share/help/en_GB/evolution/figures/color-c4a000.png
+share/help/en_GB/evolution/figures/color-ccccccffffff.png
 share/help/en_GB/evolution/figures/color-ce5c00.png
 share/help/en_GB/evolution/figures/evolutionlogo.png
 share/help/en_GB/evolution/figures/html-composer-insert-image.png
@@ -2325,6 +2331,7 @@ share/help/es/evolution/figures/color-5c3566.png
 share/help/es/evolution/figures/color-8f5902.png
 share/help/es/evolution/figures/color-a40000.png
 share/help/es/evolution/figures/color-c4a000.png
+share/help/es/evolution/figures/color-ccccccffffff.png
 share/help/es/evolution/figures/color-ce5c00.png
 share/help/es/evolution/figures/evolutionlogo.png
 share/help/es/evolution/figures/html-composer-insert-image.png
@@ -2554,6 +2561,7 @@ share/help/eu/evolution/figures/color-5c3566.png
 share/help/eu/evolution/figures/color-8f5902.png
 share/help/eu/evolution/figures/color-a40000.png
 share/help/eu/evolution/figures/color-c4a000.png
+share/help/eu/evolution/figures/color-ccccccffffff.png
 share/help/eu/evolution/figures/color-ce5c00.png
 share/help/eu/evolution/figures/evolutionlogo.png
 share/help/eu/evolution/figures/html-composer-insert-image.png
@@ -2783,6 +2791,7 @@ share/help/fr/evolution/figures/color-5c3566.png
 share/help/fr/evolution/figures/color-8f5902.png
 share/help/fr/evolution/figures/color-a40000.png
 share/help/fr/evolution/figures/color-c4a000.png
+share/help/fr/evolution/figures/color-ccccccffffff.png
 share/help/fr/evolution/figures/color-ce5c00.png
 share/help/fr/evolution/figures/evolutionlogo.png
 share/help/fr/evolution/figures/html-composer-insert-image.png
@@ -3012,6 +3021,7 @@ share/help/gl/evolution/figures/color-5c3566.png
 share/help/gl/evolution/figures/color-8f5902.png
 share/help/gl/evolution/figures/color-a40000.png
 share/help/gl/evolution/figures/color-c4a000.png
+share/help/gl/evolution/figures/color-ccccccffffff.png
 share/help/gl/evolution/figures/color-ce5c00.png
 share/help/gl/evolution/figures/evolutionlogo.png
 share/help/gl/evolution/figures/html-composer-insert-image.png
@@ -3241,6 +3251,7 @@ share/help/hu/evolution/figures/color-5c3566.png
 share/help/hu/evolution/figures/color-8f5902.png
 share/help/hu/evolution/figures/color-a40000.png
 share/help/hu/evolution/figures/color-c4a000.png
+share/help/hu/evolution/figures/color-ccccccffffff.png
 share/help/hu/evolution/figures/color-ce5c00.png
 share/help/hu/evolution/figures/evolutionlogo.png
 share/help/hu/evolution/figures/html-composer-insert-image.png
@@ -3470,6 +3481,7 @@ share/help/id/evolution/figures/color-5c3566.png
 share/help/id/evolution/figures/color-8f5902.png
 share/help/id/evolution/figures/color-a40000.png
 share/help/id/evolution/figures/color-c4a000.png
+share/help/id/evolution/figures/color-ccccccffffff.png
 share/help/id/evolution/figures/color-ce5c00.png
 share/help/id/evolution/figures/evolutionlogo.png
 share/help/id/evolution/figures/html-composer-insert-image.png
@@ -3699,6 +3711,7 @@ share/help/mk/evolution/figures/color-5c3566.png
 share/help/mk/evolution/figures/color-8f5902.png
 share/help/mk/evolution/figures/color-a40000.png
 share/help/mk/evolution/figures/color-c4a000.png
+share/help/mk/evolution/figures/color-ccccccffffff.png
 share/help/mk/evolution/figures/color-ce5c00.png
 share/help/mk/evolution/figures/evolutionlogo.png
 share/help/mk/evolution/figures/html-composer-insert-image.png
@@ -3928,6 +3941,7 @@ share/help/oc/evolution/figures/color-5c3566.png
 share/help/oc/evolution/figures/color-8f5902.png
 share/help/oc/evolution/figures/color-a40000.png
 share/help/oc/evolution/figures/color-c4a000.png
+share/help/oc/evolution/figures/color-ccccccffffff.png
 share/help/oc/evolution/figures/color-ce5c00.png
 share/help/oc/evolution/figures/evolutionlogo.png
 share/help/oc/evolution/figures/html-composer-insert-image.png
@@ -4157,6 +4171,7 @@ share/help/ru/evolution/figures/color-5c3566.png
 share/help/ru/evolution/figures/color-8f5902.png
 share/help/ru/evolution/figures/color-a40000.png
 share/help/ru/evolution/figures/color-c4a000.png
+share/help/ru/evolution/figures/color-ccccccffffff.png
 share/help/ru/evolution/figures/color-ce5c00.png
 share/help/ru/evolution/figures/evolutionlogo.png
 share/help/ru/evolution/figures/html-composer-insert-image.png
@@ -4386,6 +4401,7 @@ share/help/sl/evolution/figures/color-5c3566.png
 share/help/sl/evolution/figures/color-8f5902.png
 share/help/sl/evolution/figures/color-a40000.png
 share/help/sl/evolution/figures/color-c4a000.png
+share/help/sl/evolution/figures/color-ccccccffffff.png
 share/help/sl/evolution/figures/color-ce5c00.png
 share/help/sl/evolution/figures/evolutionlogo.png
 share/help/sl/evolution/figures/html-composer-insert-image.png
@@ -4615,6 +4631,7 @@ share/help/sv/evolution/figures/color-5c3566.png
 share/help/sv/evolution/figures/color-8f5902.png
 share/help/sv/evolution/figures/color-a40000.png
 share/help/sv/evolution/figures/color-c4a000.png
+share/help/sv/evolution/figures/color-ccccccffffff.png
 share/help/sv/evolution/figures/color-ce5c00.png
 share/help/sv/evolution/figures/evolutionlogo.png
 share/help/sv/evolution/figures/html-composer-insert-image.png
@@ -4844,6 +4861,7 @@ share/help/te/evolution/figures/color-5c3566.png
 share/help/te/evolution/figures/color-8f5902.png
 share/help/te/evolution/figures/color-a40000.png
 share/help/te/evolution/figures/color-c4a000.png
+share/help/te/evolution/figures/color-ccccccffffff.png
 share/help/te/evolution/figures/color-ce5c00.png
 share/help/te/evolution/figures/evolutionlogo.png
 share/help/te/evolution/figures/html-composer-insert-image.png
@@ -5073,6 +5091,7 @@ share/help/uk/evolution/figures/color-5c3566.png
 share/help/uk/evolution/figures/color-8f5902.png
 share/help/uk/evolution/figures/color-a40000.png
 share/help/uk/evolution/figures/color-c4a000.png
+share/help/uk/evolution/figures/color-ccccccffffff.png
 share/help/uk/evolution/figures/color-ce5c00.png
 share/help/uk/evolution/figures/evolutionlogo.png
 share/help/uk/evolution/figures/html-composer-insert-image.png
@@ -5302,6 +5321,7 @@ share/help/zh_CN/evolution/figures/color-5c3566.png
 share/help/zh_CN/evolution/figures/color-8f5902.png
 share/help/zh_CN/evolution/figures/color-a40000.png
 share/help/zh_CN/evolution/figures/color-c4a000.png
+share/help/zh_CN/evolution/figures/color-ccccccffffff.png
 share/help/zh_CN/evolution/figures/color-ce5c00.png
 share/help/zh_CN/evolution/figures/evolutionlogo.png
 share/help/zh_CN/evolution/figures/html-composer-insert-image.png