git: 589ca2f8efb7 - main - sysutils/bacula*: Amend CONFLICTS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Apr 2024 13:20:27 UTC
The branch main has been updated by dvl:
URL: https://cgit.FreeBSD.org/ports/commit/?id=589ca2f8efb79d3fb2c92c3193121c1fa6904523
commit 589ca2f8efb79d3fb2c92c3193121c1fa6904523
Author: Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2024-04-04 13:11:46 +0000
Commit: Dan Langille <dvl@FreeBSD.org>
CommitDate: 2024-04-04 13:19:47 +0000
sysutils/bacula*: Amend CONFLICTS
They were out of date:
* removed references to bacula-server (long gone)
* add bacula15
---
sysutils/bacula11-docs/Makefile | 3 ++-
sysutils/bacula11-server/Makefile | 4 ++--
sysutils/bacula13-docs/Makefile | 3 ++-
sysutils/bacula13-server/Makefile | 4 ++--
sysutils/bacula15-docs/Makefile | 3 ++-
sysutils/bacula15-server/Makefile | 4 ++--
sysutils/bacula9-docs/Makefile | 4 ++--
sysutils/bacula9-server/Makefile | 4 ++--
8 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/sysutils/bacula11-docs/Makefile b/sysutils/bacula11-docs/Makefile
index f302fc9e954d..decba1ee535c 100644
--- 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
index 8f4a2e9d636a..1e691d80c2dc 100644
--- 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
index 311d2a603f8e..cb9f84f46cfe 100644
--- 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
index bf37e2227b3b..b6c42dbef5b6 100644
--- 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
index 7ec0591db3e0..9c0b2f3df8c9 100644
--- 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
index 533cbaf219a7..6e7aec421cd7 100644
--- 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
index 9b3fdb2e5927..931f837139fd 100644
--- 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
index bdd425560500..54374793f41f 100644
--- 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