git: 18f5c0eb55c3 - main - sysutils/bacula11-server: Add S3 cloud option

The branch main has been updated by dvl:

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

commit 18f5c0eb55c34fc7ecdd422b7c323746ea797a0e
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2023-09-10 14:10:50 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2023-09-10 14:14:00 +0000

    sysutils/bacula11-server: Add S3 cloud option
    
    Allow a bacula-sd node to use S3 for storage
    
    This uses the recently added sysutils/bacula-libs3 port
    
    While here, also add S3 to bacula13-server
    PR:             260171
---
 sysutils/bacula11-server/Makefile  | 10 ++++++++--
 sysutils/bacula11-server/pkg-plist |  4 ++++
 sysutils/bacula13-server/Makefile  | 10 ++++++++--
 sysutils/bacula13-server/pkg-plist |  4 ++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile
index 5c7477f91d59..dd19d42526a4 100644
--- a/sysutils/bacula11-server/Makefile
+++ b/sysutils/bacula11-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	11.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -31,8 +31,9 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	MTX NLS IPV6
+OPTIONS_DEFINE?=	MTX NLS IPV6 S3
 MTX_DESC=		Install mtx for control of autochanger devices
+S3_DESC=		Install S3 plugin
 
 .if ${PKGNAMESUFFIX} == "11-server"
 OPTIONS_MULTI=		BACKEND
@@ -130,6 +131,11 @@ MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MS3}
+CONFIGURE_ARGS+=	--enable-s3
+LIB_DEPENDS+=		libs3.so:sysutils/bacula-libs3
+.endif
+
 # if IPv6 is not in the kernel, it generates many errors
 .if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
diff --git a/sysutils/bacula11-server/pkg-plist b/sysutils/bacula11-server/pkg-plist
index 363305c0b7b1..ee9a5ad31966 100644
--- a/sysutils/bacula11-server/pkg-plist
+++ b/sysutils/bacula11-server/pkg-plist
@@ -13,6 +13,10 @@ lib/libbacsd-%%LIB_VERSION%%.so
 lib/libbacsd.so
 lib/libbacsql-%%LIB_VERSION%%.so
 lib/libbacsql.so
+%%S3%%lib/bacula-sd-cloud-driver-%%LIB_VERSION%%.so
+%%S3%%lib/bacula-sd-cloud-driver.so
+%%S3%%lib/bacula-sd-cloud-s3-driver-%%LIB_VERSION%%.so
+%%S3%%lib/bacula-sd-cloud-s3-driver.so
 sbin/bacula
 sbin/bacula-dir
 sbin/bacula-sd
diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile
index 4c35f797c0da..768a0a284a12 100644
--- a/sysutils/bacula13-server/Makefile
+++ b/sysutils/bacula13-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	13.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -31,8 +31,9 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	MTX NLS IPV6
+OPTIONS_DEFINE?=	MTX NLS IPV6 S3
 MTX_DESC=		Install mtx for control of autochanger devices
+S3_DESC=		Install S3 plugin
 
 .if ${PKGNAMESUFFIX} == "13-server"
 OPTIONS_MULTI=		BACKEND
@@ -130,6 +131,11 @@ MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MS3}
+CONFIGURE_ARGS+=	--enable-s3
+LIB_DEPENDS+=		libs3.so:sysutils/bacula-libs3
+.endif
+
 # if IPv6 is not in the kernel, it generates many errors
 .if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
diff --git a/sysutils/bacula13-server/pkg-plist b/sysutils/bacula13-server/pkg-plist
index 363305c0b7b1..ee9a5ad31966 100644
--- a/sysutils/bacula13-server/pkg-plist
+++ b/sysutils/bacula13-server/pkg-plist
@@ -13,6 +13,10 @@ lib/libbacsd-%%LIB_VERSION%%.so
 lib/libbacsd.so
 lib/libbacsql-%%LIB_VERSION%%.so
 lib/libbacsql.so
+%%S3%%lib/bacula-sd-cloud-driver-%%LIB_VERSION%%.so
+%%S3%%lib/bacula-sd-cloud-driver.so
+%%S3%%lib/bacula-sd-cloud-s3-driver-%%LIB_VERSION%%.so
+%%S3%%lib/bacula-sd-cloud-s3-driver.so
 sbin/bacula
 sbin/bacula-dir
 sbin/bacula-sd