From owner-dev-commits-ports-all@freebsd.org Sat Aug 21 02:25:09 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 3AA9E66AF51; Sat, 21 Aug 2021 02:25:09 +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 4Gs2Qs0vMKz4gwN; Sat, 21 Aug 2021 02:25:09 +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 0719C24DA1; Sat, 21 Aug 2021 02:25:09 +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 17L2P8NE067026; Sat, 21 Aug 2021 02:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17L2P88w067025; Sat, 21 Aug 2021 02:25:08 GMT (envelope-from git) Date: Sat, 21 Aug 2021 02:25:08 GMT Message-Id: <202108210225.17L2P88w067025@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alan Somers Subject: git: 1bd69b9f3a92 - main - shells/fish: /usr/local/etc/config.fish is a config file MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bd69b9f3a92b39ca2185796b31fb6cdd7d2cfb2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Aug 2021 02:25:09 -0000 The branch main has been updated by asomers (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=1bd69b9f3a92b39ca2185796b31fb6cdd7d2cfb2 commit 1bd69b9f3a92b39ca2185796b31fb6cdd7d2cfb2 Author: Alan Somers AuthorDate: 2021-08-16 20:26:51 +0000 Commit: Alan Somers CommitDate: 2021-08-21 02:24:49 +0000 shells/fish: /usr/local/etc/config.fish is a config file Mark it as @sample Approved by: lcook (ports) Reviewed by: lcook Differential Revision: https://reviews.freebsd.org/D31571 --- shells/fish/Makefile | 2 ++ shells/fish/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 2adf0855ba41..4421ae3771f0 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -2,6 +2,7 @@ PORTNAME= fish DISTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/ @@ -51,6 +52,7 @@ post-install: .for i in fish fish_indent fish_key_reader @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor + @${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample post-stage-DOCS-on: @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist index 9d903b35fe82..04eab0996b7e 100644 --- a/shells/fish/pkg-plist +++ b/shells/fish/pkg-plist @@ -3,7 +3,7 @@ bin/fish_indent bin/fish_key_reader share/applications/fish.desktop share/pixmaps/fish.png -%%ETCDIR%%/config.fish +@sample %%ETCDIR%%/config.fish.sample libdata/pkgconfig/fish.pc %%MANPAGES%%man/man1/fish.1.gz %%MANPAGES%%man/man1/fish_indent.1.gz