Index: head/shells/fish/Makefile
===================================================================
--- head/shells/fish/Makefile	(revision 433835)
+++ head/shells/fish/Makefile	(revision 433836)
@@ -1,51 +1,49 @@
 # Created by: Kai Wang <kaiw27@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	fish
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 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 <bsd.port.mk>
Index: head/shells/fish/files/extra-patch-Makefile.in
===================================================================
--- head/shells/fish/files/extra-patch-Makefile.in	(revision 433835)
+++ head/shells/fish/files/extra-patch-Makefile.in	(nonexistent)
@@ -1,21 +0,0 @@
---- Makefile.in.orig	2017-01-17 16:12:49 UTC
-+++ Makefile.in
-@@ -701,12 +701,12 @@ install-force: all install-translations 
- 		true; \
- 	done;
- 	@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;
-+#         $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 \

Property changes on: head/shells/fish/files/extra-patch-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/shells/fish/files/patch-share_completions_python.fish
===================================================================
--- head/shells/fish/files/patch-share_completions_python.fish	(nonexistent)
+++ head/shells/fish/files/patch-share_completions_python.fish	(revision 433836)
@@ -0,0 +1,18 @@
+--- share/completions/python.fish.orig	2017-02-11 04:56:23 UTC
++++ share/completions/python.fish
+@@ -16,15 +16,3 @@ complete -c python -s W -x --description
+ complete -c python -s x -d 'Skip first line of source, allowing use of non-Unix forms of #!cmd'
+ complete -c python -a "(__fish_complete_suffix .py)"
+ complete -c python -a '-' -d 'Read program from stdin'
+-
+-switch (python -V 2>&1 | string replace -r '^.*\s([23])..*' '$1')[1]
+-    case 2
+-        complete -c python -s 3 -d 'Warn about Python 3.x incompatibilities that 2to3 cannot trivially fix'
+-        complete -c python -s t --description "Warn on mixed tabs and spaces"
+-        complete -c python -s Q -x -a "old new warn warnall" --description "Division control"
+-    case 3
+-        complete -c python -s q --description 'Don\'t print version and copyright messages on interactive startup'
+-        complete -c python -s X -x -d 'Set implementation-specific option'
+-        complete -c python -s b  -d 'Issue warnings about str(bytes_instance), str(bytearray_instance) and comparing bytes/bytearray with str'
+-        complete -c python -o bb -d 'Issue errors'
+-end

Property changes on: head/shells/fish/files/patch-share_completions_python.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