From nobody Wed Oct 09 19:43:38 2024 X-Original-To: dev-commits-ports-main@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 4XP3Gf6Ww7z5Yvgv; Wed, 09 Oct 2024 19:43:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP3Gf3jnLz4RZW; Wed, 9 Oct 2024 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728503018; 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=IaZbRbfeh0MRdKTC1FCkwq6yct0HfhLr6VHAq7QXQbI=; b=vwJuf1A+8b163OEdjivtlkMzBTC9Svb4TaGQQv1YaGyvTxZ1FeXcERSblinzTttxhNNjkN cRDqPSP2Z8IF7go9YPFXYrO7qbnz28s2UCdnpY+0wbzZYyWOQ37VEp7srtxCZmdwjHP49v AFpj1pkMS+sZpbFM6GHcvVHD4ijlRpEgDTx2kfz3p+mbsgxCKbRdzaac+VpcmTBFcrVgZ0 55H2peWY5gHk1W2dpFu+z6Gblt3nzobOdLdgvu1wC/M75yjN0zeYOy/FVegL4xVL1DFIUt eluXpoZ/ryH5oM67P0J7jXsb2Q5C75pTXSDW2GxR0TzEQup460Pu+a/p90whCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728503018; 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=IaZbRbfeh0MRdKTC1FCkwq6yct0HfhLr6VHAq7QXQbI=; b=XwORKFvy02s/SXZq+h7fae7fQS05Aii0GO85sACm5N5o188nsD1iTTa70jagOSltcC1ckn IjwdNg+mxT5BB2C8OzM/vyxTbeUgnchXr+0EpOQ5dvwq6c+KPYj1ZPBP5KGdsYRb5MdY2i FjtlaOHiNOIM4Dr5sY+EFK/y70Zj2MFW/0KbdhAzRxsFw0Aaq0BxzvdlSHWcLnO17uUI23 nQJHtLRaWCmGRvjJapOiS9xcwYVvHZARm9a/Q/k+wp3S+aHseBCJZ9j2WelsH3i752ZIIK H99bi/R3/Mb2PrAwZ9wOsjyKF7YvjEYt/JrU6gpWsTWaGeZf+d+w2d4Xm8RPEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728503018; a=rsa-sha256; cv=none; b=N4xAOtMgvg4uynb6z3km+OTReoBsoS/8R0VmUqdSRpVDh+oeNeAeAYJJUDCr502yBWiDvK wRz/FGOJfajznE0L+FfupwdyVaPcdjAcqH9udXWGRI3B4lWb2/oV0UVwgJo/RSZ/JyN/Sg yaOrO1tvPum53nAauobQNoIm2t0jXfdxW8ZFSRzhdDjENo4TKyuoZXvRUeognYOMIbxtdF eInwLv2HsA3GQuCxLzC2jrfcnGWAe/ZevhjckBFDvm3xPRPJIkTAboHbOtU8bTkrpreGLh OPRtX5gkgZfYAEK/Iw5RpPUXBwuoeJ+2hb2IjnftRd1kPuSjvtEdHAGiCMrmXw== 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 4XP3Gf3KHYzRRL; Wed, 9 Oct 2024 19:43:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499JhcwO088060; Wed, 9 Oct 2024 19:43:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499JhcuK088057; Wed, 9 Oct 2024 19:43:38 GMT (envelope-from git) Date: Wed, 9 Oct 2024 19:43:38 GMT Message-Id: <202410091943.499JhcuK088057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8db97e44ba59 - main - science/smoldyn: Fix build with tiff 4.7.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8db97e44ba597bd36097a843cd311e7453e4c987 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8db97e44ba597bd36097a843cd311e7453e4c987 commit 8db97e44ba597bd36097a843cd311e7453e4c987 Author: Daniel Engberg AuthorDate: 2024-10-09 19:27:55 +0000 Commit: Daniel Engberg CommitDate: 2024-10-09 19:43:26 +0000 science/smoldyn: Fix build with tiff 4.7.0 Use TIFF:tiff to define the library instead of ${TIFF_LIBRARY} and remove custom logic that tried to replace CMake's own. PR: 281763 Reviewed by: yuri --- science/smoldyn/files/patch-CMakeLists.txt | 43 ++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/science/smoldyn/files/patch-CMakeLists.txt b/science/smoldyn/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..7900d1252b90 --- /dev/null +++ b/science/smoldyn/files/patch-CMakeLists.txt @@ -0,0 +1,43 @@ +--- CMakeLists.txt.orig 2024-02-27 21:40:19 UTC ++++ CMakeLists.txt +@@ -411,25 +411,25 @@ if (OPTION_USE_LIBTIFF) + find_path(TIFF_INCLUDE_DIR tiff.h PATHS ${CMAKE_SOURCE_DIR}/Mac/libtiff/include NO_DEFAULT_PATH) + find_library(TIFF_LIBRARY libtiff.a ${CMAKE_SOURCE_DIR}/Mac/libtiff/lib NO_DEFAULT_PATH) + else () +- find_package(TIFF) +- if(TIFF_LIBRARY) +- cmake_path(GET TIFF_LIBRARY PARENT_PATH TIFF_RPATH) +- message(STATUS "Libtiff run path: '${TIFF_RPATH}'") +- list(APPEND RUN_LIBS ${TIFF_RPATH}) +- endif() ++ find_package(TIFF REQUIRED) ++# if(TIFF_LIBRARY) ++# cmake_path(GET TIFF_LIBRARY PARENT_PATH TIFF_RPATH) ++# message(STATUS "Libtiff run path: '${TIFF_RPATH}'") ++# list(APPEND RUN_LIBS ${TIFF_RPATH}) ++# endif() + endif() + +- if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY) +- set(HAVE_LIBTIFF TRUE) +- message(STATUS "Found Libtiff: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'") +- else() +- set(HAVE_LIBTIFF FALSE) +- message(STATUS "Libtiff include and library variables: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'") +- message(FATAL_ERROR "Libtiff not found") +- endif () ++# if(TIFF_INCLUDE_DIR AND TIFF_LIBRARY) ++# set(HAVE_LIBTIFF TRUE) ++# message(STATUS "Found Libtiff: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'") ++# else() ++# set(HAVE_LIBTIFF FALSE) ++# message(STATUS "Libtiff include and library variables: '${TIFF_INCLUDE_DIR}', '${TIFF_LIBRARY}'") ++# message(FATAL_ERROR "Libtiff not found") ++# endif () + + include_directories(${TIFF_INCLUDE_DIR}) +- list(APPEND DEP_LIBS ${TIFF_LIBRARY}) ++ list(APPEND DEP_LIBS TIFF::tiff) + endif () + +