git: ed99b2a0126f - 2025Q4 - mail/dbmail: unbreak on FreeBSD15+, take maintainership (+)

The branch 2025Q4 has been updated by fluffy:

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

commit ed99b2a0126fd20789221664cb17cbe90bd9565d
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-12-10 13:29:34 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-12-10 13:35:48 +0000

    mail/dbmail: unbreak on FreeBSD15+, take maintainership (+)
    
    On FreeBSD 15+ with recent ZFS in a box we always have libzdb.so and zdb.h installed
    which conflicts with databases/zdb and breaks the build of dbmail
    
    Set workaround to use <zdb/zdb.h> instead of plain <zdb.h>
    
    PR:     291389
    MFH:    2025Q4
    Approved by:    bofh (former maintainer)
    
    (cherry picked from commit 25dc1d2cd656ece41ad917e0ce68b82969846242)
---
 mail/dbmail/Makefile                    |  5 +++--
 mail/dbmail/files/patch-acinclude.m4    | 19 ++++++++++++++-----
 mail/dbmail/files/patch-src_dbmail.h.in | 11 +++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 795d0067b2ee..35cb887e3374 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,9 +1,10 @@
 PORTNAME=	dbmail
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.5
+PORTREVISION=	1
 CATEGORIES=	mail
 
-MAINTAINER=	bofh@FreeBSD.org
+MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	SQL database-based mail system (POP3 and IMAP)
 WWW=		http://www.dbmail.org/
 
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libgmime-3.0.so:mail/gmime30 \
 		libmhash.so:security/mhash \
-		libzdb.so:databases/libzdb
+		libzdb.so.17:databases/libzdb
 
 USES=		autoreconf gmake gnome libtool localbase pkgconfig shebangfix \
 		ssl
diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4
index 8130b502937f..95087c401415 100644
--- a/mail/dbmail/files/patch-acinclude.m4
+++ b/mail/dbmail/files/patch-acinclude.m4
@@ -1,4 +1,4 @@
---- acinclude.m4.orig	2025-01-09 16:25:33 UTC
+--- acinclude.m4.orig	2025-05-31 16:37:09 UTC
 +++ acinclude.m4
 @@ -43,7 +43,7 @@ AC_DEFINE_UNQUOTED([DM_VERSION], "$PACKAGE_VERSION", [
  AC_DEFINE_UNQUOTED([DM_PWD], "$ac_pwd", [Build directory])
@@ -98,15 +98,24 @@
  		[JEMALLOCLIB="no"],
  	[[
  #include <jemalloc.h>
-@@ -288,7 +288,7 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl
- 		CFLAGS="$CFLAGS -I${lookforzdb}/include/zdb"
+@@ -285,13 +285,13 @@ AC_DEFUN([DM_CHECK_ZDB], [dnl
+ 	if test [ "x$lookforzdb" = "xno" ] ; then
+ 		CFLAGS="$CFLAGS -I${ac_default_prefix}/include/zdb -I/usr/include/zdb"
+ 	else
+-		CFLAGS="$CFLAGS -I${lookforzdb}/include/zdb"
++		CFLAGS="$CFLAGS -I${lookforzdb}/include -I${lookforzdb}/include/zdb"
  	fi
- 	AC_CHECK_HEADERS([zdb.h],
+-	AC_CHECK_HEADERS([zdb.h],
 -		[ZDBLIB="-lzdb"], 
++	AC_CHECK_HEADERS([zdb/zdb.h],
 +		[ZDBLIB="-lzdb"],
  		[ZDBLIB="failed"],
  	[[
-          #include <zdb.h>
+-         #include <zdb.h>
++         #include <zdb/zdb.h>
+ 	]])
+ 	if test [ "x$ZDBLIB" = "xfailed" ]; then
+ 		AC_MSG_ERROR([Could not find ZDB library.])
 @@ -334,7 +334,7 @@ AC_DEFUN([DM_CHECK_SSL], [
  
  AC_DEFUN([DM_CHECK_SSL], [
diff --git a/mail/dbmail/files/patch-src_dbmail.h.in b/mail/dbmail/files/patch-src_dbmail.h.in
new file mode 100644
index 000000000000..7dcd44f191d5
--- /dev/null
+++ b/mail/dbmail/files/patch-src_dbmail.h.in
@@ -0,0 +1,11 @@
+--- src/dbmail.h.in.orig	2025-05-31 16:37:09 UTC
++++ src/dbmail.h.in
+@@ -118,7 +118,7 @@
+ #include <ldap.h>
+ #endif
+ 
+-#include <zdb.h>
++#include <zdb/zdb.h>
+ 
+ #include "dm_cram.h"
+ #include "dm_capa.h"