Date: Thu, 27 Jan 2022 20:34:38 GMT From: Juraj Lutter <otis@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ef2ad9e8617 - main - net-mgmt/zabbix54-frontend: Build as php74-flavored only Message-ID: <202201272034.20RKYc5K037170@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ef2ad9e861701a3a40718a52ebadd9202e84509 commit 2ef2ad9e861701a3a40718a52ebadd9202e84509 Author: Juraj Lutter <otis@FreeBSD.org> AuthorDate: 2022-01-27 20:18:17 +0000 Commit: Juraj Lutter <otis@FreeBSD.org> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201272034.20RKYc5K037170>