Date: Thu, 9 Feb 2017 00:09:59 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433701 - in head/shells/fish: . files Message-ID: <201702090009.v1909xQE041348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers (src committer) Date: Thu Feb 9 00:09:59 2017 New Revision: 433701 URL: https://svnweb.freebsd.org/changeset/ports/433701 Log: Fix two bugs in shells/fish 1) The build would fail when DOCS=off (PR 216167) 2) Tab completion doesn't work for "mount -t" (PR 216032) PR: 216167 PR: 216032 Reported by: Maxfx <maficccc@gmail.com> Reported by: David Guyot <david.guyot@europecamions-interactive.com> Approved by: brd (ports) Added: head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish (contents, props changed) Modified: head/shells/fish/Makefile head/shells/fish/files/extra-patch-Makefile.in Modified: head/shells/fish/Makefile ============================================================================== --- head/shells/fish/Makefile Wed Feb 8 23:46:58 2017 (r433700) +++ head/shells/fish/Makefile Thu Feb 9 00:09:59 2017 (r433701) @@ -3,6 +3,7 @@ PORTNAME= fish PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ Modified: head/shells/fish/files/extra-patch-Makefile.in ============================================================================== --- head/shells/fish/files/extra-patch-Makefile.in Wed Feb 8 23:46:58 2017 (r433700) +++ head/shells/fish/files/extra-patch-Makefile.in Thu Feb 9 00:09:59 2017 (r433701) @@ -1,21 +1,21 @@ ---- ./Makefile.in.orig 2013-10-19 22:10:26.000000000 +0200 -+++ ./Makefile.in 2014-01-25 02:35:57.000000000 +0100 -@@ -639,12 +639,12 @@ +--- Makefile.in.orig 2017-01-17 16:12:49 UTC ++++ Makefile.in +@@ -701,12 +701,12 @@ install-force: all install-translations true; \ done; - -- $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) -- for i in user_doc/html/* ChangeLog; do \ + @echo "Installing online user documentation"; +- $v $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) +- $v for i in user_doc/html/* CHANGELOG.md; do \ - if test -f $$i; then \ - $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \ - fi; \ - done; -+# $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) -+# for i in user_doc/html/* ChangeLog; do \ -+# if test -f $$i; then \ -+# $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \ -+# fi; \ -+# done; - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 - for i in $(MANUALS); do \ - $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \ ++# $v $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) ++# $v for i in user_doc/html/* CHANGELOG.md; do \ ++# if test -f $$i; then \ ++# $(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \ ++# fi; \ ++# done; + @echo "Installing more man pages"; + $v $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1; + $v for i in $(MANUALS); do \ Added: head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish Thu Feb 9 00:09:59 2017 (r433701) @@ -0,0 +1,11 @@ +--- share/functions/__fish_print_filesystems.fish.orig 2017-01-13 15:45:46 UTC ++++ share/functions/__fish_print_filesystems.fish +@@ -4,6 +4,6 @@ function __fish_print_filesystems -d "Pr + set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs + set fs $fs reiserfs romfs smbfs sysv tmpfs udf ufs umsdos vfat xenix xfs xiafs + # Mount has helper binaries to mount filesystems +- # These are called mount.* and are placed somewhere in $PATH +- printf "%s\n" $fs (string replace -ra ".*/mount." "" -- $PATH/mount.*) ++ # These are called mount_* and are placed somewhere in $PATH ++ printf "%s\n" $fs (string replace -ra ".*/mount_" "" -- $PATH/mount_*) + end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702090009.v1909xQE041348>