sysutils/bacula*: Amend CONFLICTS

They were out of date: * removed references to bacula-server (long gone) * add bacula15
freebsd · Apr 4, 2024 · 589ca2f · 589ca2f
1 parent c0aef5b
commit 589ca2f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	bacula
 PORTVERSION=	11.0.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	11-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula9
+CONFLICTS=	bacula15-docs bacula13-docs bacula9-docs
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Bacula document set

diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	11.0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -19,7 +19,7 @@ EXPIRATION_DATE=	2024-09-30
 USES+=		cpe libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in
 
-CONFLICTS?=	bacula-11-server bacula9-server bacula-server
+CONFLICTS?=	bacula15-server bacula13-server bacula9-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 

diff --git a/sysutils/bacula13-docs/Makefile b/sysutils/bacula13-docs/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	bacula
 PORTVERSION=	13.0.4
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	13-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula9
+CONFLICTS=	bacula15-docs bacula11-docs bacula9-docs
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Bacula document set

diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	13.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES+=		cpe libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in scripts/baculabackupreport
 
-CONFLICTS?=	bacula11-server bacula9-server bacula-server
+CONFLICTS?=	bacula15-server bacula11-server bacula9-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 

diff --git a/sysutils/bacula15-docs/Makefile b/sysutils/bacula15-docs/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	bacula
 PORTVERSION=	15.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	15-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula9
+CONFLICTS=	bacula13-docs bacula11-docs bacula9-docs
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Bacula document set

diff --git a/sysutils/bacula15-server/Makefile b/sysutils/bacula15-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 DISTVERSION=	15.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${DISTVERSION}
 PKGNAMEPREFIX?=	#
@@ -19,7 +19,7 @@ SHEBANG_FILES=	scripts/get_malware_abuse.ch scripts/key-manager.py.in \
 		scripts/md5tobase64.py src/cats/make_catalog_backup.pl.in
 #scripts/baculabackupreport.in
 
-CONFLICTS?=	bacula-server bacula13-server bacula11-server bacula9-server
+CONFLICTS?=	bacula13-server bacula11-server bacula9-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2
 

diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	bacula
 PORTVERSION=	9.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	9-docs
 DISTNAME=	${PORTNAME}-docs-${PORTVERSION}
 
-CONFLICTS=	bacula bacula11
+CONFLICTS=	bacula15-docs bacula13-docs bacula11-docs 
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Bacula document set

diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bacula
 PORTVERSION=	9.6.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES+=		cpe libtool readline shebangfix ssl
 SHEBANG_FILES=	src/cats/make_catalog_backup.pl.in
 
-CONFLICTS?=	bacula11-server bacula-server
+CONFLICTS?=	bacula15-server bacula13-server bacula11-server
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2