git: 248d8a18e48b - main - filesystems/moosefs[2,3]-*: Adjust CONFLICTS in anticipation of moosefs 4.x

The branch main has been updated by vvd:

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

commit 248d8a18e48b20e9ef28f2c0cb10c8d54811ea4b
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2026-02-12 19:23:23 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-02-12 19:23:23 +0000

    filesystems/moosefs[2,3]-*: Adjust CONFLICTS in anticipation of moosefs 4.x
    
    PR:             289966
    Approved by:    Piotr R. Konopelko (MooseFS) <piotr.konopelko@moosefs.com> (maintainer, implicit)
---
 filesystems/moosefs2-master/Makefile | 3 +++
 filesystems/moosefs3-master/Makefile | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/filesystems/moosefs2-master/Makefile b/filesystems/moosefs2-master/Makefile
index 5a032d722157..b90568e3dc21 100644
--- a/filesystems/moosefs2-master/Makefile
+++ b/filesystems/moosefs2-master/Makefile
@@ -33,6 +33,9 @@ CONFIGURE_ARGS+=	--localstatedir=${MFS_WORKDIR} \
 			--with-default-user=${MFS_USER} \
 			--with-default-group=${MFS_GROUP} \
 
+CONFLICTS=		moosefs3-* \
+			moosefs-*
+
 .if ${MFS_COMPONENT} == cgi
 MFS_CGIDIR=		${PREFIX}/share/mfscgi
 USES=			python
diff --git a/filesystems/moosefs3-master/Makefile b/filesystems/moosefs3-master/Makefile
index 301b22256f0f..3ed5bad6a40c 100644
--- a/filesystems/moosefs3-master/Makefile
+++ b/filesystems/moosefs3-master/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ARGS+=	--localstatedir=${MFS_WORKDIR} \
 			--with-default-user=${MFS_USER} \
 			--with-default-group=${MFS_GROUP}
 
-CONFLICTS=		moosefs2-${MFS_COMPONENT}
+CONFLICTS=		moosefs2-* \
+			moosefs-*
 
 .if ${MFS_COMPONENT} == cgi
 MFS_CGIDIR=		${PREFIX}/share/mfscgi