From nobody Sat Mar 29 16:28:02 2025 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 4ZQ2r334fvz5rh3w; Sat, 29 Mar 2025 16:28:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZQ2r302Njz41bH; Sat, 29 Mar 2025 16:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743265683; 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=VeffOGqIhycK18wDSYB9eesW7ZcSfY+NYoVd9dAiZ4I=; b=j82R+h+xwso+GKW34ZBYtKq/0N2QbJyvmxEhEg4zngmjw8uHOFu+veacGr5nQt87+ghzix 7ryxj2VgJEVVuTZoxPoyGrhTlMhg5XaO82ttGjWnjDCBsM3hWAhIv7kEXFP+cK6J/LbqaP UYp1xG4c5+aXcAZ6bgzDwUr+1dhl988gA4T+Ter8m5e0TO4iTs/UMfqdmjqd21RpCIG4JG XIRG0/neSYM2XweHRaCWI8Nd4/Bu6AgvbS6SEOVSLqZIlwOi/Irsuk79bON9Kp04XS4vD7 kDZbGluADp0Dvo8T+LrWQupZo1UIzNy4MjHCryA2r7pBT5RqwmFcqyo41/Zogw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743265683; a=rsa-sha256; cv=none; b=OXy2Ay2tZQiChy3160S+DthvvUlafhKij/Q08NUlhG07cvbo5ZHVgNptKgqTDSdIgC/VbF rAaKgUI9POxuOTt9nrRCnjgh3+R2blg5K8SkX49+EhE92a3Ykofq0cxCE48YpG7HDb4Q5d dW5xpU9oidIMWYxzSQdz8k6IjtB2Yy+qwo+iiWONBaA6GziEuBwkaXmL6A0UxchxFneZvP +LdTbbQeoa1F/BYB9ghfAySmI9JJOMS4hHKBfFM/f2obAPK9f8dW4xIJB/r8fvxj+9BM3G LEydJgukAqJhIBwOnT4zlAJR6vgLFHt7fWZjuqy4CtwbB37SlQdsGmz14ByVVQ== 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=1743265683; 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=VeffOGqIhycK18wDSYB9eesW7ZcSfY+NYoVd9dAiZ4I=; b=Hu3HnnM136p5okZhKv/klGzCLmu+lq9y46azXPjjffWFW6Eyf982vqIhbJSIc+T2u8S8jP 9s3fM7sTGrjuJ6sMyCqc/UIH2elgQnFiluM0k1YK87Ll006mu7MGtg181soSVXKf2kWCw3 F24+p0zs2eiMMcOcAxv0cU9nwOiL1SSHCG5sNE1WhSR4QGrSA6oXvWmFcPAvjfUcYFBW7a S/MM/3++cB7L8b75kqXna7/tnRq64BIN9sb1JEAPxkDnrvD6p8dMGRzaBhmd3cEgHF1XH7 RMYdMp9ANZGChuSj1YSplkvuEWi/U9zo3STywzOO+WL/1480nT2uK553Ar6ZFQ== 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 4ZQ2r26b0Hzd8q; Sat, 29 Mar 2025 16:28:02 +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 52TGS2Gq018752; Sat, 29 Mar 2025 16:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52TGS2gL018749; Sat, 29 Mar 2025 16:28:02 GMT (envelope-from git) Date: Sat, 29 Mar 2025 16:28:02 GMT Message-Id: <202503291628.52TGS2gL018749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 90a5dac24df1 - main - science/trilinos: Update comment 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90a5dac24df19c6c430d762a09665fb8303c7fef Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=90a5dac24df19c6c430d762a09665fb8303c7fef commit 90a5dac24df19c6c430d762a09665fb8303c7fef Author: Yuri Victorovich AuthorDate: 2025-03-29 16:27:26 +0000 Commit: Yuri Victorovich CommitDate: 2025-03-29 16:27:48 +0000 science/trilinos: Update comment --- science/trilinos/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/trilinos/Makefile b/science/trilinos/Makefile index 0280760c36e3..6c5576de4913 100644 --- a/science/trilinos/Makefile +++ b/science/trilinos/Makefile @@ -88,7 +88,7 @@ CMAKE_ARGS+= -DAMD_LIBRARY_DIRS=${LOCALBASE}/lib # users: https://duongdo27.github.io/Trilinos/users.html -CONFLICTS_INSTALL= googletest # installs files into the same place, problematic file: /usr/local/include/gtest/gtest.h, see https://github.com/trilinos/Trilinos/issues/11184 +CONFLICTS_INSTALL= googletest # installs files into the same place, problematic file: /usr/local/include/gtest/gtest.h, see https://github.com/trilinos/Trilinos/issues/13929 post-install: # remove MPI headers that it installs