From nobody Mon May 09 22:12:24 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 D7B8A1AD7885; Mon, 9 May 2022 22:12:24 +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 4KxwQJ5QFcz3sKh; Mon, 9 May 2022 22:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652134344; 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=ocEuM5JYsuNbjjoFQFffDCWmLgCDCQBMgrPI661UbgA=; b=BI+ANcTmlVIUqmti7c4FeoZ8SUHHz4ovyl6kTSv7wwb7vp0bqpzZZIWZWomZTlFBn3DyMX Cl2fyx5worPg21W+aWOrA0Fi+YatE3r6XA3HN0R71EEwEJ6Pk1dVOFHZMJhbTqDRAwepw8 g0j16JenTQoGzbD0nSmJO6OGn2gisto9VdW1Kn3J1p+9SXHAbaHGPiBollytbQX15JZ4UL ecOuJcU/eidZQ+P2Dm4I3bBXRYIoF2uNvNTVQcyhCF25yPRkDNsWrcskSmTQ/PRcmF4VC4 dhAYWnPWalX+EuPrvL2L50XzvFzKyPpnM3igEL543zylKGjZJs3OfA7Wlt7l6g== 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 99B2918FFE; Mon, 9 May 2022 22:12:24 +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 249MCO55022333; Mon, 9 May 2022 22:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249MCOD5022332; Mon, 9 May 2022 22:12:24 GMT (envelope-from git) Date: Mon, 9 May 2022 22:12:24 GMT Message-Id: <202205092212.249MCOD5022332@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 17732ee11b83 - main - net-mgmt/zabbix6-server: Split mariadb options 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17732ee11b834fdf1b1095157836147c905d91cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652134344; 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=ocEuM5JYsuNbjjoFQFffDCWmLgCDCQBMgrPI661UbgA=; b=sn+XBQy5X0NP+WROo9qrDhu5aAK2h+Ihh2/XduuV02TW8fZvRPSRAaUyPHpP7YZO9DeAlq Z8QfazfmPv6GAIGI2L2Y86AscBTNuEyR5pm6dF1pIHquRJqDYLHUCt446TPtCRuOgEvVHj vTH0XV+5suyEMIYWyRtSW9Qu7NvZMQv0xEtOMLrDk4VnY+gxasdLQ7YCLyOylks+qJ853T axOELK15nLU7nK0PqludcOiLZvoBDyT3hQriMt5SJq38HJakBjJqTaNtio43O+mmFOR0PI nSYc1boxbB0sHweAaEPNCJ0Nq5xYarajFDXPFKhIvnIa76+MuuCBcaxy4KP6/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652134344; a=rsa-sha256; cv=none; b=KS9PuMPsIApVoEtumje99ODAajO7qED4kmxqA+2TkxJopkIFNm0+PHg+uzDXOcYYLag1zI qGmh+aR1jMYhUx0l7hNoHw4bRfwDBOgQnk7wjHg3XAm0aQMY/rADh/Ra9Xkjf7F36gOLtJ 5/By7V1bZLtJyJJYMoAJduggGvw5kMZpnDqtZhJogVFZ5r5TSDkGN5Wb89profgg+NhSd9 qNh/jyW1W5FUzfPTdoYq5WgZbXFI/9MtOZWangwdUEy+Rn017n2gUXx5cCE/JPKohdvHXs usUiTUu6tW1pVGugotKlvGdkO3CC1Alf1qrTnJR8jwk7Gva6/+XRRr+n9y+huA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=17732ee11b834fdf1b1095157836147c905d91cf commit 17732ee11b834fdf1b1095157836147c905d91cf Author: Cy Schubert AuthorDate: 2022-05-09 21:58:45 +0000 Commit: Cy Schubert CommitDate: 2022-05-09 22:12:18 +0000 net-mgmt/zabbix6-server: Split mariadb options Zabbix 6 supports mariadb 10.5 and 10.6. Allow the user to select one or the other. --- net-mgmt/zabbix6-server/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile index 2efac521d809..bc1e5df2b6b3 100644 --- a/net-mgmt/zabbix6-server/Makefile +++ b/net-mgmt/zabbix6-server/Makefile @@ -77,17 +77,22 @@ NMAP_DESC= Build/install nmap for o/s detection SSH_DESC= Support for SSH-based checks UNIXODBC_DESC= Support for database checks via ODBC LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) +MYSQL_DESC= MySQL 8.0 database support OPTIONS_SINGLE= DB SSL -OPTIONS_SINGLE_DB?= MDB MYSQL PGSQL ORACLE +OPTIONS_SINGLE_DB?= MDB5 MDB6 MYSQL PGSQL ORACLE OPTIONS_SINGLE_SSL= OPENSSL GNUTLS MYSQL_CONFIGURE_ON= --with-mysql MYSQL_USES+= compiler:c11 mysql:80 -MDB_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config -MDB_USES+= compiler:c11 mysql:106m -MDB_DESC= Mariadb 10.6 database support +MDB5_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config +MDB5_USES+= compiler:c11 mysql:105m +MDB5_DESC= Mariadb 10.5 database support + +MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config +MDB6_USES+= compiler:c11 mysql:106m +MDB6_DESC= Mariadb 10.6 database support PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql