Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Aug 2021 02:25:08 GMT
From:      Alan Somers <asomers@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1bd69b9f3a92 - main - shells/fish: /usr/local/etc/config.fish is a config file
Message-ID:  <202108210225.17L2P88w067025@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by asomers (src committer):

URL: https://cgit.FreeBSD.org/ports/commit/?id=1bd69b9f3a92b39ca2185796b31fb6cdd7d2cfb2

commit 1bd69b9f3a92b39ca2185796b31fb6cdd7d2cfb2
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2021-08-16 20:26:51 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108210225.17L2P88w067025>