From nobody Thu Jan 27 20:34:38 2022 X-Original-To: dev-commits-ports-main@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 270F61983598; Thu, 27 Jan 2022 20:34:39 +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 4JlC4b0c5Pz3mqp; Thu, 27 Jan 2022 20:34:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643315679; 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=fBpfTpo7PlIX6Brwqc8o1g6Cp4a8zKmT/r6QRZDrVvo=; b=IIz80gPUt8QCEkuoUyyr4s/MOlh6RCLDU4o3kHUcSz/f8rfMdWYlZbCV2Abv6UXXD9cosP C2DGUfgttpeWPYv6gtEU0jABq/rvt8VXG+xW8NPK0A2JxPLc/0idY2Y6Ym5BJag8SOt+Uo qUSTxbU4WtSt+SkdeieV1vnOoUb9eVQ5SI8EzdHOx+NTiqxSDuxuokjK/IMhqsFuDfvOCl 6Yi4tsVCk41uOLAXU5pN18hvhQMIxVCrENG2teRgtQXQcONXUd3I+k1MxC5cXUplkkPvsd V7kIbO1/vyMVj4HEzDNQX9lEADsReWZXBmDb0Ykb6xGio3KAcNJ8SGhR9B1QEA== 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 EADAC1D5BA; Thu, 27 Jan 2022 20:34:38 +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 20RKYcKC037171; Thu, 27 Jan 2022 20:34:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RKYc5K037170; Thu, 27 Jan 2022 20:34:38 GMT (envelope-from git) Date: Thu, 27 Jan 2022 20:34:38 GMT Message-Id: <202201272034.20RKYc5K037170@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: 2ef2ad9e8617 - main - net-mgmt/zabbix54-frontend: Build as php74-flavored only List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 2ef2ad9e861701a3a40718a52ebadd9202e84509 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643315679; 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=fBpfTpo7PlIX6Brwqc8o1g6Cp4a8zKmT/r6QRZDrVvo=; b=FE4iRJBWv3Gue0QteGat/xRjz1haVwBKIDoZaqSYubLTYOsdjv3ZbB81+LZ6H2FPvqEwmW hyEsJMSWzArn027lULP99LYtcK8EomZ5xbpRXi6S/6eVVpSmdfWpQzJPVfTDB3jcGEgiU7 ghbXrW5DbYdq4IRxZZXAF22yH+MtKIfctjaNbvf9C/F6L59dZc0iansZUrAR+plAmiucBF 73wuzPUVywhJVOhYcld2FlNmDpcVf70zUyQJe2ny7LnJ61+Khs5Q71e63W51KgwP+wZPeh VzYhZnIj2f8ThlUa6QfibWFDMUNVE24nU+tKhfzhfNUz2aXmqwe4cIPYwVtYsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643315679; a=rsa-sha256; cv=none; b=e4g2sP9J4b1/O6lPi3km9mmdJ6U0hLNsG3MfX+tu2Rbo24YucGoKgWZrEMv1u7sjpyLc+1 O+unUjVSah2ShjEEM8Vp3TL9gvwX7xb09T9yvtUs8JA0WZYhP5CrV/7eOs+vBAO+OAq5/c VaCDu3/8bads8BWZf4J7CbAjaETEv6oCfea/8qLd6L9g/qxw6/7WB1DG/o8IlR1T9Zm27V Yh+/DP0MsfP+ZAo6t/pi/zXdcSIB3tMD7SUCKGvT2kr6BgbSASOP0x6ghZ68RThDhp/FJ/ t079RTjGucvgZe4NeLexGvpMXlaMSG6+dwJmlbBgnP/bEX6bCsMLOm0xD1Dzow== 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=2ef2ad9e861701a3a40718a52ebadd9202e84509 commit 2ef2ad9e861701a3a40718a52ebadd9202e84509 Author: Juraj Lutter AuthorDate: 2022-01-27 20:18:17 +0000 Commit: Juraj Lutter CommitDate: 2022-01-27 20:34:29 +0000 net-mgmt/zabbix54-frontend: Build as php74-flavored only As php 8.x is not supported with zabbix 5.x frontend, make it to only build with php 7.4 and convert to using flavors. And while here, also portfmt and portclippy a bit. Reported by: alexvpetrov@gmail.com --- MOVED | 1 + net-mgmt/zabbix54-frontend/Makefile | 28 ++++++++++++++-------------- net-mgmt/zabbix54-server/Makefile | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/MOVED b/MOVED index 894945de767b..4206ba832418 100644 --- a/MOVED +++ b/MOVED @@ -16877,3 +16877,4 @@ x11-toolkits/py-qt5-quick3d|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt x11-toolkits/py-qt5-quickwidgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt x11-toolkits/py-qt5-widgets|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt x11/py-qt5-opengl|devel/py-qt5-pyqt|2022-01-27|Merged into devel/py-qt5-pyqt +net-mgmt/zabbix54-frontend|net-mgmt/zabbix54-frontend@php74|2022-01-27|Build as php 7.4-flavored only diff --git a/net-mgmt/zabbix54-frontend/Makefile b/net-mgmt/zabbix54-frontend/Makefile index b70eaac36074..dad663b9a9fb 100644 --- a/net-mgmt/zabbix54-frontend/Makefile +++ b/net-mgmt/zabbix54-frontend/Makefile @@ -1,28 +1,28 @@ PORTNAME= zabbix54 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net-mgmt -PKGNAMESUFFIX= -frontend +PKGNAMESUFFIX= -frontend${PHP_PKGNAMESUFFIX} -MASTERDIR= ${.CURDIR}/../${PORTNAME}-server +USES+= php:web,flavors +USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap \ + mbstring openssl pcre session simplexml snmp sockets xml \ + xmlreader xmlwriter +IGNORE_WITH_PHP= 80 81 -NO_BUILD= yes -NO_ARCH= yes +MASTERDIR= ${.CURDIR}/../${PORTNAME}-server PATCHDIR= -PLIST= ${PKGDIR}/pkg-plist.frontend +NO_ARCH= yes +NO_BUILD= yes -USE_PHP= bcmath ctype dom fileinfo filter gd gettext hash json ldap mbstring \ - openssl pcre session simplexml snmp sockets xml xmlreader xmlwriter -USES+= php:web +PLIST= ${PKGDIR}/pkg-plist.frontend -OPTIONS_DEFINE= MYSQLI PGSQL ORACLE +OPTIONS_DEFINE= MYSQLI ORACLE PGSQL OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQLI_USE= PHP=mysqli - -PGSQL_USE= PHP=pgsql - +MYSQLI_USE= PHP=mysqli ORACLE_CONFIGURE_WITH= oracle +PGSQL_USE= PHP=pgsql do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} diff --git a/net-mgmt/zabbix54-server/Makefile b/net-mgmt/zabbix54-server/Makefile index 612a4008cbbe..81b66d206e53 100644 --- a/net-mgmt/zabbix54-server/Makefile +++ b/net-mgmt/zabbix54-server/Makefile @@ -17,7 +17,7 @@ CONFLICTS_INSTALL= zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \ zabbix5[0-35-9]${PKGNAMESUFFIX} \ zabbix[0-9]${PKGNAMESUFFIX} -ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} +ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent"