From nobody Mon May 20 14:42:55 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 4VjgKD184Hz5LPWK; Mon, 20 May 2024 14:42: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 4VjgKC6qDxz4c7Q; Mon, 20 May 2024 14:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716216176; 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=aMQOxGDlvAsFmW2ObpdLCzSO9n6suoYDctwDKarbffw=; b=PFGxNNQLuC2UvQnGmXqeSDGzhMTTdWdAkUeXvsiTugBAowWAxqMKi6/ns4jkvXBiuvSyWr Mh6+7UE7aZ1CwSmuCfJ0xrP6WTtk4VPZ+cknXYpMGdPnfn629ioab/KY41yzIbcdTVQQFF UenszH4Wjl0tplegn7UFLpIyFoSDBhtxhxx/AZS0jZeZRViqB/9PVKJR8YN6g1Sim32dZl 4wGBD1hIEVpqMv5Fh25ruJP9MmwL+SQzr+4+HG/kXGABv259KhzeWNpYzuwHcumAS84hei U12Oq05QjPt9Gq55HRQVIx2an3HWQDCq8rstwtbFItqZ+fmEhlkqufay7nx7mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716216176; a=rsa-sha256; cv=none; b=YmFmxLqfTOE4P/c3HDFk2Lfu70+mSspduY9yYa5f9GwbYUXgfnFEIfjcQBaWfr75oEbaxO JVvk5BMIxQTKd2EiHBi8JvRK4gkO6XZ3tlGfz3Qfe/EOZnsNXhSsOVt8h8dMX7LvS2CLGf Bvf3JurlPM5sH10/VxfvdVf6VJqfXTQp853ZSGpt/ab8LuAdYRu2Y3HvNsN/xOt1+u7rD8 PYJcwzPaiuKUGPFmVqNHwEwWzAl/qZnAs355M1fW/u9vj9vl6fgCqq/LGOqa6uIkMXOMHp mtopDbjJFFU7t3D+utG8pdifVceu5QaJ/oVOxDR2qMvO4T4Yk63eqYONLAzAVA== 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=1716216176; 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=aMQOxGDlvAsFmW2ObpdLCzSO9n6suoYDctwDKarbffw=; b=dSuBjKU5QVYcx4jSQM/tEy2stv/E8l+3/mU1u62LTVOfzFFEoWNj5pDyyB51oSqpX1yy6q cAm6tonGFjWyN4qlQj5JwB+/+Oh5X9KeAUIxJsm+I7MDMeKwTMKg3W3mWIRiP0CAO8cWan ALNTxpbzLtF9Bdfc8O7m0Srlyl6E2QciaARbgt0J2NgMe3BmHU++qCbJSVirUXfP41bYNQ Th9m0Af4U4uh4FUgfrH2hmn4AoFP+XV6mcVf877zjbkth+/pJZCGflccrtFuXWVopOgiTU a8nHu2CHnNKDU7MjkOZMtNg0Crxf4Awf0ag9ud6gG5nXxlf5RBDW9AElVck3Jg== 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 4VjgKC6LtjzjG3; Mon, 20 May 2024 14:42: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 44KEgtnP064876; Mon, 20 May 2024 14:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44KEgtte064873; Mon, 20 May 2024 14:42:55 GMT (envelope-from git) Date: Mon, 20 May 2024 14:42:55 GMT Message-Id: <202405201442.44KEgtte064873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 55f0537a0484 - main - lang/zig: adjust CONFLICTS after 98d70399e765 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55f0537a0484d3179582c1818e5b39dbc30d57f2 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=55f0537a0484d3179582c1818e5b39dbc30d57f2 commit 55f0537a0484d3179582c1818e5b39dbc30d57f2 Author: Pero Oršolić AuthorDate: 2024-05-08 15:42:51 +0000 Commit: Jan Beich CommitDate: 2024-05-20 14:42:36 +0000 lang/zig: adjust CONFLICTS after 98d70399e765 Differential Revision: https://reviews.freebsd.org/D45024 --- lang/zig-devel/Makefile | 2 +- lang/zig/Makefile | 2 +- lang/zig010/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/zig-devel/Makefile b/lang/zig-devel/Makefile index 92de92e59651..35cbed8c7dd4 100644 --- a/lang/zig-devel/Makefile +++ b/lang/zig-devel/Makefile @@ -27,7 +27,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -CONFLICTS_INSTALL= zig-devel zig0* +CONFLICTS_INSTALL= zig zig0* _LLVM_VER= 17 OPTIONS_DEFINE= DOCS STATIC diff --git a/lang/zig/Makefile b/lang/zig/Makefile index f94fdb75df83..6843b23dd88b 100644 --- a/lang/zig/Makefile +++ b/lang/zig/Makefile @@ -29,7 +29,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG -CONFLICTS_INSTALL= zig010 +CONFLICTS_INSTALL= zig0* zig-devel OPTIONS_DEFINE= DOCS STATIC OPTIONS_DEFAULT= DOCS diff --git a/lang/zig010/Makefile b/lang/zig010/Makefile index c8a2b3d21c73..e4bd4984f35b 100644 --- a/lang/zig010/Makefile +++ b/lang/zig010/Makefile @@ -28,7 +28,7 @@ USES= cmake compiler:c++11-lang localbase:ldflags tar:xz CMAKE_ON= THREADS_PREFER_PTHREAD_FLAG CMAKE_ARGS+= -DZIG_TARGET_MCPU=baseline # ensure we run everywhere -CONFLICTS_INSTALL= zig +CONFLICTS_INSTALL= zig zig-devel PORTSCOUT= limit:^0\.10\. OPTIONS_DEFINE= DOCS STATIC