From nobody Thu Mar 03 21:19:30 2022 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 8A34419F7D7B; Thu, 3 Mar 2022 21:19:30 +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 4K8kQB3VsQz3lc5; Thu, 3 Mar 2022 21:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646342370; 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=0kHUmNTzubtfu2BqlYXz63ljbfx9f586Jp+tiBSIjKE=; b=Fa+UmYE6ZSD4rleG5Tqz08LCeO3/mYCkmRpIGv3fsyfIpYEn8CdUiYHKH8tULsOS3QSuUx hbnEmdU4X77vlcix7jCrhflzgaMI8cQy036fclouZqw6+dmlOn6jNm3B30b+Qz/iBKGcaY e6WrxayJ+XP1hsO1r2enx/k07QJgoIj5UdfmQSzHPZDv3hzIxOcOgPmzzevRsToehWvSBM IXgbRQXj5w2HhFsWWGheyUFYIFtZuPcHNcthkGt5B2UWNHs/FOy6UvBizGR9orC8V7QVWI 31PL6QePIkEDNfs9h1E8Dlaa0qyIm6zIHomCbUBNnsZSsKnDNzzVmGc+htuvOA== 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 545651F507; Thu, 3 Mar 2022 21:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 223LJUWS055014; Thu, 3 Mar 2022 21:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223LJUTD055013; Thu, 3 Mar 2022 21:19:30 GMT (envelope-from git) Date: Thu, 3 Mar 2022 21:19:30 GMT Message-Id: <202203032119.223LJUTD055013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 37f2d22d78bc - main - net-mgmt/unifi7: Fix CONFLICTS_INSTALL 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: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37f2d22d78bcfd9d18eddc6748d042bc9322040b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646342370; 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=0kHUmNTzubtfu2BqlYXz63ljbfx9f586Jp+tiBSIjKE=; b=hEQAWgN9WrtVEYeo4xe4hpTsu6lYV5KECjhfUxWLV2QPO9grQqzczGYYhuzfvEBWsMlLL9 W/XT9VS3Q1IW9RdY7S0GrCHV67ymmCr1zI5cLRuQ2JjBwbdJd6Gs3xTeO6fdRqcY6frGQi WL7UuZWfjqbBwpYl9YFdjhlIAsJstiC5UPgKKVub1uh/JabAICB7IBQq/7lenYy81xo+Qq pe3532IAr2qB06AZIy7WYzIaaatKS6DY6eyN3h6o51vo2AoHRyrthvrPlz1rjxRv/qCQIm MxkahGzIPS1tmcVGkNuLA51DhvGR9rDEUBfuvjl5cXGoeCZiZhjmCElztxZIag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646342370; a=rsa-sha256; cv=none; b=QSKXWrHXNosgIxvK2bJeZEheuwjGzhY6COhWS3iHC/cdN1MVxmR+edKxEyrsIMj8nsM7Q3 CqTIXeuHcZQjXHLo+prBkjMi9+nHVzjfPxhbhww5RA6C1BGzxRSgWGOKi5b/doUCu/UsXZ 6c/Uf5aweHwFz+iCNDXsfcHwXBhUzdyxAzT5SuRZBbOrWgtGgKm0TPB1E+XXDVabnpIwG2 FKUZiIysZMbLuqDRgOTHvycrv8Rui+GpgUduGa3rCQoUiScNbY0jKx+KhWf0VS4DA/KjBs t5+qf9w1k/9a0I/huJarWfA0Px5I0bCXkXTAVi2KosQBke45UrlgG2HxsM4e3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=37f2d22d78bcfd9d18eddc6748d042bc9322040b commit 37f2d22d78bcfd9d18eddc6748d042bc9322040b Author: Juraj Lutter AuthorDate: 2022-03-03 21:18:47 +0000 Commit: Juraj Lutter CommitDate: 2022-03-03 21:18:47 +0000 net-mgmt/unifi7: Fix CONFLICTS_INSTALL Set CONFLICTS_INSTALL to correct package name (unifi6) --- net-mgmt/unifi7/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile index 6bb0a94734b0..2707a4a217bf 100644 --- a/net-mgmt/unifi7/Makefile +++ b/net-mgmt/unifi7/Makefile @@ -27,7 +27,7 @@ JAVA_VENDOR= openjdk bsdjava JAVA_RUN= yes USE_RC_SUBR= unifi -CONFLICTS_INSTALL= unifi7 +CONFLICTS_INSTALL= unifi6 EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p