From owner-svn-ports-all@freebsd.org Sun Nov 3 19:14:17 2019 Return-Path: Delivered-To: svn-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 77AA817FDCA; Sun, 3 Nov 2019 19:14:17 +0000 (UTC) (envelope-from sunpoet@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 475lwT2Tpdz3KSn; Sun, 3 Nov 2019 19:14:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 32357186D7; Sun, 3 Nov 2019 19:14:17 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA3JEH7E005207; Sun, 3 Nov 2019 19:14:17 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA3JEGNi005205; Sun, 3 Nov 2019 19:14:16 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201911031914.xA3JEGNi005205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 3 Nov 2019 19:14:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516588 - in head/deskutils/cairo-dock-plugins: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/deskutils/cairo-dock-plugins: . files X-SVN-Commit-Revision: 516588 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2019 19:14:17 -0000 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}")