Index: head/shells/fish/Makefile =================================================================== --- head/shells/fish/Makefile (revision 433700) +++ head/shells/fish/Makefile (revision 433701) @@ -1,50 +1,51 @@ # Created by: Kai Wang # $FreeBSD$ PORTNAME= fish PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ MAINTAINER= asomers@FreeBSD.org COMMENT= User friendly command line shell LICENSE= GPLv2 USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 localbase GNU_CONFIGURE= yes CPE_VENDOR= fishshell LDFLAGS+= -L${LOCALBASE}/lib -pthread MANDIRS= ${DATADIR}/man/man1 OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes NLS_CONFIGURE_OFF= --without-gettext DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Makefile.in post-patch: @${REINPLACE_CMD} -e \ '/^all:/s|user_doc|| ; \ s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \ s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \ s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-rdynamic|-Wl,--export-dynamic| ; \ /pthread_create/d ; \ s|ncurses curses|curses| ; \ s|ncurses.h||' ${WRKSRC}/configure.ac post-install: .for i in fish fish_indent fish_key_reader @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .include Index: head/shells/fish/files/extra-patch-Makefile.in =================================================================== --- head/shells/fish/files/extra-patch-Makefile.in (revision 433700) +++ head/shells/fish/files/extra-patch-Makefile.in (revision 433701) @@ -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 \ Index: head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish =================================================================== --- head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish (nonexistent) +++ head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish (revision 433701) @@ -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 Property changes on: head/shells/fish/files/patch-share_functions_____fish__print__filesystems.fish ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property