From nobody Thu Dec 28 23:03:49 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1PFd4W0pz54r6s; Thu, 28 Dec 2023 23:03:49 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1PFd2bVLz3KTs; Thu, 28 Dec 2023 23:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l22flOusyY2Uf04ORP69Hl67dnCXuZ+/JUQVWQcxD2M=; b=NqHp21bELc1RUGz2+/YnjycpJ6j3cHQqo9EsX812M/1Flu40Gylz14/CQyVvEMa/JJX6uT LASwEGHSb2wkc/uL1phkzMPCZ3xY6ZcvUT/2JoDEySeCK4KRaWCT7fuew7ZVomK+T7SROP 5pJylku06wogrgrvhSfpq5QuOS8tPJQj8HJZa4IImcewJjV4YUEV374k+QuAn0HCfjzTqQ MK7L13neCG2/L2xs1YrGq/XKrmEgFN1ryOLf7GjvsO5Ht6j/51kKCx07Qh81EMkJcWvNxj 5NpYZ4MKkaN36ia3T4+wRtxKiphEbezqxgSWgHHfkNqrRZ0WFeVvD/oYjVpGMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703804629; a=rsa-sha256; cv=none; b=E8pYV67Rupy8I3Ip6O7jJPXPHljjjuM1byPg3QCSg876GTLgp2IOOpzcBwk6roCepczXU6 BKgknzvF0mNH1FAXm3DJwjdHFDU9cqpfpFkmAm5Efo+0WZ42WhuDgd+IxFWagNV/md5nmw 9CKc/kjDSMWgIYMI3lGfThO1Xz3nn85ZxJBh738wWzU0UidUx6Qi3PTXfbGp0NqnVofzY9 KeV7FtaCweMEc16Rm7N8AAv5t3xiy76ohhBmUTfMNFOu504LeidMOlvGmWieHNZ4FV/h+K ph/HNjlP51YV3cZIZxD+rxdzY87Dfj4/2WxeNsgtppwyRq5OTW989vO8mAzbMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l22flOusyY2Uf04ORP69Hl67dnCXuZ+/JUQVWQcxD2M=; b=CskrxGiii8MlH63VNfX/ka7BA4NPzf3pbP1O6xR3Z9LzxT6/674lvhj/fBB+4i8upOZBtX W5fX3XqwEIdDrT5boQqNKXxTCfKe50xXvsqJLeE9SoOzpqXgpkDoaY2QWPmWoYfBOPD8Vy RQHC7JqzRydU+rLlD5i2+XncHR+igQjplmbUTaR/xd9RflmeWRF+d1KSIzXz872crK96S6 3IABpoLYuuZsNcYqDHXlGm5nNYg35357uhhnOD40efrIAGnnMBie5hpS8Rs7SSz1+oLpgk 835B6jdh3C+6n1Wl66fW+xY0SZ3U4fiMw8Rdmflxrb+KVGy2gfyRJPksjJcMSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1PFd1YFTzhdG; Thu, 28 Dec 2023 23:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSN3nK0059713; Thu, 28 Dec 2023 23:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSN3nNc059710; Thu, 28 Dec 2023 23:03:49 GMT (envelope-from git) Date: Thu, 28 Dec 2023 23:03:49 GMT Message-Id: <202312282303.3BSN3nNc059710@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 8d596bdfeeb9 - main - science/paraview: Fix configure with CMake >= 3.28.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d596bdfeeb94f6489926fc41b042dffdc6de0d0 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d596bdfeeb94f6489926fc41b042dffdc6de0d0 commit 8d596bdfeeb94f6489926fc41b042dffdc6de0d0 Author: Jason E. Hale AuthorDate: 2023-12-28 20:22:49 +0000 Commit: Jason E. Hale CommitDate: 2023-12-28 23:03:33 +0000 science/paraview: Fix configure with CMake >= 3.28.0 PR: 275730 Approved by: portmgr (blanket) --- .../files/patch-VTK_CMake_FindFreetype.cmake | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/science/paraview/files/patch-VTK_CMake_FindFreetype.cmake b/science/paraview/files/patch-VTK_CMake_FindFreetype.cmake new file mode 100644 index 000000000000..dd6954de7d86 --- /dev/null +++ b/science/paraview/files/patch-VTK_CMake_FindFreetype.cmake @@ -0,0 +1,84 @@ +Fix configure with CMake >= 3.28.0 + +CMake Error at /usr/local/lib/cmake/freetype/freetype-config.cmake:42 (message): + Some (but not all) targets in this export set were already defined. + + Targets Defined: freetype + + Targets not yet defined: Freetype::Freetype + +Call Stack (most recent call first): + /usr/local/share/cmake/Modules/FindFreetype.cmake:100 (find_package) + /usr/local/share/cmake/Modules/FindX11.cmake:351 (find_package) + VTK/CMake/vtkModule.cmake:4573 (find_package) + VTK/Rendering/UI/CMakeLists.txt:100 (vtk_module_find_package) + +Obtained from: https://github.com/Kitware/VTK/commit/f57e941ac8017daddb216143acbcb0550ad5599c + +--- VTK/CMake/FindFreetype.cmake.orig 2023-09-22 14:35:37 UTC ++++ VTK/CMake/FindFreetype.cmake +@@ -63,6 +63,64 @@ directory of a Freetype installation. + # I'm going to attempt to cut out the middleman and hope + # everything still works. + ++set(_Freetype_args) ++if (Freetype_FIND_QUIETLY) ++ list(APPEND _Freetype_args ++ QUIET) ++endif () ++if (Freetype_FIND_VERSION) ++ list(APPEND _Freetype_args ++ "${Freetype_FIND_VERSION}") ++ if (Freetype_FIND_VERSION_EXACT) ++ list(APPEND _Freetype_args ++ EXACT) ++ endif () ++endif () ++set(_Freetype_component_req) ++set(_Freetype_component_opt) ++foreach (_Freetype_component IN LISTS Freetype_FIND_COMPONENTS) ++ if (Freetype_FIND_REQUIRE_${_Freetype_component}) ++ list(APPEND _Freetype_component_req ++ "${_Freetype_component}") ++ else () ++ list(APPEND _Freetype_component_opt ++ "${_Freetype_component}") ++ endif () ++endforeach () ++unset(_Freetype_component) ++if (_Freetype_component_req) ++ list(APPEND _Freetype_args ++ COMPONENTS "${_Freetype_component_req}") ++endif () ++unset(_Freetype_component_req) ++if (_Freetype_component_opt) ++ list(APPEND _Freetype_args ++ OPTIONAL_COMPONENTS "${_Freetype_component_opt}") ++endif () ++unset(_Freetype_component_opt) ++find_package(freetype CONFIG ${_Freetype_args}) ++unset(_Freetype_args) ++if (freetype_FOUND) ++ if (NOT TARGET Freetype::Freetype) ++ add_library(Freetype::Freetype IMPORTED INTERFACE) ++ set_target_properties(Freetype::Freetype PROPERTIES ++ INTERFACE_LINK_LIBRARIES freetype) ++ endif () ++ get_property(FREETYPE_INCLUDE_DIRS TARGET freetype PROPERTY INTERFACE_INCLUDE_DIRECTORIES) ++ get_property(FREETYPE_LIBRARIES TARGET freetype PROPERTY INTERFACE_LINK_LIBRARIES) ++ get_property(_Freetype_location TARGET freetype PROPERTY LOCATION) ++ list(APPEND FREETYPE_LIBRARIES ++ "${_Freetype_location}") ++ unset(_Freetype_location) ++ set(Freetype_FOUND 1) ++ set(FREETYPE_VERSION_STRING "${freetype_VERSION}") ++ foreach (_Freetype_component IN LISTS Freetype_FIND_COMPONENTS) ++ set(Freetype_${_Freetype_component}_FOUND "${freetype_${_Freetype_component}_FOUND}") ++ endforeach () ++ unset(_Freetype_component) ++ return () ++endif () ++ + set(FREETYPE_FIND_ARGS + HINTS + ENV FREETYPE_DIR