From nobody Sun Feb 12 19:56:26 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 4PFJBf3v7Wz3rBVC; Sun, 12 Feb 2023 19:56:26 +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 4PFJBf3MsFz42FJ; Sun, 12 Feb 2023 19:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676231786; 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=Pp+/PwOJUFJj27IBdZOTOPO2I2vfFAfotFi+QGhgJqc=; b=BLFgD2d8rbHtDTCHWQIm4HPMBLL7v9SczrSwGvXeACrql/6exn3Idr36dQlAyopugITL42 gHuV2IgK2yUbI6MbhUkdetvO/6rJQp4XuZUEUHP72xGr9xQKB0T9YiCYtEEwJ1N0oh23NT ++w6oyiWF7k5vqr9/c6Cy5czlSp0y6raCdVxj9p1YzcQnlrAabz8HWZUX1lXMbpPALSsSU gfWDswIp6EO0HXiPnoz1CjLro/v9a7/o+n5oGcioLIhy9KHrBIY42YbENW7fH/Cz1hDdnR 7kuWCj5/Dap7Q6OXIB2ZnuUszc0z2V5OderH88zKsAeOMDF/aWJq5BeWr3ekWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676231786; 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=Pp+/PwOJUFJj27IBdZOTOPO2I2vfFAfotFi+QGhgJqc=; b=NqWtCJ1OrkOBtzWFAm3/GTuj3obdMNv+9mWBrjCPaC/tHmHE0EmhL3GZ8CLmrGl71eVfU5 P+MGxZaC0zn1ZcPezBdGfJp5kyjCuJsJqxX9HqtTuw1CgsW7QREfTQDkLPyux7dwM7AMG6 dBFqAupUG5plYrbqPaM57Z+Yp4v6e1qlgL9ZzFHjnbFFgk4wOfhU5qfQBB0DUoaAKmaI/l BWwlqv5uPNXWHWMDlcKgdegpOW2aZ0Hi3A/G5M9jg56GSZwwFSpsrRpqldnjIUWW2dRgUJ hW4frN+9WleJ+Jr1yn5wIxkf2apfca1MhQAsvcpQzMV+rw2rBIivspkux6BzWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676231786; a=rsa-sha256; cv=none; b=iA2A6B1Hvw2LfD1IcbabGEOizlCAp5cEW3wFSEkQO5hAf93Ef5NOWfX1sq8Jpn9HtZwGgy TgV9hlf5RFfxv44z5cAtd6dEpiO+/RI0BfkmiE25qRNfE+/Tatn0To6uyB2wGkfLM5KCXo dLbfndogV+bk2VtMbkDX4PTiNRYetqP7JAVABwMHe0ojXnSyvAtI+4tl8orI6tZeYsqLHH vKvXcIzXi8rPuy2XFTOz87ks73/mpwCssBXwgv6cKTByP5pBFyZWZfB3JsdLPbc6iE8ucj XiRzzoNUFVzYh0T6Bm7DyUSlUalZwARCgsOOKbcQi11B5ajY+eltEZ/AdMQN7w== 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 4PFJBf2PqhzqvG; Sun, 12 Feb 2023 19:56:26 +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 31CJuQDn098126; Sun, 12 Feb 2023 19:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31CJuQe1098125; Sun, 12 Feb 2023 19:56:26 GMT (envelope-from git) Date: Sun, 12 Feb 2023 19:56:26 GMT Message-Id: <202302121956.31CJuQe1098125@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: 928845ecfe70 - main - net-mgmt/zabbix62-server: Adjust CONFLICTS_INSTALL 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: 928845ecfe7032451e949a08e6a264d6da721db3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=928845ecfe7032451e949a08e6a264d6da721db3 commit 928845ecfe7032451e949a08e6a264d6da721db3 Author: Franco Fichtner AuthorDate: 2023-02-12 19:27:33 +0000 Commit: Juraj Lutter CommitDate: 2023-02-12 19:30:18 +0000 net-mgmt/zabbix62-server: Adjust CONFLICTS_INSTALL PR: 269404 --- net-mgmt/zabbix62-server/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net-mgmt/zabbix62-server/Makefile b/net-mgmt/zabbix62-server/Makefile index 5f0b61293e6f..ce954a40a709 100644 --- a/net-mgmt/zabbix62-server/Makefile +++ b/net-mgmt/zabbix62-server/Makefile @@ -1,5 +1,6 @@ PORTNAME= zabbix62 DISTVERSION= 6.2.7 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/ PKGNAMESUFFIX?= -server @@ -12,9 +13,7 @@ WWW= https://www.zabbix.com/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS_INSTALL= ${PORTNAME}[0-9]${PKGNAMESUFFIX} \ - zabbix5[0-9]${PKGNAMESUFFIX} \ - zabbix[0-57-9]${PKGNAMESUFFIX} +CONFLICTS_INSTALL= zabbix[0-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//}