git: 918dc3c45f2a - main - net-mgmt/icingadb: Update to 1.4.0

From: Dan Langille <dvl_at_FreeBSD.org>
Date: Mon, 14 Jul 2025 11:49:55 UTC
The branch main has been updated by dvl:

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

commit 918dc3c45f2a2f19313fb4d918468cb0af8bd9e1
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2025-07-14 11:45:48 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2025-07-14 11:49:26 +0000

    net-mgmt/icingadb: Update to 1.4.0
    
    re: https://github.com/Icinga/icingadb/releases/tag/v1.4.0
    
    Note the changed requirements in the above.
    
    PR:             285943
---
 net-mgmt/icingadb/Makefile                              |  5 ++---
 net-mgmt/icingadb/distinfo                              | 14 +++++++-------
 net-mgmt/icingadb/files/patch-internal_config_config.go | 11 +++++++++++
 net-mgmt/icingadb/files/patch-pkg_config_config.go      | 11 -----------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/net-mgmt/icingadb/Makefile b/net-mgmt/icingadb/Makefile
index eb0452038bf2..93e83b0e2dcf 100644
--- a/net-mgmt/icingadb/Makefile
+++ b/net-mgmt/icingadb/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	icingadb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.0
-PORTREVISION=	7
+DISTVERSION=	1.4.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -39,7 +38,7 @@ SUB_LIST+=	ICINGA2USER=${ICINGA2USER} \
 		PREFIX=${PREFIX}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX|${PREFIX}|g' ${WRKSRC}/pkg/config/config.go
+	@${REINPLACE_CMD} -e 's|%%PREFIX|${PREFIX}|g' ${WRKSRC}/internal/config/config.go
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net-mgmt/icingadb/distinfo b/net-mgmt/icingadb/distinfo
index b692bebb072e..d169b14713ee 100644
--- a/net-mgmt/icingadb/distinfo
+++ b/net-mgmt/icingadb/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1722340400
-SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.mod) = 7ae965983fb00d3e058aad4e8d38d15eeac66c314cc8b6830a4b3b2983dbfe12
-SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.mod) = 1502
-SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.zip) = a7ff457bad4ef78a5c65d3fc06571541bec5deee6f0fabbfd88a888e263dcc6d
-SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/v1.2.0.zip) = 3379031
-SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/Icinga-icingadb-v1.2.0_GH0.tar.gz) = f3452f796a471e848c2e51d2820444df8907be7f972cdd139e2abcd6f66a4890
-SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.2.0_GH0/Icinga-icingadb-v1.2.0_GH0.tar.gz) = 3345811
+TIMESTAMP = 1752491323
+SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.mod) = af22816190cdd4935f3dd696a4e98f6b2246d8580460173f126c408299258d3c
+SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.mod) = 1625
+SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.zip) = eb065d6314499169207e9d47b04714cb5afa858a3fe7b4ce5a5c943295bdf930
+SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/v1.4.0.zip) = 3354764
+SHA256 (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/Icinga-icingadb-v1.4.0_GH0.tar.gz) = e244998da7c6f817fc590ca0852451a12fee4bc8fda8d3183c4f6c4df1ab38bd
+SIZE (go/net-mgmt_icingadb/Icinga-icingadb-v1.4.0_GH0/Icinga-icingadb-v1.4.0_GH0.tar.gz) = 3343081
diff --git a/net-mgmt/icingadb/files/patch-internal_config_config.go b/net-mgmt/icingadb/files/patch-internal_config_config.go
new file mode 100644
index 000000000000..418f02d52e51
--- /dev/null
+++ b/net-mgmt/icingadb/files/patch-internal_config_config.go
@@ -0,0 +1,11 @@
+--- internal/config/config.go.orig	2025-07-14 11:25:55 UTC
++++ internal/config/config.go
+@@ -56,7 +56,7 @@ type Flags struct {
+ 	Version bool `long:"version" description:"print version and exit"`
+ 
+ 	// Config is the path to the config file. If not provided, it defaults to DefaultConfigPath.
+-	Config string `short:"c" long:"config" description:"path to config file (default: /etc/icingadb/config.yml)"`
++	Config string `short:"c" long:"config" description:"path to config file (default: %%PREFIX%%/etc/icingadb/config.yml)"`
+ 	// default must be kept in sync with DefaultConfigPath.
+ 
+ 	// DatabaseAutoImport results in an initial schema check and update; mostly for containerized setups.
diff --git a/net-mgmt/icingadb/files/patch-pkg_config_config.go b/net-mgmt/icingadb/files/patch-pkg_config_config.go
deleted file mode 100644
index 1b5b0066118c..000000000000
--- a/net-mgmt/icingadb/files/patch-pkg_config_config.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkg/config/config.go.orig	2023-09-08 17:19:58 UTC
-+++ pkg/config/config.go
-@@ -46,7 +46,7 @@ type Flags struct {
- 	// Version decides whether to just print the version and exit.
- 	Version bool `long:"version" description:"print version and exit"`
- 	// Config is the path to the config file
--	Config string `short:"c" long:"config" description:"path to config file" required:"true" default:"/etc/icingadb/config.yml"`
-+	Config string `short:"c" long:"config" description:"path to config file" required:"true" default:"%%PREFIX%%/etc/icinga2/icingadb.yml"`
- }
- 
- // FromYAMLFile returns a new Config value created from the given YAML config file.