From nobody Sun Aug 20 21:52:55 2023 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 4RTTqr113qz4qmXR; Sun, 20 Aug 2023 21:52:56 +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 4RTTqr0KJfz4P7m; Sun, 20 Aug 2023 21:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692568376; 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=3vl825rcHhW7YrZP65bzKFVEEgnijSRidyWCWZOzPgs=; b=qUq7I/D3hZUERvzLmhCOX9yWpKF4ewNetKrwP76BikPn+RYMtskCXyHG31c0shMm1TBij0 DctgWFl6eMGqf4h21vy8LX9Z8YCFM/feTyBqmYKIyT6aN8YGZzVhQxq870kCvTbZaL82SK diDBfWT8g4VUyv5wACqtPtPM3SrBQM9bLRWZy3Af9sfHe5mo8oaRr8Cf1JkmZ2ooH/ck/0 na3Do9B7sPt68NrFaTom+k9Dx6+u0QXM2SgOVDh0ZN/Xx1Yu3RAlC3GwIAU8jGYIfBOjxU q9MVCJk2uSY1/BhhcLtd64PewLHe5AqbKAkgvuR8raRdgOP8CzmnjxJxM71Y1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692568376; 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=3vl825rcHhW7YrZP65bzKFVEEgnijSRidyWCWZOzPgs=; b=loaUr6fnFmXK2aB1aVhL60jldIrXhQzAKxqehQbQ4mAHkhNoDkE/87uyKbT19Wd/AIVD7d dfTCjNt6ZvlQRGr/IMGHvcPFr3efN5SPtYqRsa4iK/7j8/lQ3EsAP65yXAVxtpdWPQGKxr O4z7CID9TNW/0Z65F/XxxS5tIYhpYC/tfUco9/mBai3iT7ZCignxfxUEmz52I1gAgrm+Ow arAnNB7CkOoNK00+R2RrntbPOhoixet4ka63tisNySzGTeD72UHp/4k2dYVqfXbu/ZDeJd Zr9W8VY+MEd6g1Ud8hLqhQPQYdSptrrBC1oE/IHk3+PXdiJ4yUDkND7X9xN5Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692568376; a=rsa-sha256; cv=none; b=Q/kfYJ2bisAepAsphttmLHNvqAbXzxcwDqEygyyiEYjhxreygsNWpnpRWqtxF+TqLzk+CD tFsoyjIZKlVzk/EMjUK1nkctpY+AFXy9G7yrIx5jSWUrg543fRvvlsHCHTYdOzsu+/Sm+E eZrS/p1RTiq2Vld01mSjsAPpHzZu7LfHupgNwmXltpL1vZMaWCKY1T2n1H+zVMFCgSTwSN 27cJBhJZv74KByWaytU3oNFEfsNiOrE9QP8J4jusRmJwGoYPci02i2EkqtUm5LSvO+xzxs +nKB1JyjTmL3hHNosJfjc6lzewJIWsF6gWihq104WY+ajtD7xI5RaN9UjOofhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTTqq6X73zvYb; Sun, 20 Aug 2023 21:52:55 +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 37KLqtcu073409; Sun, 20 Aug 2023 21:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37KLqtnq073406; Sun, 20 Aug 2023 21:52:55 GMT (envelope-from git) Date: Sun, 20 Aug 2023 21:52:55 GMT Message-Id: <202308202152.37KLqtnq073406@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: 7f15f71bba56 - main - cad/surelog: Remove CONFLICTS_INSTALL; Fix typo 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 7f15f71bba56e1cc5fd2b4279dea4c6ce46722a2 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f15f71bba56e1cc5fd2b4279dea4c6ce46722a2 commit 7f15f71bba56e1cc5fd2b4279dea4c6ce46722a2 Author: Yuri Victorovich AuthorDate: 2023-08-20 21:52:21 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-20 21:52:21 +0000 cad/surelog: Remove CONFLICTS_INSTALL; Fix typo It doesn't conflict with capnproto any more. --- cad/surelog/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile index 84c4cafddeb2..2d7ce93e7c70 100644 --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -39,8 +39,6 @@ CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${USE_JAVA} \ CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests -CONFLICTS_INSTALL= capnproto capnproto080 - BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 @@ -60,7 +58,7 @@ TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' -post-install: # workaound for https://github.com/chipsalliance/Surelog/issues/3596 +post-install: # workaround for https://github.com/chipsalliance/Surelog/issues/3596 @${RMDIR} \ ${STAGEDIR}${DATADIR}/pkg/work \ ${STAGEDIR}${DATADIR}/pkg \