git: 92fa56974523 - main - net-mgmt/zabbix64-server: Update to 6.4.8

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Thu, 02 Nov 2023 20:44:17 UTC
The branch main has been updated by otis:

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

commit 92fa56974523c07f9e0f348141512351ee63a362
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2023-11-01 21:40:10 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2023-11-02 20:43:58 +0000

    net-mgmt/zabbix64-server: Update to 6.4.8
    
    Reported by:    portscout
---
 net-mgmt/zabbix64-server/Makefile  |  2 +-
 net-mgmt/zabbix64-server/pkg-plist | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/net-mgmt/zabbix64-server/Makefile b/net-mgmt/zabbix64-server/Makefile
index a49ade727bd5..1c52b7e638ad 100644
--- a/net-mgmt/zabbix64-server/Makefile
+++ b/net-mgmt/zabbix64-server/Makefile
@@ -229,7 +229,7 @@ post-install:
 
 .if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
 	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
-	@${RM} ${WRKSRC}/database/*/Makefile*
+	${FIND} ${WRKSRC}/database -name 'Makefile*' -delete
 	(cd ${WRKSRC}/database/ && \
 		${COPYTREE_SHARE} "mysql oracle postgresql sqlite3" \
 		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/)
diff --git a/net-mgmt/zabbix64-server/pkg-plist b/net-mgmt/zabbix64-server/pkg-plist
index 855b20d2e697..91d7a4ad5370 100644
--- a/net-mgmt/zabbix64-server/pkg-plist
+++ b/net-mgmt/zabbix64-server/pkg-plist
@@ -1,29 +1,30 @@
 %%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/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.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/oracle/data.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/double.sql
-%%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/history_pk_prepare.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle/schema.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/option-patches/items_nvarchar_prepare.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/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/option-patches/double.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql/option-patches/history_pk_prepare.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/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/schema.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/data.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/images.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3/schema.sql