git: 05e7fb1cf5b4 - main - archivers/mscompress: set maintainership and add missing conflict

The branch main has been updated by fernape:

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

commit 05e7fb1cf5b40405c6d1361d36c507645493772d
Author:     mew14930xvi <mew14930xvi@inbox.lv>
AuthorDate: 2024-06-19 07:19:55 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2024-06-20 14:36:34 +0000

    archivers/mscompress: set maintainership and add missing conflict
    
    Submitter is maintainer of several ports.
    
    PR:             279721
    Reported by:    mew14930xvi@inbox.lv
---
 archivers/mscompress/Makefile | 3 ++-
 print/foo2zjs/Makefile        | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 56cf79b3391d..d67fcd78cf0e 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	mscompress
 DISTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	archivers
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	Microsoft "compress.exe/expand.exe" compatible (de)compressor
 WWW=		https://github.com/stapelberg/mscompress
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index e9ce587c1a55..5a495f3395da 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -27,6 +27,8 @@ SHEBANG_FILES=	msexpand printer-profile.sh
 
 MAKE_JOBS_UNSAFE=	yes
 
+CONFLICTS_INSTALL=	mscompress # bin/msexpand
+
 SUB_FILES=	${_DEVDCONF_FILE} pkg-message
 
 OPTIONS_DEFINE=	DOCS