git: 3047aa84f6ed - 2022Q2 - archivers/7-zip: provide compatibility link

The branch 2022Q2 has been updated by makc:

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

commit 3047aa84f6ed9b173757feca134071c6dbc90710
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-05-24 17:25:38 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2022-05-25 08:30:33 +0000

    archivers/7-zip: provide compatibility link
    
    - Provide 7z as a link to 7zz binary and mark conflict with p7zip
    - Do not copy license file along with docs
    
    (cherry picked from commit cf33840b7fa53cd23fbfcdb0de81cb394bcdcfae)
---
 archivers/7-zip/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/archivers/7-zip/Makefile b/archivers/7-zip/Makefile
index eeccb82cee65..3100f5b34142 100644
--- a/archivers/7-zip/Makefile
+++ b/archivers/7-zip/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	7-zip
 DISTVERSION=	21.07
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	https://www.7-zip.org/a/
 DISTNAME=	7z${DISTVERSION:S/.//}-src
@@ -8,6 +8,8 @@ DISTNAME=	7z${DISTVERSION:S/.//}-src
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Console version of the 7-Zip file archiver
 
+CONFLICTS_INSTALL=	p7zip
+
 LICENSE=	BSD3CLAUSE LGPL21+ UNRAR
 LICENSE_COMB=	multi
 LICENSE_NAME_UNRAR=	unRAR license
@@ -39,9 +41,10 @@ DOS2UNIX_FILES=	C/CpuArch.c \
 		CPP/7zip/var_gcc.mak \
 		CPP/Windows/SystemInfo.cpp
 
-PLIST_FILES=	bin/7zz \
+PLIST_FILES=	bin/7z \
+		bin/7zz \
 		share/man/man1/7zz.1.gz
-PORTDOCS=	7zC.txt 7zFormat.txt License.txt Methods.txt \
+PORTDOCS=	7zC.txt 7zFormat.txt Methods.txt \
 		lzma.txt readme.txt src-history.txt
 
 OPTIONS_DEFINE=	DOCS
@@ -51,6 +54,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/b/c/7zz ${STAGEDIR}/${PREFIX}/bin
+	${LN} -sf 7zz ${STAGEDIR}/${PREFIX}/bin/7z
 	${INSTALL_MAN} ${FILESDIR}/7zz.1 ${STAGEDIR}/${PREFIX}/share/man/man1
 
 do-install-DOCS-on: