git: 097588ce1757 - 2026Q2 - sysutils/bacula1?-server: fix build on FreeBSD 16

The branch 2026Q2 has been updated by dvl:

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

commit 097588ce1757703a4190e8cc2981804988204e6b
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2026-06-25 15:24:42 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2026-06-25 15:25:03 +0000

    sysutils/bacula1?-server: fix build on FreeBSD 16
    
    This silence the pkg fallout reports
    
    re: https://gitlab.bacula.org/bacula-community-edition/bacula-community/-/commit/0d0186b248e12425aebf56372ce8de29e05924c6
    
    While here, remove an unused patch for sysutils/bacula13-server
    
    Sponsored by:   Sunday morning coffee
    
    (cherry picked from commit 8b18f7a7a557c5ac3f179f8e500820ef79f5aa62)
---
 sysutils/bacula13-server/Makefile                           |  2 +-
 .../files/DISABLED-patch-src_filed_bxattr_freebsd.c         | 13 -------------
 sysutils/bacula13-server/files/patch-src_console_conio.c    | 12 ++++++++++++
 sysutils/bacula15-server/Makefile                           |  1 +
 sysutils/bacula15-server/files/patch-src_console_conio.c    | 12 ++++++++++++
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile
index d1a20dd88e89..a5582b505145 100644
--- a/sysutils/bacula13-server/Makefile
+++ b/sysutils/bacula13-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	13.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
diff --git a/sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c b/sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c
deleted file mode 100644
index deb04f453f87..000000000000
--- a/sysutils/bacula13-server/files/DISABLED-patch-src_filed_bxattr_freebsd.c
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bacula/src/filed/bxattr_freebsd.c b/bacula/src/filed/bxattr_freebsd.c
-index b83331fc578ebc6caf74ff1bf5e67e49329394be..ed2efad02cf2b4f1d1437b25962d28a4d326b873 100644
---- src/filed/bxattr_freebsd.c
-+++ src/filed/bxattr_freebsd.c
-@@ -103,7 +103,7 @@ bRC_BXATTR BXATTR_FreeBSD::os_backup_xattr (JCR *jcr, FF_PKT *ff_pkt){
-          case bRC_BXATTR_skip:
-          case bRC_BXATTR_cont:
-             /* no xattr available, so skip rest of it */
--            rc = bRC_XACL_ok;
-+            rc = bRC_BXATTR_ok;
-             continue;
-          default:
-             goto bail_out;
diff --git a/sysutils/bacula13-server/files/patch-src_console_conio.c b/sysutils/bacula13-server/files/patch-src_console_conio.c
new file mode 100644
index 000000000000..76c740dd46ef
--- /dev/null
+++ b/sysutils/bacula13-server/files/patch-src_console_conio.c
@@ -0,0 +1,12 @@
+diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
+index 2bea887e7406433f57bee865b18f4bee3b11add0..7ac61d642fc92f4a2094d133be75bd03d5a9e1c2 100755
+--- src/console/conio.c
++++ src/console/conio.c
+@@ -56,6 +56,7 @@
+ 
+ #include <curses.h>
+ #include <term.h>
++#include <termios.h>
+ 
+ #ifdef HAVE_SUN_OS
+ #ifndef _TERM_H
diff --git a/sysutils/bacula15-server/Makefile b/sysutils/bacula15-server/Makefile
index 40da8609e177..f1da18adc098 100644
--- a/sysutils/bacula15-server/Makefile
+++ b/sysutils/bacula15-server/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	15.0.3
+PORTREVISION=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${DISTVERSION}
 PKGNAMEPREFIX?=	#
diff --git a/sysutils/bacula15-server/files/patch-src_console_conio.c b/sysutils/bacula15-server/files/patch-src_console_conio.c
new file mode 100644
index 000000000000..76c740dd46ef
--- /dev/null
+++ b/sysutils/bacula15-server/files/patch-src_console_conio.c
@@ -0,0 +1,12 @@
+diff --git a/bacula/src/console/conio.c b/bacula/src/console/conio.c
+index 2bea887e7406433f57bee865b18f4bee3b11add0..7ac61d642fc92f4a2094d133be75bd03d5a9e1c2 100755
+--- src/console/conio.c
++++ src/console/conio.c
+@@ -56,6 +56,7 @@
+ 
+ #include <curses.h>
+ #include <term.h>
++#include <termios.h>
+ 
+ #ifdef HAVE_SUN_OS
+ #ifndef _TERM_H