From nobody Thu Mar 3 21:16:02 2022 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 3713219F741E; Thu, 3 Mar 2022 21:16:03 +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 4K8kLC13WCz3lLq; Thu, 3 Mar 2022 21:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646342163; 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=ZRtS7TuaVAiIaKKecUgrh/Pqd2uTaRqnYluNgHIM0yM=; b=BTfYpnf3U0SU4TWriA27JEr0uCa/+Zhw9NQDmMlyDmOpIWyrQFgsKUMw71EpMSSIDxBJoe 7DlzZomdPSZpxBlZKB3eGWkmiY4ZtR6oS/dHgRkoU79ND8eZc6JIuIh+FjjmzoLMmjSbOp 2QJUHJmDRmkKHCPBmtVH0xMf6Qfr/eiSAIeQLo76h5jKhe9ZTXkPRR+EwXE3j4Iak9rozZ pQ9WPF8EjSoJXG+2PO2VYJY2zxhS2wxs+fvhnEs2NCsJPPIvs3miYtg60lE8UUlQtF1qjX a4nioHeHg6UruK/AiE0VCvCwcZxiQzVc+wq4Ywuyqi8BpTC7/dsnLxcvVfT8eQ== 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 043711F5CE; Thu, 3 Mar 2022 21:16:03 +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 223LG2jK054525; Thu, 3 Mar 2022 21:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223LG2JN054524; Thu, 3 Mar 2022 21:16:02 GMT (envelope-from git) Date: Thu, 3 Mar 2022 21:16:02 GMT Message-Id: <202203032116.223LG2JN054524@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: f8baab7efe4f - main - net-mgmt/unifi6: Mark as conflicting with unifi7 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: f8baab7efe4f993bc2ac9897890aa681c15d5b93 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646342163; 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=ZRtS7TuaVAiIaKKecUgrh/Pqd2uTaRqnYluNgHIM0yM=; b=PCADzyvOkjhI+35yfmyVKAcEkpL2hd1Yi+2Sosoe91umnPEAxGGRHYMg9oNxuOfvU8mU0M M8RoIm723Qemk+detwEmCRe/ZgqfNBxlGJZTIH1EkKKTtJCtDd652gqdQLMJCBNIKgRxtC emAizUkhQ0zN08UZB+4PBcTKQgSwlOBuJoq9P3Ia2ezeLJ/bFouq12p49MmBm4obPhVYPF PEDc1p4UDVqZ70fbhYqN9FIpXpdd6Ud0JpkTHacr5FaurV0k6/vIThppEYcJ6O/ipIzIre ZTUPahQA3LiLLPvzpESTbOOPI265kVLMFTbCfrJgzNduJaJACNMJdkeq3kzuKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646342163; a=rsa-sha256; cv=none; b=i22ITkEm2PUOmF5C213j+jMRk/dQWVRW0KKz3ggbLxsOLOSHPquGBdciACEXLQsJD8KR3L 73G+keU52Yvm9FDdMK0mWNLzsl+vFP3KUTR5IIw7X8bIvEQWvYk8PjJEv4+iBhddHJnjDp 1eK6NPP0xFj1vEgUBcWTGEyBKp/QDWru0ftIAZebO3mdJqy10Mnp6nExe+DUPSXP29qh37 yEeWlLGXrlh48qM3p5CEZLos4xH0JgpjaJTjE3xN/1gqv1/8sKeEQHZvP503C5NFOLKnzK GTa2uRGet7E5sEMHiCwXIKHT57ZiC0g5h/v1bQlUE/KSpAGHgNhmDgUfHFKNsw== 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=f8baab7efe4f993bc2ac9897890aa681c15d5b93 commit f8baab7efe4f993bc2ac9897890aa681c15d5b93 Author: Juraj Lutter AuthorDate: 2022-03-03 21:11:46 +0000 Commit: Juraj Lutter CommitDate: 2022-03-03 21:15:39 +0000 net-mgmt/unifi6: Mark as conflicting with unifi7 --- net-mgmt/unifi6/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-mgmt/unifi6/Makefile b/net-mgmt/unifi6/Makefile index f6b761627c5a..6c1d9bbfeb74 100644 --- a/net-mgmt/unifi6/Makefile +++ b/net-mgmt/unifi6/Makefile @@ -1,5 +1,6 @@ PORTNAME= unifi6 PORTVERSION= 6.5.55 +PORTREVISION= 1 CATEGORIES= net-mgmt java MASTER_SITES= http://dl.ubnt.com/unifi/%SUBDIR%/:unifi \ https://repo1.maven.org/maven2/%SUBDIR%/:jax @@ -27,6 +28,8 @@ JAVA_VENDOR= openjdk bsdjava JAVA_RUN= yes USE_RC_SUBR= unifi +CONFLICTS_INSTALL= unifi7 + EXTRACT_CMD= ${AR} EXTRACT_BEFORE_ARGS= -p EXTRACT_AFTER_ARGS= data.tar.xz | ${TAR} -xf -