From nobody Tue May 24 17:26:01 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2E8461B481AF; Tue, 24 May 2022 17:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L71Lx6vV8z3RHC; Tue, 24 May 2022 17:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653413162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcEDDp9ELUWNOY7mXYmgVWsqoxqSQnlplDCca48VUgE=; b=VmEOWkIVmnaDlR1V7fHf7QqqEpdNQd19ee1am/rfS5qzGoiNOi84Cn2lgyH7ad6lQPCjW4 HHcdTlSs0wBSPoC+pNlqmPAHMfaPn31seGaD/t9UT47+62dCF/KHfU58YVCU0cr8PsNU6U 3kz4dgaXOl5N9efLpnqoC9QijYpSB6JkJMt2SKKaa4efX8MNX6Pr1pmWeLhkPWIaQsddZ4 xn4Ts4mWd5qrgQvcRGJxkKYjgxlNORcO0OFcBrJlRxEkxcQyhMiqjXeva2pwzPcina22xJ JthtnyrJEzz7ssHKhR9EMKvkE+LrftLDrskQwjadlDFNWwa4pWSd8Jc1FzEGyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5DE5D8C; Tue, 24 May 2022 17:26:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24OHQ1KU050941; Tue, 24 May 2022 17:26:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24OHQ1nM050940; Tue, 24 May 2022 17:26:01 GMT (envelope-from git) Date: Tue, 24 May 2022 17:26:01 GMT Message-Id: <202205241726.24OHQ1nM050940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: cf33840b7fa5 - main - archivers/7-zip: provide compatibility link List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf33840b7fa53cd23fbfcdb0de81cb394bcdcfae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653413162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcEDDp9ELUWNOY7mXYmgVWsqoxqSQnlplDCca48VUgE=; b=lUMMC5QJgyKHlfcPatcYKvBWZCXvrfh8fCdPMSI1lps7J+ZOoZnIuviWxOihjBKa+AI29C mhDnUMZu6+iLkomsokud50VpVkM2cLOL+4hTvDdtmhcFAvo8unyVDoE8wXZI8MGDAdv/US ACsqPIkVXDLatrhwpB23pLT8dMWBfxy3vaxEZOx3v4mLJc/YkclfHQnCLrEfhxYDi/0MuS Gt3KttragS8c2qM/kBnnMPp+UMx89BcGFvrlgzsuDJcLJIGGi4MzPI+/UWnvBUqVLH1uWG 0knc/BC2e3GOFvOVPgeWoC3Asa8GeAsccR3EnEm3spkSDpa64aOizVf0SoMpJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653413162; a=rsa-sha256; cv=none; b=GUqbkp0szZ7yFjnqsdJftbsgQbsy1aYvpqUxuLNo1yd1YgnJVoekkNmDNb1pB8kDQQRk2l SV5jLk5BUbL5jIxn779MWZd6BGf7UqFMMLnVrMKuwAX+ELD0KZSMXRMd4g5+7080UE3hV0 njbporTBen67oiIKTksr+cozF14y02biw0QuR4y/SHZJAnWM3ONvCfvRGcWCa3mkjoyMZM NymSwVZtRdd0kVKJZZL2IfFvjzoOEpMuUyXiaoNDpZ++FM4Kf7259p5lXy9MuaQZPj8ZLo LegBwKfrSuOJKNmuwBin8JsMLWQ28DftyRul5v53saU/Y1laplorKU3mev2U+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf33840b7fa53cd23fbfcdb0de81cb394bcdcfae commit cf33840b7fa53cd23fbfcdb0de81cb394bcdcfae Author: Max Brazhnikov AuthorDate: 2022-05-24 17:25:38 +0000 Commit: Max Brazhnikov CommitDate: 2022-05-24 17:25:38 +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 --- 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: