From nobody Wed Sep 14 06:17:15 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 4MS9982FYrz4cQJg; Wed, 14 Sep 2022 06:17:16 +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 4MS9981Br8z3KRP; Wed, 14 Sep 2022 06:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663136236; 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=kxxvtrV4BnU35KaxCRKpKVvB112a7KwkA+S1twhjVsQ=; b=ra2AlAUjv2gUvwF+BGcNLS4sdX/CZtVb2Ea4PZkCJ+7PN1l6nTQYhItPYuQ8OJTBmRdWwJ +4RtkNXQEpQR7urGLZ/ESBrA+D6nQ3xnNpJwIYF4+3DAPoMDEOYrGKhnl3qr2HKNsC0Pls iMlkblDEClza0THooEnDn6VPJtmf3FyFu7lKXtDlf7bndlNsRvYkcZchTrwV5xq1l1taUT PeR2EEROxiRyS+12UYd+pZJZKBh+LKogZh5KpOeBZ6HUapqkxERcwarn+HIWuT0xnok44c zPQWVsvuCOblNy1J+fDMJE7VLhVmEW1+0Ctqf+lm0XGsL7gGAcB9z6NjBGR/ZQ== 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 4MS99809Xlzb7s; Wed, 14 Sep 2022 06:17:16 +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 28E6HFOV093618; Wed, 14 Sep 2022 06:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28E6HF4Z093617; Wed, 14 Sep 2022 06:17:15 GMT (envelope-from git) Date: Wed, 14 Sep 2022 06:17:15 GMT Message-Id: <202209140617.28E6HF4Z093617@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: be29f8c336c8 - main - net-mgmt/zabbix6-server: Add PORTSCOUT 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: be29f8c336c8ab0f53841935f212f73e8952b469 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663136236; 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=kxxvtrV4BnU35KaxCRKpKVvB112a7KwkA+S1twhjVsQ=; b=y0VhEPlgU4iSYlefA7Ck57YLER15kHdmYIubq+shf/QpvSbeeaMQ0VXoMIO7asmOCbHSaI fhHUx/Tp1w1gfDL2AqUCCtoo04UZo0LMGtrILn2nSKOxl+FbfYOr5CC6g/dx+mViNpxogc /V0LGIKsyWVmsHaH/UHABPKvktYxEQnjW8+2gWehcDNFBbGf/url5itFjkHrlRCEXzriI/ JT/9rLUd7/ET0/AW+kTb3NfMks5gYTtf6e1XQWSG86vDIDkKFy4VmvCrQRsMOXxd6xsYu7 lGS+AMipvGT8tf5AxfGUOs1BOzm5EUP9Hy+QFe/AP3jtzSSmrlOejbS1j6VRtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663136236; a=rsa-sha256; cv=none; b=xwl7a4iI7SdHDynlJuVH+QFjTZrhdWNBPziAGugI9UtSFscLTHRWlH9Ypp8ecszlPybWld qJaojLzZ7lmyYBI79wnbEdTBus5OgA1cGmP2e3V5Di841/Ga8iQkimQ0J9JnqC3h6OP6ZZ vu9zBY+rYiKn/IAkSVKhdpJzxrP+JvkqlGgzdVBXO9qpehjKxmCPyCQ4rJzjJ4KheTAZy7 d0bilFsXC9JjKTsreHj5BKAyuYtQJztjGFWYA9FDF1Cm6DmbzxxcKFYsm7ZsJdnKbokfVN w+358XoqUdzBLT+oWuhOF2PihTG0HtmPe/WKfU+qkbLjit1AYhrHy4JyT9oYXQ== 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=be29f8c336c8ab0f53841935f212f73e8952b469 commit be29f8c336c8ab0f53841935f212f73e8952b469 Author: Juraj Lutter AuthorDate: 2022-09-13 20:15:59 +0000 Commit: Juraj Lutter CommitDate: 2022-09-14 06:16:58 +0000 net-mgmt/zabbix6-server: Add PORTSCOUT And while here, also fix conflict with zabix62 (and future zabbix64) components. --- net-mgmt/zabbix6-server/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index 5e8baca07672..9c12ba66a8ea 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS_INSTALL= zabbix5[0-9]${PKGNAMESUFFIX} \ - zabbix[0-57-9]${PKGNAMESUFFIX} + zabbix[0-57-9]${PKGNAMESUFFIX} \ + ${PORTNAME}[0-9]${PKGNAMESUFFIX} ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//} @@ -62,6 +63,8 @@ LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CPPFLAGS+= -I${LOCALBASE}/include +PORTSCOUT= limit:^6\.0\. + SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp