svn commit: r516588 - in head/deskutils/cairo-dock-plugins: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Nov  3 19:14:16 2019
New Revision: 516588
URL: https://svnweb.freebsd.org/changeset/ports/516588

Log:
  Fix build with libetpan 1.9.4

Added:
  head/deskutils/cairo-dock-plugins/files/
  head/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/deskutils/cairo-dock-plugins/Makefile

Modified: head/deskutils/cairo-dock-plugins/Makefile
==============================================================================
--- head/deskutils/cairo-dock-plugins/Makefile	Sun Nov  3 19:14:10 2019	(r516587)
+++ head/deskutils/cairo-dock-plugins/Makefile	Sun Nov  3 19:14:16 2019	(r516588)
@@ -91,6 +91,8 @@ KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/li
 				libxklavier.so:x11/libxklavier
 KEYBOARD_INDICATOR_CMAKE_BOOL=	enable-keyboard-indicator
 
+# libetpan 1.9.4 replaces libetpan-config with libetpan.pc
+MAIL_BUILD_DEPENDS=	libetpan>=1.9.4:mail/libetpan
 MAIL_LIB_DEPENDS=	libetpan.so:mail/libetpan
 MAIL_CMAKE_BOOL=	enable-mail
 

Added: head/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/deskutils/cairo-dock-plugins/files/patch-CMakeLists.txt	Sun Nov  3 19:14:16 2019	(r516588)
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2015-02-19 16:13:47 UTC
++++ CMakeLists.txt
+@@ -978,9 +978,8 @@ set (with_mail no)
+ # find the compilation flags
+ enable_if_not_defined (enable-mail)
+ if (enable-mail)
+-	find_program (LIBETPAN_CONFIG_EXECUTABLE libetpan-config)
+ 	execute_process(
+-		COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --cflags
++		COMMAND pkg-config libetpan --cflags
+ 		OUTPUT_VARIABLE MAIL_PACKAGE_CFLAGS)
+ 	if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "" AND NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "\n") # if there is a problem with the previous, we don't want to have a lot of errors
+ 		STRING (REGEX REPLACE "\n" "" TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # to not skip the last option
+@@ -993,7 +992,7 @@ if (enable-mail)
+ 	endif()
+ 	# find the link flags
+ 	execute_process(
+-		COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --libs
++		COMMAND pkg-config libetpan --libs
+ 		OUTPUT_VARIABLE MAIL_PACKAGE_LIBS)
+ 	if (NOT "${MAIL_PACKAGE_LIBS}" STREQUAL "")
+ 		STRING (REGEX REPLACE "\n" "" MAIL_PACKAGE_LIBS "${MAIL_PACKAGE_LIBS}")