git: fc6655bd2577 - main - net-mgmt/zabbix6-server: Fix pkg-plist

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Fri, 31 Jan 2025 11:39:27 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fc6655bd257715b2f26a99e2037640aec705288e

commit fc6655bd257715b2f26a99e2037640aec705288e
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2025-01-31 11:37:31 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2025-01-31 11:37:31 +0000

    net-mgmt/zabbix6-server: Fix pkg-plist
    
    Some of the database files were moved deeper into directory
    structure and some of them were renamed. Catch up with the changes.
---
 net-mgmt/zabbix6-server/Makefile       |  3 ++-
 net-mgmt/zabbix6-server/pkg-plist      | 34 +++++++++++++++++-----------------
 net-mgmt/zabbix6-server/pkg-plist.java |  6 +++---
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
index e4c854f5bc36..91f52521cf63 100644
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -234,7 +234,8 @@ post-install:
 
 .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
-	@${RM} ${WRKSRC}/database/*/Makefile*
+	${FIND} ${WRKSRC}/database -type f -name 'Makefile*' -exec ${RM} {} +
+	# @${RM} ${WRKSRC}/database/*/*/Makefile*
 	(cd ${WRKSRC}/database/ && \
 		${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \
 		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
diff --git a/net-mgmt/zabbix6-server/pkg-plist b/net-mgmt/zabbix6-server/pkg-plist
index b80cd18c43dc..3fdd8ddde6e1 100644
--- a/net-mgmt/zabbix6-server/pkg-plist
+++ b/net-mgmt/zabbix6-server/pkg-plist
@@ -1,29 +1,29 @@
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/option-patches/history_pk_prepare.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/option-patches/history_pk_prepare.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/history_pk_prepare.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/option-patches/history_pk_prepare.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/schema.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_log.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_str.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_text.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_uint.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_log.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_str.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_text.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_uint.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/schema.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_log.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_str.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_text.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/without-compression/history_pk_uint.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_log.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_str.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_text.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/timescaledb/option-patches/with-compression/history_pk_uint.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql
 @sample %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample
 %%PROXY%%bin/zabbix_proxy_js
diff --git a/net-mgmt/zabbix6-server/pkg-plist.java b/net-mgmt/zabbix6-server/pkg-plist.java
index 3c583b91a9e9..50007bf2909a 100644
--- a/net-mgmt/zabbix6-server/pkg-plist.java
+++ b/net-mgmt/zabbix6-server/pkg-plist.java
@@ -1,9 +1,9 @@
 sbin/zabbix_java/shutdown.sh
 sbin/zabbix_java/lib/logback-console.xml
-sbin/zabbix_java/lib/logback-core-1.2.9.jar
-sbin/zabbix_java/lib/logback-classic-1.2.9.jar
+sbin/zabbix_java/lib/logback-classic-1.5.16.jar
+sbin/zabbix_java/lib/logback-core-1.5.16.jar
 sbin/zabbix_java/lib/logback.xml
-sbin/zabbix_java/lib/slf4j-api-1.7.32.jar
+sbin/zabbix_java/lib/slf4j-api-2.0.16.jar
 sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
 @sample sbin/zabbix_java/settings.sh.sample
 sbin/zabbix_java/startup.sh