- Update to 2.0.0

PR:		178868
Submitted by:	Ports Fury

6 files changed, 262 insertions, 194 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index 4a76c5d90fc2..5a1afd312fe9 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,71 +2,60 @@
 # $FreeBSD$
 
 PORTNAME=	fish
-PORTVERSION=	1.23.1
-PORTREVISION=	9
+PORTVERSION=	2.0.0
 CATEGORIES=	shells
-MASTER_SITES=	SF
+MASTER_SITES=	http://fishshell.com/files/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A user friendly command line shell
+COMMENT=	User friendly command line shell
 
-USE_AUTOTOOLS=	autoconf
+OPTIONS_DEFINE=	DOCS NLS
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USES=		iconv
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf
+CONFIGURE_ARGS=	--docdir=${WRKDIR}/tmproot
+MAKE_JOBS_SAFE=	yes
 
-USES=		gettext iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LIBS="${LDFLAGS}"
-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
-OPTIONS_DEFINE=	XSEL DOXYGEN
-OPTIONS_DEFAULT=	XSEL DOXYGEN
-XSEL_DESC=	Build with xsel
+MAN1=		fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1
 
 .include <bsd.port.options.mk>
 
-MAN1=		alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
-		break.1 breakpoint.1 builtin.1 case.1 cd.1 \
-		command.1 commandline.1 complete.1 contains.1 \
-		continue.1 count.1 dirh.1 dirs.1  else.1 \
-		emit.1 end.1 eval.1 exec.1 exit.1 fg.1 fish.1 \
-		fish_indent.1 fish_pager.1 fish_prompt.1 \
-		fishd.1 for.1 funced.1 funcsave.1 function.1 \
-		functions.1 help.1 if.1 isatty.1 jobs.1 math.1 \
-		mimedb.1 nextd.1 not.1 open.1 or.1 popd.1 \
-		prevd.1 psub.1 pushd.1 random.1 read.1 return.1 \
-		set.1 set_color.1 source.1 status.1 switch.1 \
-		trap.1 type.1 ulimit.1 umask.1 vared.1 while.1
-
-# Don't use the bundled xsel
-CONFIGURE_ARGS+=	--without-xsel
-
-.if ${PORT_OPTIONS:MXSEL}
-RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
-.endif
-
-.if ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-.endif
-
-.if ${OSVERSION} > 900008
-# already in base system
-PLIST_SUB+=	SEQ="@comment "
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+CONFIGURE_ENV+=	ac_cv_func_gettext=yes
+PLIST_SUB+=	NLS=""
 .else
