From nobody Wed May 25 08:33:47 2022 X-Original-To: dev-commits-ports-all@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 0D8DA1B4858A; Wed, 25 May 2022 08:33:48 +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 4L7PVM4BPwz3vwF; Wed, 25 May 2022 08:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653467627; 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=03OWsB1enfj3YjQjEOmGdkEKarr12p9FgmQYqCcL5tQ=; b=bZjO64OK6qtc0XabxRAAByS664Z2DCLKmwKoBT5QnEcDfYpYiGB9vwH4+HLTIm1DpdyKVb GopNN3q497YGKUGDLvHyrYsCV7zISh89A4nK0io/swvNGMHNfLmelzV8m6A3B2pLY2KPNb hpEjSlUJMk/Y2n5nCqAC4fUG8lVkGSuQsjfPHwCH+UdsKBekhnPSqwCqI7HM4rDM5VbYot /+bMX4kWH4BPa9Yjkl0OFaosbge3OwpmyLIR5R+d9l9nQC+CDF3+SIAHFb6d1sjcvQWmiG 9xnD6gsmApRs9t1HznI5jkrrPUpRYSFhhtOKkfA98dF2ev4ZppAb9Q/GXzh8WQ== 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 6CAE815FBA; Wed, 25 May 2022 08:33:47 +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 24P8XlsV080482; Wed, 25 May 2022 08:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24P8XlUW080481; Wed, 25 May 2022 08:33:47 GMT (envelope-from git) Date: Wed, 25 May 2022 08:33:47 GMT Message-Id: <202205250833.24P8XlUW080481@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Max Brazhnikov Subject: git: 3047aa84f6ed - 2022Q2 - archivers/7-zip: provide compatibility link List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 3047aa84f6ed9b173757feca134071c6dbc90710 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653467627; 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=03OWsB1enfj3YjQjEOmGdkEKarr12p9FgmQYqCcL5tQ=; b=cN8TUxGfwqdma2DqI0APebWqY4PIzYSu6GYv6L3M6Ax7tFBm1kRZRldJw9UMvJuWVcpZKd m7s75vpaBcms0Z90rAY2Sx5mcXQPTFS5PUOfbzbEUCv4sh3TGe45BtinmPi0NbR3f7Bvh3 EfMHTrOkNmpJ7RnhqkkYNmLETmD/T76H9PW313UwFtNiJCOXocC6qb0pQgpJWFMSEXlkP0 eBXlQbzUMtIvDtWkrLN0JToJe1nEenHWB1L0DlaslQXf3xOcSV2XhnJhZyEJtkyIX83YTO D3t1unPBCAUTWg/uXJHk9GW3nosIPqSRrigRZ87qKBZ877ipsqzffbPyAVH0ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653467627; a=rsa-sha256; cv=none; b=QSj98n74iKlJ6Amsk72RbxS8wnXws/sgVZ+A28tea+elGsC3jH8V8gdNrEdVByPgJLLIgJ IsFm29hqwc9nVcCTHr7ND8/DoPZFykOc2BP34w9d+XVVhQK9ntTP0PGWji9rFoJx/AKo9u GMfkE5BgiIF9FOjZTZAOF5MhK3TQOq29LUNMsmWPRqk2v7pHUkX2tha5BtpPn5A85yaR8Q 4CZz1LUh68WavP0LdLZfliwaZVoMYVaL4CsFjdQNQkXrPcQu26O/bGKbCFmsb4yXaoq/Wl k0Lify5NrAYLexdKQbBXyBpN7WOEHaO04ldhpfu55Q8VMFe0OhqMt/2jFeNnoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=3047aa84f6ed9b173757feca134071c6dbc90710 commit 3047aa84f6ed9b173757feca134071c6dbc90710 Author: Max Brazhnikov AuthorDate: 2022-05-24 17:25:38 +0000 Commit: Max Brazhnikov 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: