git: fd9ed808cee4 - main - sysutils/bareos24-client: Remove entry from CONFLICTS

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Tue, 03 Feb 2026 06:35:59 UTC
The branch main has been updated by acm:

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

commit fd9ed808cee48d9ff43517d066e4f1b8c4b5e32a
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2026-02-03 06:35:03 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2026-02-03 06:35:51 +0000

    sysutils/bareos24-client: Remove entry from CONFLICTS
    
    - Bump PORTREVISION
---
 sysutils/bareos24-client/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysutils/bareos24-client/Makefile b/sysutils/bareos24-client/Makefile
index d79650cb9504..4590e0b90781 100644
--- a/sysutils/bareos24-client/Makefile
+++ b/sysutils/bareos24-client/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	bareos
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 PKGNAMESUFFIX=	24-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
-CONFLICTS=	bareos22-client bareos23-client bareos-client
+CONFLICTS=	bareos23-client bareos-client
 
 WITH_CLIENT_ONLY=yes
 USE_RC_SUBR=	bareos-fd