From nobody Tue Nov 21 13:10:56 2023 X-Original-To: dev-commits-ports-all@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 4SZPrc2S86z51c0F; Tue, 21 Nov 2023 13:10: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 4SZPrc23Bjz3ZD7; Tue, 21 Nov 2023 13:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700572256; 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=LKC772YIev9MwFY6yU2DmmrKexIkxAhoxkReqGHsVHw=; b=ednTDfbjLRT7fLvLLIzUKmJPfjOf0Y+OPXR2lCuA6IbGFNbjZQZyTH5KVff8897W3TjxxW oDxPrJVH5e1jAX15mvL02O82zG2fWfzr0lVMFp61TBuZ4qsu793HU2xtMitHdcOz+nDPec VLL6XWmF24/bDL1rCsjZ/k4h+oiuRYtRhnyf2TFTlgf04l/NJgzc+ZAFz/ybGfoLGs43DL lEokr24GHrot/P0b84SCnZVhOdFxZoQEDwpKE1rOr0YgqfWvm1oHUcpokdTTyw0O+OpzeN trTG7OgwlnB3hWgT7KWKAweLyZR3QRukn0HwPtqtXo+uXJachbSN4lQ3MZluwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700572256; 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=LKC772YIev9MwFY6yU2DmmrKexIkxAhoxkReqGHsVHw=; b=YNfkESHRyTPDuCPVQ3LUfZM4q0GljnBG9sFEeVfgbwEqy+DeJtHbZutFwzxmnC0Z6QfqNm oEVS3j8fsYu3PmNQDBjGrtat9FqwxCHS6pFbvOWuORy0AQD5CFEatrCSxD+/S3UvVKpLG6 Ke5p3wOqzHMb8DeuDFqtsnlGQZw0sggqyyLIsnAZfJp8o7n6bqbYiimBY8vq+R2CvvipHK W4hvSlfqPixkUcMtxT1S/tYWMwKod8akHr48iTRSzqkSV1nk9dH1nF8QZHo6LXc1B7BIEw 2NnKgREfqpyFx0P7LOn5dlj7sF/JZgoPSAks2g39E17ITAtkm187RwpAMExUBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700572256; a=rsa-sha256; cv=none; b=L/0snjwG87hV1hkyOk6fC2jDNMAAlxVrbABzFkkr0amvEFvZSU2G9sWaVVSfNRgHCJMT/f spgHHEP0KRmFeNUrycZvlxIR96Kg0iSqodPlaFOxvSrqhzy5BC/REQFstC8zxWi7I9OoOA ci2ICagE6OecjgdgGQ239R0TUjqE5Se73ujMOXoYu/cBAYOrKfSS0BVXf9HUKPcG4d5RFC RZUARKYASAFOyTAWvVN1hqPx+QWPiMhoK2SBa2j+gYArrhxDJpmDJki+3V5xxr6p43Zs/9 ICRwS3hwo9G7vXr7QsIy1OZF2Qqv+2H1sLD/4up9dOZtrT7cMk6Gby13/8IB9w== 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 4SZPrc16JszcZ0; Tue, 21 Nov 2023 13:10:56 +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 3ALDAuj9003476; Tue, 21 Nov 2023 13:10:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALDAuCd003473; Tue, 21 Nov 2023 13:10:56 GMT (envelope-from git) Date: Tue, 21 Nov 2023 13:10:56 GMT Message-Id: <202311211310.3ALDAuCd003473@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: cb3015f838af - main - net-mgmt/unifi7: Update CONFLICTS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: cb3015f838af7bc815c4970c9fc3b7a6a62e57d0 Auto-Submitted: auto-generated The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=cb3015f838af7bc815c4970c9fc3b7a6a62e57d0 commit cb3015f838af7bc815c4970c9fc3b7a6a62e57d0 Author: Juraj Lutter AuthorDate: 2023-11-21 12:39:00 +0000 Commit: Juraj Lutter CommitDate: 2023-11-21 13:10:05 +0000 net-mgmt/unifi7: Update CONFLICTS Update CONFLICTS as unifi8 is in the tree. --- net-mgmt/unifi7/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-mgmt/unifi7/Makefile b/net-mgmt/unifi7/Makefile index 2591f07cd543..9d5bd90fb64c 100644 --- a/net-mgmt/unifi7/Makefile +++ b/net-mgmt/unifi7/Makefile @@ -1,5 +1,6 @@ PORTNAME= unifi7 PORTVERSION= 7.5.187 +PORTREVISION= 1 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \ https://repo1.maven.org/maven2/%SUBDIR%/:jax @@ -30,7 +31,7 @@ JAVA_VERSION= 17 JAVA_RUN= jre USE_RC_SUBR= unifi -CONFLICTS_INSTALL= unifi6 +CONFLICTS_INSTALL= unifi8 EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p