From nobody Wed Apr 8 00:58:45 2026 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 4fr4Sk1L6cz6Y4lr for ; Wed, 08 Apr 2026 00:58:46 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fr4Sj6Yd3z3Dt3 for ; Wed, 08 Apr 2026 00:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775609925; 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=O3GlTu57FNFMWlIG2QQ6MT2sSCI31FyqvdASHWU6hNs=; b=k1ozIF+QM/7r8AyN5JWvgbT2dCU+2dPyuTF3fMheOTq6hPNJTl0+Nj5k6mb9bv5C9T0NXh rydJJgq/gyiDzLqnaW3JZZRcGDGpXJtWrc4lXAuzI3V5vs20pATsMot3c4zLgOj4igNl+/ OIgQnvY2qzOdGSh2K5ddLd1PV3zQ2oX4PYvDDgeHeEJdh1yf5Su1zLxYzNoqdltYK39XSo WG0mak2zpbJthbyX3S8ttrYB8XfByZYAVhoaV26gPdnOQhuX98LzvRGOfs/PsoHc//K1tZ FP20mvYc0XiBTEetHO+8VWWfuu+eK1gDFlb3iLG1n3ybchdzMsE5zZEapsGFrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775609925; a=rsa-sha256; cv=none; b=yEPh7S1N3gxoUwKZI3WIZBHjGV82OV1ZFt3AI1WC7rz190Vs2PKYA+KWFxG0uTeq27qcTE uFqCLd9Xw06wSrL8DnQjGUN5Y0QIZeKbGfpJqPfLfyf5AnEI2yhtXrRJYOgA7BT5Q3gMgo f4Sr4DkhQZZWeNkcPExlZehinKlmEoy1SSQ/bXlqsvEAQ4EQ33b+3rWqoqRaR4o5OTiqkx OgwB/5N88rKyTIjxLGfZnpymvTg/Pv8rYYyeSUlRf9ahFpbxG3yqHZUdTRx5854iuPMqVr Woj6MXH2E1Kyk/T4Pz9xbq9ywyd4vfHPWWgQ/EgPwJAjKCN5c9fOUKtdTo27gg== 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=1775609925; 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=O3GlTu57FNFMWlIG2QQ6MT2sSCI31FyqvdASHWU6hNs=; b=hNnSiiGVJf+ZuyfaL9T2CrhNIMP7d0UGjJMjIZ+HOroga/MhXASMeIfn+Va8t+RM3pwAtf Rt/oQ2g/hA6Tveq8+asHhRsFR3LviQ+rrfe67RJ0h7YtL9FL0pmCtEMY//v7VK419ak4pP pvLEeyKpz+LZNktpwpmg7/+NF+OKmUbf/Y+ACT2ctf4mVFdPzswNu2OMd87fBCQcv6wPtj SKPxE+KTcR4QoDzdNEhUx8GsJdXpdRquTFohgHCjqNXCQXVA05bsiorlJJbooC4lhFBi9x LjqNMAHvPyUt84NCPUk86XNgGAbNadfOMSMtpmRTdhrPvvVo3yBSWlAHDiKS6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fr4Sj669zz13sX for ; Wed, 08 Apr 2026 00:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3868c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Apr 2026 00:58:45 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: 95b2b8f78aaf - main - net/libyang2: Mark conflict with net/libyang3 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: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95b2b8f78aafde7ccc47de8e784d9da8b9b64ab6 Auto-Submitted: auto-generated Date: Wed, 08 Apr 2026 00:58:45 +0000 Message-Id: <69d5a845.3868c.6d39061c@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=95b2b8f78aafde7ccc47de8e784d9da8b9b64ab6 commit 95b2b8f78aafde7ccc47de8e784d9da8b9b64ab6 Author: Olivier Cochard AuthorDate: 2026-04-08 00:31:06 +0000 Commit: Olivier Cochard CommitDate: 2026-04-08 00:58:28 +0000 net/libyang2: Mark conflict with net/libyang3 Sponsored by: Netflix --- net/libyang2/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/libyang2/Makefile b/net/libyang2/Makefile index fcb8b47d48d3..cb3f86b9e117 100644 --- a/net/libyang2/Makefile +++ b/net/libyang2/Makefile @@ -20,6 +20,8 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= CESNET +CONFLICTS= libyang libyang3 + TEST_TARGET= test OPTIONS_DEFINE= TEST