git: 72ec4c86d5e5 - main - sysutils/bacula11-server: Fix CONFLICTS

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dan Langille <dvl_at_FreeBSD.org>
Date: Thu, 18 Aug 2022 12:17:34 UTC

The branch main has been updated by dvl:

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

commit 72ec4c86d5e5effb26fe66688ee5e46ddba6e3f8
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2022-08-18 12:15:56 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2022-08-18 12:15:56 +0000

    sysutils/bacula11-server: Fix CONFLICTS
    
    Add sysutuls/bacula13-server to CONFLICTS
---
 sysutils/bacula11-server/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile
index 5c9fcc793cc6..641fb1f2c9aa 100644
--- a/sysutils/bacula11-server/Makefile
+++ b/sysutils/bacula11-server/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES+=		cpe libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in
 
-CONFLICTS?=	bacula9-server bacula-server
+CONFLICTS?=	bacula-11-server bacula9-server bacula-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2