-PLIST_SUB+=	SEQ=""
+CONFIGURE_ARGS+=--without-gettext
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-.if ! ${PORT_OPTIONS:MDOCS} || ! ${PORT_OPTIONS:MDOXYGEN}
-	@${REINPLACE_CMD} -e 's|$(PROGRAMS) user_doc|$(PROGRAMS)|' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in
-.endif
+	@${REINPLACE_CMD} -e \
+		'/^all:/s|user_doc|| ; \
+		 s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \
+		 s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \
+		 /fish\/man\/man1/d' ${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:
-	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
-	${RM} -rf ${DATADIR}/man
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
+.endif
+.for i in fish fish_indent fish_pager fishd mimedb
+	@${STRIP_CMD} ${PREFIX}/bin/${i}
+.endfor
 	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
 		${TRUE}; \
 	else \
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index bbe9d60c17ba..7f2fd75d289d 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fish-1.23.1.tar.gz) = a7f2890b0112d57b4760975f3d8f8c7e0cd240edcb2b3a87b5d66744a8deaf64
-SIZE (fish-1.23.1.tar.gz) = 1152997
+SHA256 (fish-2.0.0.tar.gz) = 7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303
+SIZE (fish-2.0.0.tar.gz) = 1540652
diff --git a/shells/fish/files/patch-configure.ac b/shells/fish/files/patch-configure.ac
deleted file mode 100644
index e7441feaccb5..000000000000
--- a/shells/fish/files/patch-configure.ac
+++ /dev/null
@@ -1,118 +0,0 @@
---- configure.ac.orig	2009-03-08 07:46:47.000000000 -0700
-+++ configure.ac	2009-09-18 21:28:07.000000000 -0700
-@@ -451,20 +451,6 @@
- 
- 
- #
--# Set up the directory where the documentation files should be
--# installed
--#
--
--AC_ARG_VAR( [docdir], [Documentation direcotry] )
--
--if test -z $docdir; then
--	docdir=$datadir/doc/fish
--else
--	docdir=$docdir
--fi
--
--
--#
- # Set up locale directory. This is where the .po files will be
- # installed.
- #
-@@ -500,94 +486,19 @@
- #
- 
- # Check for os dependant libraries for all binaries.
--LIBS_COMMON=$LIBS
--LIBS=""
- AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
- AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
- AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
- AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
--LIBS_SHARED=$LIBS
--LIBS=$LIBS_COMMON
- 
- #
- # Check for libraries needed by fish. 
- #
- 
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
- if test x$local_gettext != xno; then 
- 	AC_SEARCH_LIBS( gettext, intl,,)
- fi
- 
--# Check for libiconv_open if we can't find iconv_open. Silly OS X does
--# weird macro magic for the sole purpose of amusing me.
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] )
--
--LIBS_FISH=$LIBS
--LIBS=$LIBS_COMMON
--
--#
--# Check for libraries needed by fish_indent. 
--#
--
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
--if test x$local_gettext != xno; then 
--	AC_SEARCH_LIBS( gettext, intl,,)
--fi
--LIBS_FISH_INDENT=$LIBS
--LIBS=$LIBS_COMMON
--
--#
--# Check for libraries needed by fish_pager. 
--#
--
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
--if test x$local_gettext != xno; then 
--	AC_SEARCH_LIBS( gettext, intl,,)
--fi
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
--LIBS_FISH_PAGER=$LIBS
--LIBS=$LIBS_COMMON
--
--#
--# Check for libraries needed by fishd. 
--#
--
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
--if test x$local_gettext != xno; then 
--	AC_SEARCH_LIBS( gettext, intl,,)
--fi
--AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
--LIBS_FISHD=$LIBS
--LIBS=$LIBS_COMMON
--
--#
--# Check for libraries needed by mimedb. 
--#
--
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
--if test x$local_gettext != xno; then 
--	AC_SEARCH_LIBS( gettext, intl,,)
--fi
--LIBS_MIMEDB=$LIBS
--LIBS=$LIBS_COMMON
--
--
--#
--# Check for libraries needed by set_color 
--#
--
--LIBS_COMMON=$LIBS
--LIBS="$LIBS_SHARED"
--if test x$local_gettext != xno; then 
--	AC_SEARCH_LIBS( gettext, intl,,)
--fi
--LIBS_SET_COLOR=$LIBS
--LIBS=$LIBS_COMMON
- 
- #
- # Check presense of various header files
diff --git a/shells/fish/files/patch-util.c b/shells/fish/files/patch-util.c
deleted file mode 100644
index 8e7150165042..000000000000
--- a/shells/fish/files/patch-util.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
---- util.c.orig	2010-01-13 06:44:46.000000000 -0800
-+++ util.c	2010-01-13 06:46:39.000000000 -0800
-@@ -320,7 +320,7 @@
- {
- 	int pos;
- 	
--	if( (float)(h->count+1)/h->size > 0.75f )
-+	if( (float)(h->count+1) > 0.75f * h->size )
- 	{
- 		if( !hash_realloc( h, (h->size+1) * 2 -1 ) )
- 		{
-
-
diff --git a/shells/fish/pkg-descr b/shells/fish/pkg-descr
index bf114b0ca1e1..ca1b7d987af0 100644
--- a/shells/fish/pkg-descr
+++ b/shells/fish/pkg-descr
@@ -1,4 +1,4 @@
 fish is a user friendly commandline shell intended mostly for
 interactive use.
 
-WWW: http://www.fishshell.org/
+WWW: http://fishshell.com/
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
index 6a51c6e23386..24b9de67f80d 100644
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -2,14 +2,11 @@ bin/fish
 bin/fish_indent
 bin/fish_pager
 bin/fishd
-%%SEQ%%bin/seq
 bin/mimedb
-bin/set_color
 %%ETCDIR%%/config.fish
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/commands.html
 %%PORTDOCS%%%%DOCSDIR%%/design.html
-%%PORTDOCS%%%%DOCSDIR%%/doc_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/doc_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
@@ -21,10 +18,20 @@ bin/set_color
 %%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
+%%DATADIR%%/completions/abook.fish
+%%DATADIR%%/completions/acat.fish
+%%DATADIR%%/completions/accept.fish
+%%DATADIR%%/completions/ack.fish
 %%DATADIR%%/completions/acpi.fish
 %%DATADIR%%/completions/adduser.fish
+%%DATADIR%%/completions/adiff.fish
+%%DATADIR%%/completions/als.fish
+%%DATADIR%%/completions/amixer.fish
+%%DATADIR%%/completions/anamnesis.fish
 %%DATADIR%%/completions/and.fish
+%%DATADIR%%/completions/animate.fish
 %%DATADIR%%/completions/ant.fish
+%%DATADIR%%/completions/apack.fish
 %%DATADIR%%/completions/apm.fish
 %%DATADIR%%/completions/apropos.fish
 %%DATADIR%%/completions/apt-build.fish
@@ -50,11 +57,14 @@ bin/set_color
 %%DATADIR%%/completions/apt-zip-inst.fish
 %%DATADIR%%/completions/apt-zip-list.fish
 %%DATADIR%%/completions/aptitude.fish
+%%DATADIR%%/completions/arepack.fish
 %%DATADIR%%/completions/arp.fish
 %%DATADIR%%/completions/at.fish
 %%DATADIR%%/completions/atd.fish
+%%DATADIR%%/completions/atool.fish
 %%DATADIR%%/completions/atq.fish
 %%DATADIR%%/completions/atrm.fish
+%%DATADIR%%/completions/aunpack.fish
 %%DATADIR%%/completions/awk.fish
 %%DATADIR%%/completions/badblocks.fish
 %%DATADIR%%/completions/bc.fish
@@ -63,6 +73,7 @@ bin/set_color
 %%DATADIR%%/completions/bison.fish
 %%DATADIR%%/completions/block.fish
 %%DATADIR%%/completions/break.fish
+%%DATADIR%%/completions/brew.fish
 %%DATADIR%%/completions/btdownloadcurses.py.fish
 %%DATADIR%%/completions/btdownloadheadless.py.fish
 %%DATADIR%%/completions/builtin.fish
@@ -70,6 +81,10 @@ bin/set_color
 %%DATADIR%%/completions/bzcat.fish
 %%DATADIR%%/completions/bzip2.fish
 %%DATADIR%%/completions/bzip2recover.fish
+%%DATADIR%%/completions/bzr.fish
+%%DATADIR%%/completions/cabal-dev.fish
+%%DATADIR%%/completions/cabal.fish
+%%DATADIR%%/completions/cancel.fish
 %%DATADIR%%/completions/case.fish
 %%DATADIR%%/completions/cat.fish
 %%DATADIR%%/completions/cd.fish
@@ -78,26 +93,48 @@ bin/set_color
 %%DATADIR%%/completions/chmod.fish
 %%DATADIR%%/completions/chown.fish
 %%DATADIR%%/completions/chsh.fish
+%%DATADIR%%/completions/colordiff.fish
+%%DATADIR%%/completions/colorsvn.fish
+%%DATADIR%%/completions/combine.fish
 %%DATADIR%%/completions/command.fish
 %%DATADIR%%/completions/commandline.fish
+%%DATADIR%%/completions/compare.fish
 %%DATADIR%%/completions/complete.fish
+%%DATADIR%%/completions/composite.fish
 %%DATADIR%%/completions/configure.fish
+%%DATADIR%%/completions/conjure.fish
 %%DATADIR%%/completions/continue.fish
+%%DATADIR%%/completions/convert.fish
+%%DATADIR%%/completions/cower.fish
 %%DATADIR%%/completions/cowsay.fish
 %%DATADIR%%/completions/cowthink.fish
 %%DATADIR%%/completions/cp.fish
+%%DATADIR%%/completions/cupsaccept.fish
+%%DATADIR%%/completions/cupsdisable.fish
+%%DATADIR%%/completions/cupsenable.fish
+%%DATADIR%%/completions/cupsreject.fish
 %%DATADIR%%/completions/cut.fish
 %%DATADIR%%/completions/cvs.fish
 %%DATADIR%%/completions/darcs.fish
 %%DATADIR%%/completions/date.fish
 %%DATADIR%%/completions/dcop.fish
+%%DATADIR%%/completions/dd.fish
 %%DATADIR%%/completions/df.fish
 %%DATADIR%%/completions/diff.fish
+%%DATADIR%%/completions/display.fish
+%%DATADIR%%/completions/djview.fish
+%%DATADIR%%/completions/djview3.fish
+%%DATADIR%%/completions/djview4.fish
+%%DATADIR%%/completions/dlocate.fish
+%%DATADIR%%/completions/dmesg.fish
+%%DATADIR%%/completions/dpkg.fish
 %%DATADIR%%/completions/du.fish
+%%DATADIR%%/completions/duply.fish
 %%DATADIR%%/completions/dvipdf.fish
 %%DATADIR%%/completions/dvipdfm.fish
 %%DATADIR%%/completions/echo.fish
 %%DATADIR%%/completions/effectv.fish
+%%DATADIR%%/completions/egrep.fish
 %%DATADIR%%/completions/eix-sync.fish
 %%DATADIR%%/completions/eix.fish
 %%DATADIR%%/completions/elatex.fish
@@ -110,71 +147,137 @@ bin/set_color
 %%DATADIR%%/completions/evince.fish
 %%DATADIR%%/completions/exec.fish
 %%DATADIR%%/completions/exit.fish
+%%DATADIR%%/completions/expand.fish
 %%DATADIR%%/completions/fg.fish
+%%DATADIR%%/completions/fgrep.fish
 %%DATADIR%%/completions/file.fish
 %%DATADIR%%/completions/find.fish
 %%DATADIR%%/completions/fish.fish
 %%DATADIR%%/completions/fish_indent.fish
 %%DATADIR%%/completions/flac.fish
+%%DATADIR%%/completions/fluxbox-remote.fish
+%%DATADIR%%/completions/ftp.fish
+%%DATADIR%%/completions/funced.fish
+%%DATADIR%%/completions/funcsave.fish
 %%DATADIR%%/completions/function.fish
 %%DATADIR%%/completions/functions.fish
+%%DATADIR%%/completions/fuser.fish
 %%DATADIR%%/completions/fusermount.fish
 %%DATADIR%%/completions/gcc.fish
 %%DATADIR%%/completions/gdb.fish
 %%DATADIR%%/completions/gem.fish
 %%DATADIR%%/completions/git.fish
+%%DATADIR%%/completions/go.fish
+%%DATADIR%%/completions/gpasswd.fish
 %%DATADIR%%/completions/gpg.fish
+%%DATADIR%%/completions/gphoto2.fish
 %%DATADIR%%/completions/gprof.fish
 %%DATADIR%%/completions/grep.fish
 %%DATADIR%%/completions/groupadd.fish
 %%DATADIR%%/completions/gunzip.fish
+%%DATADIR%%/completions/gv.fish
+%%DATADIR%%/completions/gvim.fish
+%%DATADIR%%/completions/gvimdiff.fish
 %%DATADIR%%/completions/gzip.fish
 %%DATADIR%%/completions/help.fish
 %%DATADIR%%/completions/hg.fish
+%%DATADIR%%/completions/highlight.fish
+%%DATADIR%%/completions/history.fish
+%%DATADIR%%/completions/htop.fish
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
+%%DATADIR%%/completions/identify.fish
 %%DATADIR%%/completions/ifconfig.fish
+%%DATADIR%%/completions/ifdata.fish
+%%DATADIR%%/completions/ifdown.fish
+%%DATADIR%%/completions/ifup.fish
+%%DATADIR%%/completions/import.fish
 %%DATADIR%%/completions/invoke-rc.d.fish
 %%DATADIR%%/completions/jobs.fish
 %%DATADIR%%/completions/kill.fish
+%%DATADIR%%/completions/killall.fish
 %%DATADIR%%/completions/la.fish
 %%DATADIR%%/completions/latex.fish
+%%DATADIR%%/completions/latexmk.fish
+%%DATADIR%%/completions/lein.fish
 %%DATADIR%%/completions/less.fish
 %%DATADIR%%/completions/ll.fish
+%%DATADIR%%/completions/ln.fish
 %%DATADIR%%/completions/locate.fish
+%%DATADIR%%/completions/logkeys.fish
+%%DATADIR%%/completions/lp.fish
+%%DATADIR%%/completions/lpadmin.fish
+%%DATADIR%%/completions/lpinfo.fish
+%%DATADIR%%/completions/lpmove.fish
+%%DATADIR%%/completions/lpoptions.fish
+%%DATADIR%%/completions/lppasswd.fish
+%%DATADIR%%/completions/lpq.fish
+%%DATADIR%%/completions/lpr.fish
+%%DATADIR%%/completions/lprm.fish
+%%DATADIR%%/completions/lpstat.fish
 %%DATADIR%%/completions/ls.fish
+%%DATADIR%%/completions/lsblk.fish
+%%DATADIR%%/completions/lsof.fish
+%%DATADIR%%/completions/lua.fish
+%%DATADIR%%/completions/lualatex.fish
+%%DATADIR%%/completions/lxpanel.fish
 %%DATADIR%%/completions/m4.fish
 %%DATADIR%%/completions/make.fish
 %%DATADIR%%/completions/makedepend.fish
 %%DATADIR%%/completions/makepkg.fish
 %%DATADIR%%/completions/man.fish
+%%DATADIR%%/completions/mc.fish
+%%DATADIR%%/completions/md5sum.fish
 %%DATADIR%%/completions/mimedb.fish
+%%DATADIR%%/completions/mktemp.fish
+%%DATADIR%%/completions/mocp.fish
 %%DATADIR%%/completions/modprobe.fish
+%%DATADIR%%/completions/mogrify.fish
+%%DATADIR%%/completions/montage.fish
+%%DATADIR%%/completions/mosh.fish
 %%DATADIR%%/completions/mount.fish
 %%DATADIR%%/completions/mplayer.fish
 %%DATADIR%%/completions/msgfmt.fish
+%%DATADIR%%/completions/mupdf.fish
 %%DATADIR%%/completions/mutt.fish
 %%DATADIR%%/completions/mv.fish
+%%DATADIR%%/completions/namei.fish
+%%DATADIR%%/completions/ncdu.fish
 %%DATADIR%%/completions/netcat.fish
 %%DATADIR%%/completions/nextd.fish
 %%DATADIR%%/completions/nice.fish
+%%DATADIR%%/completions/nl.fish
+%%DATADIR%%/completions/nm.fish
+%%DATADIR%%/completions/nmcli.fish
 %%DATADIR%%/completions/not.fish
 %%DATADIR%%/completions/oggenc.fish
 %%DATADIR%%/completions/omega.fish
 %%DATADIR%%/completions/or.fish
+%%DATADIR%%/completions/pacman-color.fish
+%%DATADIR%%/completions/pacman-key.fish
 %%DATADIR%%/completions/pacman.fish
+%%DATADIR%%/completions/pacmatic.fish
+%%DATADIR%%/completions/pactree.fish
 %%DATADIR%%/completions/patch.fish
+%%DATADIR%%/completions/pbget.fish
 %%DATADIR%%/completions/pdfelatex.fish
 %%DATADIR%%/completions/pdfetex.fish
 %%DATADIR%%/completions/pdflatex.fish
 %%DATADIR%%/completions/pdftex.fish
 %%DATADIR%%/completions/perl.fish
+%%DATADIR%%/completions/pftp.fish
+%%DATADIR%%/completions/pgrep.fish
 %%DATADIR%%/completions/pine.fish
 %%DATADIR%%/completions/ping.fish
+%%DATADIR%%/completions/pinky.fish
 %%DATADIR%%/completions/pkgadd.fish
+%%DATADIR%%/completions/pkgfile.fish
 %%DATADIR%%/completions/pkginfo.fish
 %%DATADIR%%/completions/pkgmk.fish
 %%DATADIR%%/completions/pkgrm.fish
+%%DATADIR%%/completions/pkill.fish
+%%DATADIR%%/completions/poff.fish
+%%DATADIR%%/completions/pon.fish
 %%DATADIR%%/completions/ports.fish
 %%DATADIR%%/completions/prevd.fish
 %%DATADIR%%/completions/prt-get.fish
@@ -182,46 +285,76 @@ bin/set_color
 %%DATADIR%%/completions/ps2pdf.fish
 %%DATADIR%%/completions/psub.fish
 %%DATADIR%%/completions/pushd.fish
+%%DATADIR%%/completions/pydf.fish
 %%DATADIR%%/completions/python.fish
+%%DATADIR%%/completions/python2.fish
+%%DATADIR%%/completions/python3.fish
 %%DATADIR%%/completions/quilt.fish
 %%DATADIR%%/completions/random.fish
+%%DATADIR%%/completions/rbenv.fish
+%%DATADIR%%/completions/rc.d.fish
 %%DATADIR%%/completions/read.fish
+%%DATADIR%%/completions/readlink.fish
+%%DATADIR%%/completions/realpath.fish
+%%DATADIR%%/completions/reject.fish
 %%DATADIR%%/completions/rejmerge.fish
 %%DATADIR%%/completions/renice.fish
 %%DATADIR%%/completions/return.fish
+%%DATADIR%%/completions/rfkill.fish
+%%DATADIR%%/completions/rgrep.fish
 %%DATADIR%%/completions/rm.fish
 %%DATADIR%%/completions/rmdir.fish
+%%DATADIR%%/completions/root.fish
 %%DATADIR%%/completions/rpm.fish
 %%DATADIR%%/completions/rsync.fish
+%%DATADIR%%/completions/ruby-build.fish
 %%DATADIR%%/completions/ruby.fish
+%%DATADIR%%/completions/scanimage.fish
 %%DATADIR%%/completions/scons.fish
 %%DATADIR%%/completions/scp.fish
 %%DATADIR%%/completions/screen.fish
+%%DATADIR%%/completions/scrot.fish
 %%DATADIR%%/completions/sed.fish
+%%DATADIR%%/completions/seq.fish
 %%DATADIR%%/completions/service.fish
 %%DATADIR%%/completions/set.fish
 %%DATADIR%%/completions/set_color.fish
+%%DATADIR%%/completions/setxkbmap.fish
+%%DATADIR%%/completions/sha1sum.fish
+%%DATADIR%%/completions/sha224sum.fish
+%%DATADIR%%/completions/sha256sum.fish
+%%DATADIR%%/completions/sha384sum.fish
+%%DATADIR%%/completions/sha512sum.fish
 %%DATADIR%%/completions/sort.fish
 %%DATADIR%%/completions/ssh.fish
 %%DATADIR%%/completions/sshfs.fish
+%%DATADIR%%/completions/stat.fish
 %%DATADIR%%/completions/status.fish
+%%DATADIR%%/completions/stream.fish
 %%DATADIR%%/completions/su.fish
 %%DATADIR%%/completions/sudo.fish
 %%DATADIR%%/completions/svn.fish
 %%DATADIR%%/completions/sylpheed.fish
+%%DATADIR%%/completions/tail.fish
 %%DATADIR%%/completions/tar.fish
+%%DATADIR%%/completions/tee.fish
 %%DATADIR%%/completions/telnet.fish
 %%DATADIR%%/completions/test.fish
 %%DATADIR%%/completions/tex.fish
 %%DATADIR%%/completions/time.fish
+%%DATADIR%%/completions/timeout.fish
+%%DATADIR%%/completions/tmux.fish
 %%DATADIR%%/completions/top.fish
 %%DATADIR%%/completions/totem.fish
 %%DATADIR%%/completions/touch.fish
+%%DATADIR%%/completions/tr.fish
 %%DATADIR%%/completions/trap.fish
+%%DATADIR%%/completions/tree.fish
 %%DATADIR%%/completions/type.fish
 %%DATADIR%%/completions/ulimit.fish
 %%DATADIR%%/completions/umount.fish
 %%DATADIR%%/completions/uname.fish
+%%DATADIR%%/completions/unexpand.fish
 %%DATADIR%%/completions/uniq.fish
 %%DATADIR%%/completions/unrar.fish
 %%DATADIR%%/completions/update-eix-remote.fish
@@ -231,22 +364,34 @@ bin/set_color
 %%DATADIR%%/completions/vared.fish
 %%DATADIR%%/completions/vi.fish
 %%DATADIR%%/completions/vim.fish
+%%DATADIR%%/completions/vimdiff.fish
 %%DATADIR%%/completions/w.fish
 %%DATADIR%%/completions/wajig.fish
+%%DATADIR%%/completions/watch.fish
 %%DATADIR%%/completions/wc.fish
 %%DATADIR%%/completions/wesnoth.fish
 %%DATADIR%%/completions/wget.fish
 %%DATADIR%%/completions/whatis.fish
 %%DATADIR%%/completions/which.fish
 %%DATADIR%%/completions/who.fish
+%%DATADIR%%/completions/wicd-cli.fish
+%%DATADIR%%/completions/wicd-client.fish
+%%DATADIR%%/completions/wicd-gtk.fish
 %%DATADIR%%/completions/wpa_cli.fish
+%%DATADIR%%/completions/wvdial.fish
 %%DATADIR%%/completions/xargs.fish
+%%DATADIR%%/completions/xdg-mime.fish
+%%DATADIR%%/completions/xdvi.fish
+%%DATADIR%%/completions/xelatex.fish
 %%DATADIR%%/completions/xgettext.fish
 %%DATADIR%%/completions/xmms.fish
 %%DATADIR%%/completions/xpdf.fish
 %%DATADIR%%/completions/xprop.fish
+%%DATADIR%%/completions/xrandr.fish
+%%DATADIR%%/completions/xrdb.fish
 %%DATADIR%%/completions/xsel.fish
 %%DATADIR%%/completions/xterm.fish
+%%DATADIR%%/completions/yaourt.fish
 %%DATADIR%%/completions/yum.fish
 %%DATADIR%%/completions/zcat.fish
 %%DATADIR%%/completions/zip.fish
@@ -257,42 +402,68 @@ bin/set_color
 %%DATADIR%%/functions/__fish_bind_test1.fish
 %%DATADIR%%/functions/__fish_bind_test2.fish
 %%DATADIR%%/functions/__fish_commandline_test.fish
+%%DATADIR%%/functions/__fish_complete_abook_formats.fish
 %%DATADIR%%/functions/__fish_complete_ant_targets.fish
+%%DATADIR%%/functions/__fish_complete_atool.fish
+%%DATADIR%%/functions/__fish_complete_atool_archive_contents.fish
 %%DATADIR%%/functions/__fish_complete_bittorrent.fish
+%%DATADIR%%/functions/__fish_complete_cabal.fish
 %%DATADIR%%/functions/__fish_complete_cd.fish
 %%DATADIR%%/functions/__fish_complete_command.fish
+%%DATADIR%%/functions/__fish_complete_convert_options.fish
+%%DATADIR%%/functions/__fish_complete_diff.fish
 %%DATADIR%%/functions/__fish_complete_directories.fish
 %%DATADIR%%/functions/__fish_complete_file_url.fish
+%%DATADIR%%/functions/__fish_complete_ftp.fish
+%%DATADIR%%/functions/__fish_complete_grep.fish
 %%DATADIR%%/functions/__fish_complete_groups.fish
+%%DATADIR%%/functions/__fish_complete_list.fish
+%%DATADIR%%/functions/__fish_complete_lpr.fish
+%%DATADIR%%/functions/__fish_complete_lpr_option.fish
 %%DATADIR%%/functions/__fish_complete_ls.fish
 %%DATADIR%%/functions/__fish_complete_man.fish
 %%DATADIR%%/functions/__fish_complete_mime.fish
+%%DATADIR%%/functions/__fish_complete_pacman.fish
+%%DATADIR%%/functions/__fish_complete_pgrep.fish
 %%DATADIR%%/functions/__fish_complete_pids.fish
+%%DATADIR%%/functions/__fish_complete_ppp_peer.fish
+%%DATADIR%%/functions/__fish_complete_proc.fish
+%%DATADIR%%/functions/__fish_complete_python.fish
+%%DATADIR%%/functions/__fish_complete_setxkbmap.fish
 %%DATADIR%%/functions/__fish_complete_ssh.fish
 %%DATADIR%%/functions/__fish_complete_subcommand.fish
 %%DATADIR%%/functions/__fish_complete_subcommand_root.fish
 %%DATADIR%%/functions/__fish_complete_suffix.fish
+%%DATADIR%%/functions/__fish_complete_svn.fish
+%%DATADIR%%/functions/__fish_complete_svn_diff.fish
 %%DATADIR%%/functions/__fish_complete_tar.fish
 %%DATADIR%%/functions/__fish_complete_tex.fish
 %%DATADIR%%/functions/__fish_complete_unrar.fish
 %%DATADIR%%/functions/__fish_complete_users.fish
 %%DATADIR%%/functions/__fish_complete_vi.fish
+%%DATADIR%%/functions/__fish_complete_wvdial_peers.fish
+%%DATADIR%%/functions/__fish_complete_xsum.fish
 %%DATADIR%%/functions/__fish_config_interactive.fish
 %%DATADIR%%/functions/__fish_contains_opt.fish
 %%DATADIR%%/functions/__fish_crux_packages.fish
 %%DATADIR%%/functions/__fish_describe_command.fish
 %%DATADIR%%/functions/__fish_filter_ant_targets.fish
 %%DATADIR%%/functions/__fish_filter_mime.fish
-%%DATADIR%%/functions/__fish_git_branch_prompt.fish
+%%DATADIR%%/functions/__fish_git_prompt.fish
 %%DATADIR%%/functions/__fish_gnu_complete.fish
 %%DATADIR%%/functions/__fish_is_first_token.fish
+%%DATADIR%%/functions/__fish_is_token_n.fish
 %%DATADIR%%/functions/__fish_list_current_token.fish
+%%DATADIR%%/functions/__fish_make_completion_signals.fish
 %%DATADIR%%/functions/__fish_move_last.fish
 %%DATADIR%%/functions/__fish_no_arguments.fish
 %%DATADIR%%/functions/__fish_not_contain_opt.fish
 %%DATADIR%%/functions/__fish_paginate.fish
 %%DATADIR%%/functions/__fish_ports_dirs.fish
+%%DATADIR%%/functions/__fish_print_abook_emails.fish
 %%DATADIR%%/functions/__fish_print_addresses.fish
+%%DATADIR%%/functions/__fish_print_arch_daemons.fish
+%%DATADIR%%/functions/__fish_print_commands.fish
 %%DATADIR%%/functions/__fish_print_debian_services.fish
 %%DATADIR%%/functions/__fish_print_encodings.fish
 %%DATADIR%%/functions/__fish_print_filesystems.fish
@@ -300,9 +471,19 @@ bin/set_color
 %%DATADIR%%/functions/__fish_print_help.fish
 %%DATADIR%%/functions/__fish_print_hostnames.fish
 %%DATADIR%%/functions/__fish_print_interfaces.fish
+%%DATADIR%%/functions/__fish_print_lpr_options.fish
+%%DATADIR%%/functions/__fish_print_lpr_printers.fish
+%%DATADIR%%/functions/__fish_print_lsblk_columns.fish
 %%DATADIR%%/functions/__fish_print_make_targets.fish
+%%DATADIR%%/functions/__fish_print_mounted.fish
 %%DATADIR%%/functions/__fish_print_packages.fish
+%%DATADIR%%/functions/__fish_print_svn_rev.fish
 %%DATADIR%%/functions/__fish_print_users.fish
+%%DATADIR%%/functions/__fish_print_xdg_mimeapps.fish
+%%DATADIR%%/functions/__fish_print_xdg_mimetypes.fish
+%%DATADIR%%/functions/__fish_print_xrandr_modes.fish
+%%DATADIR%%/functions/__fish_print_xrandr_outputs.fish
+%%DATADIR%%/functions/__fish_print_xwindows.fish
 %%DATADIR%%/functions/__fish_prt_no_subcommand.fish
 %%DATADIR%%/functions/__fish_prt_packages.fish
 %%DATADIR%%/functions/__fish_prt_ports.fish
@@ -311,24 +492,32 @@ bin/set_color
 %%DATADIR%%/functions/__fish_seen_subcommand_from.fish
 %%DATADIR%%/functions/__fish_test_arg.fish
 %%DATADIR%%/functions/__fish_use_subcommand.fish
+%%DATADIR%%/functions/__terlar_git_prompt.fish
 %%DATADIR%%/functions/alias.fish
 %%DATADIR%%/functions/cd.fish
+%%DATADIR%%/functions/contains_seq.fish
 %%DATADIR%%/functions/delete-or-exit.fish
 %%DATADIR%%/functions/dirh.fish
 %%DATADIR%%/functions/dirs.fish
 %%DATADIR%%/functions/down-or-search.fish
 %%DATADIR%%/functions/eval.fish
+%%DATADIR%%/functions/fish_config.fish
 %%DATADIR%%/functions/fish_default_key_bindings.fish
+%%DATADIR%%/functions/fish_indent.fish
 %%DATADIR%%/functions/fish_prompt.fish
+%%DATADIR%%/functions/fish_update_completions.fish
 %%DATADIR%%/functions/funced.fish
 %%DATADIR%%/functions/funcsave.fish
 %%DATADIR%%/functions/grep.fish
 %%DATADIR%%/functions/help.fish
+%%DATADIR%%/functions/history.fish
 %%DATADIR%%/functions/isatty.fish
 %%DATADIR%%/functions/la.fish
 %%DATADIR%%/functions/ll.fish
 %%DATADIR%%/functions/ls.fish
+%%DATADIR%%/functions/man.fish
 %%DATADIR%%/functions/math.fish
+%%DATADIR%%/functions/mimedb.fish
 %%DATADIR%%/functions/nextd-or-forward-word.fish
 %%DATADIR%%/functions/nextd.fish
 %%DATADIR%%/functions/open.fish
@@ -338,7 +527,7 @@ bin/set_color
 %%DATADIR%%/functions/prompt_pwd.fish
 %%DATADIR%%/functions/psub.fish
 %%DATADIR%%/functions/pushd.fish
-%%DATADIR%%/functions/pwd.fish
+%%DATADIR%%/functions/seq.fish
 %%DATADIR%%/functions/setenv.fish
 %%DATADIR%%/functions/sgrep.fish
 %%DATADIR%%/functions/trap.fish
@@ -346,14 +535,36 @@ bin/set_color
 %%DATADIR%%/functions/umask.fish
 %%DATADIR%%/functions/up-or-search.fish
 %%DATADIR%%/functions/vared.fish
-share/locale/de/LC_MESSAGES/fish.mo
-share/locale/en/LC_MESSAGES/fish.mo
-share/locale/fr/LC_MESSAGES/fish.mo
-share/locale/sv/LC_MESSAGES/fish.mo
+%%DATADIR%%/tools/create_manpage_completions.py
+%%DATADIR%%/tools/deroff.py
+%%DATADIR%%/tools/web_config/delete.png
+%%DATADIR%%/tools/web_config/index.html
+%%DATADIR%%/tools/web_config/jquery.js
+%%DATADIR%%/tools/web_config/sample_prompts/classic.fish
+%%DATADIR%%/tools/web_config/sample_prompts/classic_git.fish
+%%DATADIR%%/tools/web_config/sample_prompts/classic_status.fish
+%%DATADIR%%/tools/web_config/sample_prompts/informative.fish
+%%DATADIR%%/tools/web_config/sample_prompts/justadollar.fish
+%%DATADIR%%/tools/web_config/sample_prompts/lonetwin.fish
+%%DATADIR%%/tools/web_config/sample_prompts/minimalist.fish
+%%DATADIR%%/tools/web_config/sample_prompts/nim.fish
+%%DATADIR%%/tools/web_config/sample_prompts/pythonista.fish
+%%DATADIR%%/tools/web_config/sample_prompts/robbyrussell.fish
+%%DATADIR%%/tools/web_config/sample_prompts/screen_savvy.fish
+%%DATADIR%%/tools/web_config/sample_prompts/terlar.fish
+%%DATADIR%%/tools/web_config/sample_prompts/user_host_path.fish
+%%DATADIR%%/tools/web_config/webconfig.py
+%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
+@dirrm %%DATADIR%%/tools/web_config/sample_prompts
+@dirrm %%DATADIR%%/tools/web_config
+@dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%/functions
 @dirrm %%DATADIR%%/completions
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%ETCDIR%%
 @exec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak; echo %D/bin/fish) > /etc/shells; rm -f /etc/shells.bak
 @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak