git: 700da7c5495f - main - net-mgmt/zabbix6-agent: Do not depend on libxml2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 Jun 2025 12:04:44 UTC
The branch main has been updated by otis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=700da7c5495f141493a25e7d1c7324d76d91f04d
commit 700da7c5495f141493a25e7d1c7324d76d91f04d
Author: Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2025-06-06 11:17:34 +0000
Commit: Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2025-06-06 12:04:16 +0000
net-mgmt/zabbix6-agent: Do not depend on libxml2
Do not depend on libxml2, it's not being used in agent.
Move libxml2 dependency to only server and proxy builds.
PR: 287330
---
net-mgmt/zabbix6-agent/Makefile | 2 +-
net-mgmt/zabbix6-server/Makefile | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/net-mgmt/zabbix6-agent/Makefile b/net-mgmt/zabbix6-agent/Makefile
index 23ee30095502..2eda2364fb51 100644
--- a/net-mgmt/zabbix6-agent/Makefile
+++ b/net-mgmt/zabbix6-agent/Makefile
@@ -1,5 +1,5 @@
PORTNAME= zabbix6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMESUFFIX= -agent
diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
index 5cdc460fdd4c..fc35d1788881 100644
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -19,6 +19,8 @@ CONFLICTS_INSTALL= ${PORTNAME}[0-9]${PKGNAMESUFFIX} \
ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//:S/-$//}
+USES= iconv pkgconfig
+
.if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
.if ${ZABBIX_BUILD} != "agent"
CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache \
@@ -26,13 +28,15 @@ CONFIGURE_ARGS+= --cache-file=${WRKSRC}/config.cache \
--with-libxml2
LIB_DEPENDS+= libevent.so:devel/libevent
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}
+# -server and -proxy depends on libxml2
+.if ${ZABBIX_BUILD} != "java"
+USES+= gnome
+USE_GNOME= libxml2
+.endif
.else
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
.endif
-USES= gnome iconv pkgconfig
-USE_GNOME= libxml2
-
USERS= zabbix
GROUPS= zabbix
@@ -79,8 +83,8 @@ CPPFLAGS+= -I${LOCALBASE}/include
SUB_FILES= pkg-message
-OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 LIBXML2 MYSQL OPENSSL SNMP SSH UNIXODBC
-OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP LIBXML2 NMAP SNMP SSH UNIXODBC
+OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 MYSQL OPENSSL SNMP SSH UNIXODBC
+OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP NMAP SNMP SSH UNIXODBC
OPTIONS_SINGLE+= DB SSL
OPTIONS_SINGLE_DB= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL
.if ${ZABBIX_BUILD} == "proxy"
@@ -96,7 +100,6 @@ NMAP_DESC= Build/install nmap for o/s detection
SNMP_DESC= Support for SNMP checks
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
MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere)