From nobody Tue Aug 4 11:47:13 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hDsGV4C94z6n62l for ; Tue, 04 Aug 2026 11:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hDsGV2rX1z3qdW for ; Tue, 04 Aug 2026 11:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfTyb3th2NNUSUPLJZWHub8ByGnOMM2SxJhdI/o7h3I=; b=m2mmIkiBa7+PBlTDtKnuVqDJclwYxw4YXsAh7Gni/J6U4M1R1qP56/58TlZPMF+oPAjuHv 2TuQdajKI9FpGiCsG2eN0nshqgmJfbFdXoKE6GdXkOS7up3YjNIAszUNPIjym8mb/DSXsm mH1J+hx22cEA3jxtgLM9D7YcSBlkHq7eanH1DMRgDhc7rR2AKQT5pOEtnb2FHOyhaYna3P o8BT5TBUaCspEtEqP3xeOo8cdT+pSxZ3lTOmK+bm2c0GxTBuPWzSHvjeZMATcTPlAQpHd9 7dFfXmiMNqwpf8b/5Sv7LKg36CCralGnsmrwckMwbHrKHSUlExlIKo88CKe8+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785844034; a=rsa-sha256; cv=none; b=bDt2+EgVhMKg+61hIPP+fGNNqvm7psqRCRFBtrqmTex3l+LPc1evyMNoJ0GcuOIjVXh4vb Et2x8xcwrFn6av1CmBH/vSqPS/Y32VuBcwjf7UzSNaxdRCs22bRjemJ+hnrOEyNAafyq4v CfBpbShP2RnPFNqSnO98N0E0H9vjPbbpJbx6li4UZcVFP1LuG6qTp0rjbJOiCpBSHghHcQ uWnz/5n5DXiNw2iGlmFce7Qzp/t2LjxjU7HECZj4bMj4U3MXTEB0S802eYR5urh3/333xR TWtddHPwepEpb5Awok+48M2cOGAk4SYfPX7KVxKnlxux26ODnKCESLmjpsB+HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785844034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LfTyb3th2NNUSUPLJZWHub8ByGnOMM2SxJhdI/o7h3I=; b=cFVnnR54szb0IH4P7BfR1JIfYtUW3kKjb3zvoMIAowxzomIcLnimXT0StaQG6vS8880CIg vEUDvcQiUPcgB/+9kt4LJRlacF5dx4ZoQtbPY1/BWKMNZIqMPBEXcvHYmTkN5JDVdl0FS7 iicr9cszZ655i4S/wFjuWHokNem9PaWqla1bQztkTi8tZDyoufMWrX9sM5zOlndzHxgERV aKuYd2bLnkHatdYecs43r7Pd5XA8+1VaU1DtQGIcjrFUTtJimNK57BQ5ylIQs4/qbNOyYL VTFyu1acdP4ONRB4oZEXxzIuyqG2mLFCpFCwPnCCR2wvYpDwVsgS4pblLJ+isw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hDsGT5TZzzlqN for ; Tue, 04 Aug 2026 11:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d2c7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 04 Aug 2026 11:47:13 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Cc: Hiroo Ono From: Yusuf Yaman Subject: git: 3c1e17f66758 - main - net-mgmt/collectd5: chase devel/mongo-c-driver update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nxjoseph X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c1e17f66758eff998a6fd72b4ebf7dd6766021e Auto-Submitted: auto-generated Date: Tue, 04 Aug 2026 11:47:13 +0000 Message-Id: <6a71d141.1d2c7.65dd62cc@gitrepo.freebsd.org> The branch main has been updated by nxjoseph: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c1e17f66758eff998a6fd72b4ebf7dd6766021e commit 3c1e17f66758eff998a6fd72b4ebf7dd6766021e Author: Hiroo Ono AuthorDate: 2026-07-08 13:59:30 +0000 Commit: Yusuf Yaman CommitDate: 2026-08-04 11:46:49 +0000 net-mgmt/collectd5: chase devel/mongo-c-driver update PR: 296609 Reported by: Hiroo Ono Approved by: Krzysztof (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 ++#include + + struct wm_node_s { + char name[DATA_MAX_NAME_LEN];