From owner-dev-commits-ports-main@freebsd.org Tue Jun 22 17:42:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A9281660C05; Tue, 22 Jun 2021 17:42:47 +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 4G8YdM4SVNz3JyC; Tue, 22 Jun 2021 17:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 811071549A; Tue, 22 Jun 2021 17:42: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 15MHglnh047617; Tue, 22 Jun 2021 17:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15MHglQD047616; Tue, 22 Jun 2021 17:42:47 GMT (envelope-from git) Date: Tue, 22 Jun 2021 17:42:47 GMT Message-Id: <202106221742.15MHglQD047616@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: c3dd3472dd49 - main - devel/git: Fix contrib installation MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3dd3472dd49bc570f01294d7f7ad73202a3c684 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jun 2021 17:42:47 -0000 The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3dd3472dd49bc570f01294d7f7ad73202a3c684 commit c3dd3472dd49bc570f01294d7f7ad73202a3c684 Author: Chris Hutchinson AuthorDate: 2021-06-22 17:38:15 +0000 Commit: Renato Botelho CommitDate: 2021-06-22 17:42:25 +0000 devel/git: Fix contrib installation In some cases installation is aborted when try to copy test.netrc.gpg, which is an empty file. This file is not actually needed so the fix here is to stop trying to install it PR: 255885 Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/git/Makefile | 1 + devel/git/pkg-plist | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 3082a5968361..80112278449c 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -251,6 +251,7 @@ post-install-SUBTREE-on: post-install-CONTRIB-on: @${ECHO_MSG} "===> Installing contributed scripts" ${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib + ${RM} ${WRKSRC}/contrib/credential/netrc/test.netrc.gpg ${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib post-install-P4-on: diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index be4df5922928..dcc1a917cefa 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -1244,7 +1244,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/credential/netrc/test.command-option-gpg %%CONTRIB%%share/git-core/contrib/credential/netrc/test.git-config-gpg %%CONTRIB%%share/git-core/contrib/credential/netrc/test.netrc -%%CONTRIB%%share/git-core/contrib/credential/netrc/test.netrc.gpg %%CONTRIB%%share/git-core/contrib/credential/netrc/test.pl %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/.gitignore %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/Makefile