git: 3c1e17f66758 - main - net-mgmt/collectd5: chase devel/mongo-c-driver update

The branch main has been updated by nxjoseph:

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

commit 3c1e17f66758eff998a6fd72b4ebf7dd6766021e
Author:     Hiroo Ono <[email protected]>
AuthorDate: 2026-07-08 13:59:30 +0000
Commit:     Yusuf Yaman <[email protected]>
CommitDate: 2026-08-04 11:46:49 +0000

    net-mgmt/collectd5: chase devel/mongo-c-driver update
    
    PR:             296609
    Reported by:    Hiroo Ono <[email protected]>
    Approved by:    Krzysztof <[email protected]> (maintainer)
    Approved by:    osa, vvd (Mentors, implicit)
---
 net-mgmt/collectd5/Makefile                        |  6 ++--
 net-mgmt/collectd5/files/patch-configure.ac        | 33 ++++++++++++++++++----
 .../collectd5/files/patch-src_write__mongodb.c     | 11 ++++++++
 3 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index f455711bbbaa..e95f2867eda8 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	collectd
 DISTVERSION=	5.12.0
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
 PKGNAMESUFFIX=	5
@@ -154,8 +154,8 @@ MODBUS_LIB_DEPENDS=		libmodbus.so:comms/libmodbus
 MODBUS_CONFIGURE_ENABLE=	modbus
 MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig
 
-MONGODB_LIB_DEPENDS=		libbson-1.0.so:devel/libbson \
-				libmongoc-1.0.so:devel/mongo-c-driver
+MONGODB_LIB_DEPENDS=		libbson2.so:devel/libbson \
+				libmongoc2.so:devel/mongo-c-driver
 MONGODB_CONFIGURE_ENABLE=	write_mongodb
 MONGODB_CONFIGURE_WITH=		libmongoc
 
diff --git a/net-mgmt/collectd5/files/patch-configure.ac b/net-mgmt/collectd5/files/patch-configure.ac
index a0a08e537d02..52604453e622 100644
--- a/net-mgmt/collectd5/files/patch-configure.ac
+++ b/net-mgmt/collectd5/files/patch-configure.ac
@@ -9,7 +9,7 @@
    [AC_MSG_ERROR([No compiler found that supports C99])]
  )
  
-@@ -725,7 +725,7 @@ AC_C_CONST
+@@ -725,7 +725,7 @@ AC_TYPE_UID_T
  AC_TYPE_PID_T
  AC_TYPE_SIZE_T
  AC_TYPE_UID_T
@@ -18,7 +18,7 @@
  
  test_cxx_flags() {
    AC_LANG_PUSH([C++])
-@@ -757,7 +757,7 @@ AC_FUNC_STRERROR_R
+@@ -757,7 +757,7 @@ if test "x$GCC" = "xyes"; then
  
  if test "x$GCC" = "xyes"; then
    SAVE_CFLAGS="$CFLAGS"
@@ -27,7 +27,7 @@
  fi
  SAVE_LDFLAGS="$LDFLAGS"
  LDFLAGS=""
-@@ -929,7 +929,7 @@ AC_CHECK_FUNCS([thread_info], [have_thread_info="yes"]
+@@ -929,7 +929,7 @@ if test "x$GCC" = "xyes"; then
  # Check for strptime {{{
  if test "x$GCC" = "xyes"; then
    SAVE_CFLAGS="$CFLAGS"
@@ -49,15 +49,36 @@
  
  AC_CACHE_CHECK([for timegm],
    [c_cv_have_timegm],
-@@ -3454,7 +3454,7 @@ if test "x$with_libmongoc" = "xyes"; then
+@@ -3430,7 +3430,7 @@ if test "x$with_libmongoc" = "xyes"; then
+ )
+ 
+ if test "x$with_libmongoc" = "xyes"; then
+-  PKG_CHECK_MODULES([LIBMONGOC], [libmongoc-1.0],
++  PKG_CHECK_MODULES([LIBMONGOC], [mongoc2],
+     [with_libmongoc="yes"],
+     [with_libmongoc="no (pkg-config could not find libmongoc)"]
+   )
+@@ -3441,7 +3441,7 @@ if test "x$with_libmongoc" = "xyes"; then
+ 
+   CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS"
+ 
+-  AC_CHECK_HEADERS([mongoc.h],
++  AC_CHECK_HEADERS([mongoc/mongoc.h],
+     [with_libmongoc="yes"],
+     [with_libmongoc="no ('mongoc.h' not found)"]
+   )
+@@ -3454,9 +3454,9 @@ if test "x$with_libmongoc" = "xyes"; then
    SAVE_LDFLAGS="$LDFLAGS"
  
    CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS"
 -  LDFLAGS="$LDFLAGS $LIBMONGOC_LDFLAGS"
 +  LDFLAGS="$LDFLAGS $LIBMONGOC_LIBS"
  
-   AC_CHECK_LIB([mongoc-1.0], [mongoc_init],
+-  AC_CHECK_LIB([mongoc-1.0], [mongoc_init],
++  AC_CHECK_LIB([mongoc2], [mongoc_init],
      [with_libmongoc="yes"],
+     [with_libmongoc="no (symbol 'mongoc_init' not found)"]
+   )
 @@ -3874,7 +3874,7 @@ if test "x$with_libnetsnmp" = "xyes"; then
    SAVE_LIBS="$LIBS"
    CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
@@ -93,7 +114,7 @@
        with_libslurm="yes"
      fi; fi; fi
    ],
-@@ -6579,7 +6580,7 @@ collectd features:])
+@@ -6579,7 +6580,7 @@ AC_COLLECTD([getifaddrs],[enable],  [feature], [getifa
  AC_COLLECTD([debug],     [enable],  [feature], [debugging])
  AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
  AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
diff --git a/net-mgmt/collectd5/files/patch-src_write__mongodb.c b/net-mgmt/collectd5/files/patch-src_write__mongodb.c
new file mode 100644
index 000000000000..1892ff72d5b6
--- /dev/null
+++ b/net-mgmt/collectd5/files/patch-src_write__mongodb.c
@@ -0,0 +1,11 @@
+--- src/write_mongodb.c.orig	2026-07-07 01:39:52 UTC
++++ src/write_mongodb.c
+@@ -36,7 +36,7 @@
+ #include "utils/common/common.h"
+ #include "utils_cache.h"
+ 
+-#include <mongoc.h>
++#include <mongoc/mongoc.h>
+ 
+ struct wm_node_s {
+   char name[DATA_MAX_NAME_LEN];