From nobody@FreeBSD.org  Sat Sep 19 05:04:39 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50C94106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Sep 2009 05:04:39 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E35D8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Sep 2009 05:04:39 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8J54c32092590
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Sep 2009 05:04:38 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n8J54cFH092589;
	Sat, 19 Sep 2009 05:04:38 GMT
	(envelope-from nobody)
Message-Id: <200909190504.n8J54cFH092589@www.freebsd.org>
Date: Sat, 19 Sep 2009 05:04:38 GMT
From: Rob Farmer <rfarmer@predatorlabs.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] update shells/fish to 1.23.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: kaiw27@gmail.com

>Number:         138958
>Category:       ports
>Synopsis:       [patch] update shells/fish to 1.23.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 19 05:10:05 UTC 2009
>Closed-Date:    Mon Sep 21 11:35:52 UTC 2009
>Last-Modified:  Mon Sep 21 11:40:03 UTC 2009
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD tanzanite.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r197259: Wed Sep 16 16:16:56 PDT 2009     robert@tanzanite.predatorlabs.net:/usr/obj/usr/src/sys/PAE-TANZANITE  i386

>Description:
Update fish to 1.23.1
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN fish.orig/Makefile fish/Makefile
--- fish.orig/Makefile	2009-09-16 20:08:15.000000000 -0700
+++ fish/Makefile	2009-09-18 21:54:59.000000000 -0700
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	fish
-PORTVERSION=	1.22.3
-PORTREVISION=	4
+PORTVERSION=	1.23.1
 CATEGORIES=	shells
-MASTER_SITES=	http://www.fishshell.org/files/1.22.3/ \
-		http://roo.no-ip.org/fish/files/1.22.3/ \
+MASTER_SITES=	http://www.fishshell.org/files/${PORTVERSION}/ \
+		http://roo.no-ip.org/fish/files/${PORTVERSION}/ \
 		http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
 
 MAINTAINER=	kaiw27@gmail.com
@@ -30,18 +29,18 @@
 OPTIONS=	NLS	"Native language support"	on \
 		XSEL	"Build with xsel"		on
 
-MAN1=		count.1 fish.1 fish_pager.1 fishd.1 \
-		mimedb.1 set_color.1 alias.1 and.1 begin.1 \
-		bg.1 bind.1 block.1 break.1 builtin.1 \
-		case.1 cd.1 command.1 commandline.1 complete.1 \
-		contains.1 continue.1 dirh.1 dirs.1 else.1 \
-		end.1 eval.1 exec.1 exit.1 fg.1 for.1 \
-		function.1 functions.1 help.1 if.1 isatty.1 \
-		jobs.1 math.1 nextd.1 not.1 open.1 or.1 \
-		popd.1 prevd.1 psub.1 pushd.1 random.1 \
-		read.1 return.1 save_function.1 set.1 \
-		source.1 status.1 switch.1 trap.1 type.1 \
-		ulimit.1 umask.1 vared.1 while.1
+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
 
 .include <bsd.port.pre.mk>
 
@@ -66,10 +65,6 @@
 .if !defined(WITHOUT_XSEL)
 	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1
 .endif
-# remove duplicate manpages
-.for i in count.1 fish.1 fish_pager.1 fishd.1 mimedb.1 set_color.1
-	cd ${DATADIR}/man && ${RM} -f ${i}
-.endfor
 	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
 	${RM} -rf ${DATADIR}/man
 	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
diff -ruN fish.orig/distinfo fish/distinfo
--- fish.orig/distinfo	2009-09-16 20:08:15.000000000 -0700
+++ fish/distinfo	2009-09-18 21:54:59.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (fish-1.22.3.tar.gz) = 088a977e08c5026bbad300e56dcb6ac3
-SHA256 (fish-1.22.3.tar.gz) = 5d55d90fed997762cb42ac002eedbd5b156af21f4b0c93a579415ff62fb60769
-SIZE (fish-1.22.3.tar.gz) = 1045212
+MD5 (fish-1.23.1.tar.gz) = 4b2436843e63bebba467cc4add11428a
+SHA256 (fish-1.23.1.tar.gz) = a7f2890b0112d57b4760975f3d8f8c7e0cd240edcb2b3a87b5d66744a8deaf64
+SIZE (fish-1.23.1.tar.gz) = 1152997
diff -ruN fish.orig/files/patch-configure.ac fish/files/patch-configure.ac
--- fish.orig/files/patch-configure.ac	2009-09-16 20:08:15.000000000 -0700
+++ fish/files/patch-configure.ac	2009-09-18 21:54:59.000000000 -0700
@@ -1,13 +1,118 @@
---- configure.ac.orig	2007-02-08 09:38:58.000000000 -0800
-+++ configure.ac	2007-09-22 18:29:24.000000000 -0700
-@@ -412,9 +412,3 @@
+--- 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
--	AC_SUBST(docdir, [$datadir/doc/fish] )
+-	docdir=$datadir/doc/fish
 -else
--	AC_SUBST(docdir, [$docdir])
+-	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
-+AC_SUBST(docdir, [$datadir/doc/fish] )
+-LIBS_SET_COLOR=$LIBS
+-LIBS=$LIBS_COMMON
  
+ #
+ # Check presense of various header files
diff -ruN fish.orig/pkg-plist fish/pkg-plist
--- fish.orig/pkg-plist	2009-09-16 20:08:15.000000000 -0700
+++ fish/pkg-plist	2009-09-18 21:54:59.000000000 -0700
@@ -1,29 +1,29 @@
-bin/count
 bin/fish
+bin/fish_indent
 bin/fish_pager
 bin/fishd
 bin/mimedb
 bin/seq
 bin/set_color
 %%XSEL%%bin/xsel
-etc/fish/config.fish
-etc/fish/fish_inputrc
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/commands.html
-%%DOCSDIR%%/design.html
-%%DOCSDIR%%/doc_8h-source.html
-%%DOCSDIR%%/doc_8h_source.html
-%%DOCSDIR%%/doxygen.css
-%%DOCSDIR%%/doxygen.png
-%%DOCSDIR%%/faq.html
-%%DOCSDIR%%/files.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/license.html
-%%DOCSDIR%%/pages.html
-%%DOCSDIR%%/tab_b.gif
-%%DOCSDIR%%/tab_l.gif
-%%DOCSDIR%%/tab_r.gif
-%%DOCSDIR%%/tabs.css
+%%ETCDIR%%/config.fish
+share/doc/ChangeLog
+share/doc/commands.html
+share/doc/design.html
+share/doc/doc_8h-source.html
+share/doc/doxygen.css
+share/doc/doxygen.png
+share/doc/faq.html
+share/doc/files.html
+share/doc/index.html
+share/doc/license.html
+share/doc/pages.html
+share/doc/tab_b.gif
+share/doc/tab_l.gif
+share/doc/tab_r.gif
+share/doc/tabs.css
+%%DATADIR%%/completions/acpi.fish
+%%DATADIR%%/completions/adduser.fish
 %%DATADIR%%/completions/and.fish
 %%DATADIR%%/completions/ant.fish
 %%DATADIR%%/completions/apm.fish
@@ -56,9 +56,12 @@
 %%DATADIR%%/completions/atd.fish
 %%DATADIR%%/completions/atq.fish
 %%DATADIR%%/completions/atrm.fish
+%%DATADIR%%/completions/awk.fish
+%%DATADIR%%/completions/badblocks.fish
 %%DATADIR%%/completions/bc.fish
 %%DATADIR%%/completions/bg.fish
 %%DATADIR%%/completions/bind.fish
+%%DATADIR%%/completions/bison.fish
 %%DATADIR%%/completions/block.fish
 %%DATADIR%%/completions/break.fish
 %%DATADIR%%/completions/btdownloadcurses.py.fish
@@ -73,6 +76,7 @@
 %%DATADIR%%/completions/cd.fish
 %%DATADIR%%/completions/cdrecord.fish
 %%DATADIR%%/completions/chgrp.fish
+%%DATADIR%%/completions/chmod.fish
 %%DATADIR%%/completions/chown.fish
 %%DATADIR%%/completions/chsh.fish
 %%DATADIR%%/completions/command.fish
@@ -80,6 +84,8 @@
 %%DATADIR%%/completions/complete.fish
 %%DATADIR%%/completions/configure.fish
 %%DATADIR%%/completions/continue.fish
+%%DATADIR%%/completions/cowsay.fish
+%%DATADIR%%/completions/cowthink.fish
 %%DATADIR%%/completions/cp.fish
 %%DATADIR%%/completions/cut.fish
 %%DATADIR%%/completions/cvs.fish
@@ -92,6 +98,7 @@
 %%DATADIR%%/completions/dvipdf.fish
 %%DATADIR%%/completions/dvipdfm.fish
 %%DATADIR%%/completions/echo.fish
+%%DATADIR%%/completions/effectv.fish
 %%DATADIR%%/completions/eix-sync.fish
 %%DATADIR%%/completions/eix.fish
 %%DATADIR%%/completions/elatex.fish
@@ -101,21 +108,26 @@
 %%DATADIR%%/completions/equery.fish
 %%DATADIR%%/completions/etex.fish
 %%DATADIR%%/completions/eval.fish
+%%DATADIR%%/completions/evince.fish
 %%DATADIR%%/completions/exec.fish
 %%DATADIR%%/completions/exit.fish
 %%DATADIR%%/completions/fg.fish
 %%DATADIR%%/completions/file.fish
 %%DATADIR%%/completions/find.fish
 %%DATADIR%%/completions/fish.fish
+%%DATADIR%%/completions/fish_indent.fish
 %%DATADIR%%/completions/flac.fish
 %%DATADIR%%/completions/function.fish
 %%DATADIR%%/completions/functions.fish
 %%DATADIR%%/completions/fusermount.fish
 %%DATADIR%%/completions/gcc.fish
+%%DATADIR%%/completions/gdb.fish
 %%DATADIR%%/completions/gem.fish
+%%DATADIR%%/completions/git.fish
 %%DATADIR%%/completions/gpg.fish
 %%DATADIR%%/completions/gprof.fish
 %%DATADIR%%/completions/grep.fish
+%%DATADIR%%/completions/groupadd.fish
 %%DATADIR%%/completions/gunzip.fish
 %%DATADIR%%/completions/gzip.fish
 %%DATADIR%%/completions/help.fish
@@ -123,6 +135,7 @@
 %%DATADIR%%/completions/iconv.fish
 %%DATADIR%%/completions/id.fish
 %%DATADIR%%/completions/ifconfig.fish
+%%DATADIR%%/completions/invoke-rc.d.fish
 %%DATADIR%%/completions/jobs.fish
 %%DATADIR%%/completions/kill.fish
 %%DATADIR%%/completions/la.fish
@@ -131,21 +144,26 @@
 %%DATADIR%%/completions/ll.fish
 %%DATADIR%%/completions/locate.fish
 %%DATADIR%%/completions/ls.fish
+%%DATADIR%%/completions/m4.fish
 %%DATADIR%%/completions/make.fish
 %%DATADIR%%/completions/makedepend.fish
+%%DATADIR%%/completions/makepkg.fish
 %%DATADIR%%/completions/man.fish
 %%DATADIR%%/completions/mimedb.fish
 %%DATADIR%%/completions/modprobe.fish
 %%DATADIR%%/completions/mount.fish
 %%DATADIR%%/completions/mplayer.fish
+%%DATADIR%%/completions/msgfmt.fish
 %%DATADIR%%/completions/mutt.fish
 %%DATADIR%%/completions/mv.fish
+%%DATADIR%%/completions/netcat.fish
 %%DATADIR%%/completions/nextd.fish
 %%DATADIR%%/completions/nice.fish
 %%DATADIR%%/completions/not.fish
 %%DATADIR%%/completions/oggenc.fish
 %%DATADIR%%/completions/omega.fish
 %%DATADIR%%/completions/or.fish
+%%DATADIR%%/completions/pacman.fish
 %%DATADIR%%/completions/patch.fish
 %%DATADIR%%/completions/pdfelatex.fish
 %%DATADIR%%/completions/pdfetex.fish
@@ -154,14 +172,22 @@
 %%DATADIR%%/completions/perl.fish
 %%DATADIR%%/completions/pine.fish
 %%DATADIR%%/completions/ping.fish
+%%DATADIR%%/completions/pkgadd.fish
+%%DATADIR%%/completions/pkginfo.fish
+%%DATADIR%%/completions/pkgmk.fish
+%%DATADIR%%/completions/pkgrm.fish
+%%DATADIR%%/completions/ports.fish
 %%DATADIR%%/completions/prevd.fish
+%%DATADIR%%/completions/prt-get.fish
 %%DATADIR%%/completions/ps.fish
 %%DATADIR%%/completions/ps2pdf.fish
 %%DATADIR%%/completions/psub.fish
 %%DATADIR%%/completions/pushd.fish
 %%DATADIR%%/completions/python.fish
+%%DATADIR%%/completions/quilt.fish
 %%DATADIR%%/completions/random.fish
 %%DATADIR%%/completions/read.fish
+%%DATADIR%%/completions/rejmerge.fish
 %%DATADIR%%/completions/renice.fish
 %%DATADIR%%/completions/return.fish
 %%DATADIR%%/completions/rm.fish
@@ -169,6 +195,7 @@
 %%DATADIR%%/completions/rpm.fish
 %%DATADIR%%/completions/rsync.fish
 %%DATADIR%%/completions/ruby.fish
+%%DATADIR%%/completions/scons.fish
 %%DATADIR%%/completions/scp.fish
 %%DATADIR%%/completions/screen.fish
 %%DATADIR%%/completions/sed.fish
@@ -200,6 +227,7 @@
 %%DATADIR%%/completions/unrar.fish
 %%DATADIR%%/completions/update-eix-remote.fish
 %%DATADIR%%/completions/update-eix.fish
+%%DATADIR%%/completions/useradd.fish
 %%DATADIR%%/completions/valgrind.fish
 %%DATADIR%%/completions/vared.fish
 %%DATADIR%%/completions/vi.fish
@@ -207,12 +235,14 @@
 %%DATADIR%%/completions/w.fish
 %%DATADIR%%/completions/wajig.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/wpa_cli.fish
 %%DATADIR%%/completions/xargs.fish
+%%DATADIR%%/completions/xgettext.fish
 %%DATADIR%%/completions/xmms.fish
 %%DATADIR%%/completions/xpdf.fish
 %%DATADIR%%/completions/xprop.fish
@@ -222,16 +252,22 @@
 %%DATADIR%%/completions/zcat.fish
 %%DATADIR%%/completions/zip.fish
 %%DATADIR%%/config.fish
-%%DATADIR%%/config_interactive.fish
 %%DATADIR%%/functions/N_.fish
 %%DATADIR%%/functions/_.fish
 %%DATADIR%%/functions/__fish_append.fish
+%%DATADIR%%/functions/__fish_bind_test1.fish
+%%DATADIR%%/functions/__fish_bind_test2.fish
+%%DATADIR%%/functions/__fish_commandline_test.fish
 %%DATADIR%%/functions/__fish_complete_ant_targets.fish
 %%DATADIR%%/functions/__fish_complete_bittorrent.fish
 %%DATADIR%%/functions/__fish_complete_cd.fish
+%%DATADIR%%/functions/__fish_complete_command.fish
 %%DATADIR%%/functions/__fish_complete_directories.fish
+%%DATADIR%%/functions/__fish_complete_file_url.fish
+%%DATADIR%%/functions/__fish_complete_groups.fish
 %%DATADIR%%/functions/__fish_complete_ls.fish
 %%DATADIR%%/functions/__fish_complete_man.fish
+%%DATADIR%%/functions/__fish_complete_mime.fish
 %%DATADIR%%/functions/__fish_complete_pids.fish
 %%DATADIR%%/functions/__fish_complete_ssh.fish
 %%DATADIR%%/functions/__fish_complete_subcommand.fish
@@ -240,30 +276,53 @@
 %%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_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_gnu_complete.fish
 %%DATADIR%%/functions/__fish_is_first_token.fish
 %%DATADIR%%/functions/__fish_list_current_token.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_addresses.fish
+%%DATADIR%%/functions/__fish_print_debian_services.fish
+%%DATADIR%%/functions/__fish_print_encodings.fish
 %%DATADIR%%/functions/__fish_print_filesystems.fish
 %%DATADIR%%/functions/__fish_print_function_prototypes.fish
 %%DATADIR%%/functions/__fish_print_help.fish
 %%DATADIR%%/functions/__fish_print_hostnames.fish
+%%DATADIR%%/functions/__fish_print_interfaces.fish
+%%DATADIR%%/functions/__fish_print_make_targets.fish
 %%DATADIR%%/functions/__fish_print_packages.fish
+%%DATADIR%%/functions/__fish_print_users.fish
+%%DATADIR%%/functions/__fish_prt_no_subcommand.fish
+%%DATADIR%%/functions/__fish_prt_packages.fish
+%%DATADIR%%/functions/__fish_prt_ports.fish
+%%DATADIR%%/functions/__fish_prt_use_package.fish
+%%DATADIR%%/functions/__fish_prt_use_port.fish
 %%DATADIR%%/functions/__fish_seen_subcommand_from.fish
 %%DATADIR%%/functions/__fish_test_arg.fish
 %%DATADIR%%/functions/__fish_use_subcommand.fish
 %%DATADIR%%/functions/alias.fish
 %%DATADIR%%/functions/cd.fish
-%%DATADIR%%/functions/contains.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_default_key_bindings.fish
 %%DATADIR%%/functions/fish_prompt.fish
+%%DATADIR%%/functions/funced.fish
+%%DATADIR%%/functions/funcsave.fish
 %%DATADIR%%/functions/grep.fish
 %%DATADIR%%/functions/help.fish
 %%DATADIR%%/functions/isatty.fish
@@ -281,12 +340,12 @@
 %%DATADIR%%/functions/psub.fish
 %%DATADIR%%/functions/pushd.fish
 %%DATADIR%%/functions/pwd.fish
-%%DATADIR%%/functions/save_function.fish
 %%DATADIR%%/functions/setenv.fish
 %%DATADIR%%/functions/sgrep.fish
 %%DATADIR%%/functions/trap.fish
 %%DATADIR%%/functions/type.fish
 %%DATADIR%%/functions/umask.fish
+%%DATADIR%%/functions/up-or-search.fish
 %%DATADIR%%/functions/vared.fish
 %%NLS%%share/locale/de/LC_MESSAGES/fish.mo
 %%NLS%%share/locale/en/LC_MESSAGES/fish.mo
@@ -295,7 +354,6 @@
 @dirrm %%DATADIR%%/functions
 @dirrm %%DATADIR%%/completions
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-@dirrm etc/fish
+@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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Sep 19 05:10:17 UTC 2009 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138958 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: kaiw27@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/138958: [patch] update shells/fish to 1.23.1
Date: Sat, 19 Sep 2009 05:10:15 UT

 Maintainer of shells/fish,
 
 Please note that PR ports/138958 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/138958
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Kai Wang <kaiwang27@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138958: [patch] update shells/fish to 1.23.1
Date: Sat, 19 Sep 2009 14:38:27 +0200

 Patch approved. Thanks!
 
 By the way, I want to drop my maintainership of this port since
 I no longer have time/interest for it. (Should have done this long ago)
 
 Best Regards,
 Kai
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Sat Sep 19 20:19:09 UTC 2009 
State-Changed-Why:  
Maintainer approved. 

To submitter: maintainer is willing to relinquish maintainership.  Would 
you like to take it? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138958 

From: Rob Farmer <rfarmer@predatorlabs.net>
To: linimon@freebsd.org, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/138958: [patch] update shells/fish to 1.23.1
Date: Sat, 19 Sep 2009 15:03:53 -0700

 --00c09f8e5be4a133fd0473f56cfe
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: quoted-printable
 
 Sure, I'll take maintainership. I've also attached an updated patch to
 change the MASTER_SITES to sourceforge since their website seems to be
 having issues, at least for me.
 
 Rob Farmer
 
 --00c09f8e5be4a133fd0473f56cfe
 Content-Type: text/plain; charset=US-ASCII; name="fish.txt"
 Content-Disposition: attachment; filename="fish.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_fzswof5f0
 
 ZGlmZiAtcnVOIGZpc2gub3JpZy9NYWtlZmlsZSBmaXNoL01ha2VmaWxlCi0tLSBmaXNoLm9yaWcv
 TWFrZWZpbGUJMjAwOS0wOS0xNiAyMDowODoxNS4wMDAwMDAwMDAgLTA3MDAKKysrIGZpc2gvTWFr
 ZWZpbGUJMjAwOS0wOS0xOSAxNDo1NTowNS4wMDAwMDAwMDAgLTA3MDAKQEAgLTYsMTQgKzYsMTEg
 QEAKICMKIAogUE9SVE5BTUU9CWZpc2gKLVBPUlRWRVJTSU9OPQkxLjIyLjMKLVBPUlRSRVZJU0lP
 Tj0JNAorUE9SVFZFUlNJT049CTEuMjMuMQogQ0FURUdPUklFUz0Jc2hlbGxzCi1NQVNURVJfU0lU
 RVM9CWh0dHA6Ly93d3cuZmlzaHNoZWxsLm9yZy9maWxlcy8xLjIyLjMvIFwKLQkJaHR0cDovL3Jv
 by5uby1pcC5vcmcvZmlzaC9maWxlcy8xLjIyLjMvIFwKLQkJaHR0cDovL3dlYi5zdHVkZW50LmNo
 YWxtZXJzLnNlL35rYWl3L0ZyZWVCU0QvZGlzZmlsZXMvCitNQVNURVJfU0lURVM9CVNGCiAKLU1B
 SU5UQUlORVI9CWthaXcyN0BnbWFpbC5jb20KK01BSU5UQUlORVI9CXJmYXJtZXJAcHJlZGF0b3Js
 YWJzLm5ldAogQ09NTUVOVD0JQSB1c2VyIGZyaWVuZGx5IGNvbW1hbmQgbGluZSBzaGVsbAogCiBV
 U0VfQVVUT1RPT0xTPQlhdXRvY29uZjoyNjIKQEAgLTMwLDE4ICsyNywxOCBAQAogT1BUSU9OUz0J
 TkxTCSJOYXRpdmUgbGFuZ3VhZ2Ugc3VwcG9ydCIJb24gXAogCQlYU0VMCSJCdWlsZCB3aXRoIHhz
 ZWwiCQlvbgogCi1NQU4xPQkJY291bnQuMSBmaXNoLjEgZmlzaF9wYWdlci4xIGZpc2hkLjEgXAot
 CQltaW1lZGIuMSBzZXRfY29sb3IuMSBhbGlhcy4xIGFuZC4xIGJlZ2luLjEgXAotCQliZy4xIGJp
 bmQuMSBibG9jay4xIGJyZWFrLjEgYnVpbHRpbi4xIFwKLQkJY2FzZS4xIGNkLjEgY29tbWFuZC4x
 IGNvbW1hbmRsaW5lLjEgY29tcGxldGUuMSBcCi0JCWNvbnRhaW5zLjEgY29udGludWUuMSBkaXJo
 LjEgZGlycy4xIGVsc2UuMSBcCi0JCWVuZC4xIGV2YWwuMSBleGVjLjEgZXhpdC4xIGZnLjEgZm9y
 LjEgXAotCQlmdW5jdGlvbi4xIGZ1bmN0aW9ucy4xIGhlbHAuMSBpZi4xIGlzYXR0eS4xIFwKLQkJ
 am9icy4xIG1hdGguMSBuZXh0ZC4xIG5vdC4xIG9wZW4uMSBvci4xIFwKLQkJcG9wZC4xIHByZXZk
 LjEgcHN1Yi4xIHB1c2hkLjEgcmFuZG9tLjEgXAotCQlyZWFkLjEgcmV0dXJuLjEgc2F2ZV9mdW5j
 dGlvbi4xIHNldC4xIFwKLQkJc291cmNlLjEgc3RhdHVzLjEgc3dpdGNoLjEgdHJhcC4xIHR5cGUu
 MSBcCi0JCXVsaW1pdC4xIHVtYXNrLjEgdmFyZWQuMSB3aGlsZS4xCitNQU4xPQkJYWxpYXMuMSBh
 bmQuMSBiZWdpbi4xIGJnLjEgYmluZC4xIGJsb2NrLjEgXAorCQlicmVhay4xIGJyZWFrcG9pbnQu
 MSBidWlsdGluLjEgY2FzZS4xIGNkLjEgXAorCQljb21tYW5kLjEgY29tbWFuZGxpbmUuMSBjb21w
 bGV0ZS4xIGNvbnRhaW5zLjEgXAorCQljb250aW51ZS4xIGNvdW50LjEgZGlyaC4xIGRpcnMuMSAg
 ZWxzZS4xIFwKKwkJZW1pdC4xIGVuZC4xIGV2YWwuMSBleGVjLjEgZXhpdC4xIGZnLjEgZmlzaC4x
 IFwKKwkJZmlzaF9pbmRlbnQuMSBmaXNoX3BhZ2VyLjEgZmlzaF9wcm9tcHQuMSBcCisJCWZpc2hk
 LjEgZm9yLjEgZnVuY2VkLjEgZnVuY3NhdmUuMSBmdW5jdGlvbi4xIFwKKwkJZnVuY3Rpb25zLjEg
 aGVscC4xIGlmLjEgaXNhdHR5LjEgam9icy4xIG1hdGguMSBcCisJCW1pbWVkYi4xIG5leHRkLjEg
 bm90LjEgb3Blbi4xIG9yLjEgcG9wZC4xIFwKKwkJcHJldmQuMSBwc3ViLjEgcHVzaGQuMSByYW5k
 b20uMSByZWFkLjEgcmV0dXJuLjEgXAorCQlzZXQuMSBzZXRfY29sb3IuMSBzb3VyY2UuMSBzdGF0
 dXMuMSBzd2l0Y2guMSBcCisJCXRyYXAuMSB0eXBlLjEgdWxpbWl0LjEgdW1hc2suMSB2YXJlZC4x
 IHdoaWxlLjEKIAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIApAQCAtNjYsMTAgKzYzLDYg
 QEAKIC5pZiAhZGVmaW5lZChXSVRIT1VUX1hTRUwpCiAJJHtNVn0gJHtQUkVGSVh9L21hbi9tYW4x
 L3hzZWwuMXggJHtQUkVGSVh9L21hbi9tYW4xL3hzZWwuMQogLmVuZGlmCi0jIHJlbW92ZSBkdXBs
 aWNhdGUgbWFucGFnZXMKLS5mb3IgaSBpbiBjb3VudC4xIGZpc2guMSBmaXNoX3BhZ2VyLjEgZmlz
 aGQuMSBtaW1lZGIuMSBzZXRfY29sb3IuMQotCWNkICR7REFUQURJUn0vbWFuICYmICR7Uk19IC1m
 ICR7aX0KLS5lbmRmb3IKIAkke0NQfSAke0RBVEFESVJ9L21hbi8qLjEgJHtQUkVGSVh9L21hbi9t
 YW4xLwogCSR7Uk19IC1yZiAke0RBVEFESVJ9L21hbgogCWlmICR7R1JFUH0gLXEgJyR7UFJFRklY
 fS9iaW4vJHtQT1JUTkFNRX0nIC9ldGMvc2hlbGxzOyB0aGVuIFwKZGlmZiAtcnVOIGZpc2gub3Jp
 Zy9kaXN0aW5mbyBmaXNoL2Rpc3RpbmZvCi0tLSBmaXNoLm9yaWcvZGlzdGluZm8JMjAwOS0wOS0x
 NiAyMDowODoxNS4wMDAwMDAwMDAgLTA3MDAKKysrIGZpc2gvZGlzdGluZm8JMjAwOS0wOS0xOSAx
 NDo1NTowNS4wMDAwMDAwMDAgLTA3MDAKQEAgLTEsMyArMSwzIEBACi1NRDUgKGZpc2gtMS4yMi4z
 LnRhci5neikgPSAwODhhOTc3ZTA4YzUwMjZiYmFkMzAwZTU2ZGNiNmFjMwotU0hBMjU2IChmaXNo
 LTEuMjIuMy50YXIuZ3opID0gNWQ1NWQ5MGZlZDk5Nzc2MmNiNDJhYzAwMmVlZGJkNWIxNTZhZjIx
 ZjRiMGM5M2E1Nzk0MTVmZjYyZmI2MDc2OQotU0laRSAoZmlzaC0xLjIyLjMudGFyLmd6KSA9IDEw
 NDUyMTIKK01ENSAoZmlzaC0xLjIzLjEudGFyLmd6KSA9IDRiMjQzNjg0M2U2M2JlYmJhNDY3Y2M0
 YWRkMTE0MjhhCitTSEEyNTYgKGZpc2gtMS4yMy4xLnRhci5neikgPSBhN2YyODkwYjAxMTJkNTdi
 NDc2MDk3NWYzZDhmOGM3ZTBjZDI0MGVkY2IyYjNhODdiNWQ2Njc0NGE4ZGVhZjY0CitTSVpFIChm
 aXNoLTEuMjMuMS50YXIuZ3opID0gMTE1Mjk5NwpkaWZmIC1ydU4gZmlzaC5vcmlnL2ZpbGVzL3Bh
 dGNoLWNvbmZpZ3VyZS5hYyBmaXNoL2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZS5hYwotLS0gZmlzaC5v
 cmlnL2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZS5hYwkyMDA5LTA5LTE2IDIwOjA4OjE1LjAwMDAwMDAw
 MCAtMDcwMAorKysgZmlzaC9maWxlcy9wYXRjaC1jb25maWd1cmUuYWMJMjAwOS0wOS0xOSAxNDo1
 NTowNS4wMDAwMDAwMDAgLTA3MDAKQEAgLTEsMTMgKzEsMTE4IEBACi0tLS0gY29uZmlndXJlLmFj
 Lm9yaWcJMjAwNy0wMi0wOCAwOTozODo1OC4wMDAwMDAwMDAgLTA4MDAKLSsrKyBjb25maWd1cmUu
 YWMJMjAwNy0wOS0yMiAxODoyOToyNC4wMDAwMDAwMDAgLTA3MDAKLUBAIC00MTIsOSArNDEyLDMg
 QEAKKy0tLSBjb25maWd1cmUuYWMub3JpZwkyMDA5LTAzLTA4IDA3OjQ2OjQ3LjAwMDAwMDAwMCAt
 MDcwMAorKysrIGNvbmZpZ3VyZS5hYwkyMDA5LTA5LTE4IDIxOjI4OjA3LjAwMDAwMDAwMCAtMDcw
 MAorQEAgLTQ1MSwyMCArNDUxLDYgQEAKICAKKyAKKyAjCistIyBTZXQgdXAgdGhlIGRpcmVjdG9y
 eSB3aGVyZSB0aGUgZG9jdW1lbnRhdGlvbiBmaWxlcyBzaG91bGQgYmUKKy0jIGluc3RhbGxlZAor
 LSMKKy0KIC1BQ19BUkdfVkFSKCBbZG9jZGlyXSwgW0RvY3VtZW50YXRpb24gZGlyZWNvdHJ5XSAp
 CiAtCiAtaWYgdGVzdCAteiAkZG9jZGlyOyB0aGVuCi0tCUFDX1NVQlNUKGRvY2RpciwgWyRkYXRh
 ZGlyL2RvYy9maXNoXSApCistCWRvY2Rpcj0kZGF0YWRpci9kb2MvZmlzaAogLWVsc2UKLS0JQUNf
 U1VCU1QoZG9jZGlyLCBbJGRvY2Rpcl0pCistCWRvY2Rpcj0kZG9jZGlyCistZmkKKy0KKy0KKy0j
 CisgIyBTZXQgdXAgbG9jYWxlIGRpcmVjdG9yeS4gVGhpcyBpcyB3aGVyZSB0aGUgLnBvIGZpbGVz
 IHdpbGwgYmUKKyAjIGluc3RhbGxlZC4KKyAjCitAQCAtNTAwLDk0ICs0ODYsMTkgQEAKKyAjCisg
 CisgIyBDaGVjayBmb3Igb3MgZGVwZW5kYW50IGxpYnJhcmllcyBmb3IgYWxsIGJpbmFyaWVzLgor
 LUxJQlNfQ09NTU9OPSRMSUJTCistTElCUz0iIgorIEFDX1NFQVJDSF9MSUJTKCBjb25uZWN0LCBz
 b2NrZXQsICwgW0FDX01TR19FUlJPUihbQ2Fubm90IGZpbmQgdGhlIHNvY2tldCBsaWJyYXJ5LCBu
 ZWVkZWQgdG8gYnVpbGQgdGhpcyBwYWNrYWdlLl0gKV0gKQorIEFDX1NFQVJDSF9MSUJTKCBuYW5v
 c2xlZXAsIHJ0LCAsIFtBQ19NU0dfRVJST1IoW0Nhbm5vdCBmaW5kIHRoZSBydCBsaWJyYXJ5LCBu
 ZWVkZWQgdG8gYnVpbGQgdGhpcyBwYWNrYWdlLl0gKV0gKQorIEFDX1NFQVJDSF9MSUJTKCBzZXR1
 cHRlcm0sIFtuY3Vyc2VzIGN1cnNlc10sICwgW0FDX01TR19FUlJPUihbQ291bGQgbm90IGZpbmQg
 YSBjdXJzZXMgaW1wbGVtZW50YXRpb24sIG5lZWRlZCB0byBidWlsZCBmaXNoXSldICkKKyBBQ19T
 RUFSQ0hfTElCUyggW25hbl0sIFttXSwgW0FDX0RFRklORSggW0hBVkVfTkFOXSwgWzFdLCBbRGVm
 aW5lIHRvIDEgaWYgeW91IGhhdmUgdGhlIG5hbiBmdW5jdGlvbl0pXSApCistTElCU19TSEFSRUQ9
 JExJQlMKKy1MSUJTPSRMSUJTX0NPTU1PTgorIAorICMKKyAjIENoZWNrIGZvciBsaWJyYXJpZXMg
 bmVlZGVkIGJ5IGZpc2guIAorICMKKyAKKy1MSUJTX0NPTU1PTj0kTElCUworLUxJQlM9IiRMSUJT
 X1NIQVJFRCIKKyBpZiB0ZXN0IHgkbG9jYWxfZ2V0dGV4dCAhPSB4bm87IHRoZW4gCisgCUFDX1NF
 QVJDSF9MSUJTKCBnZXR0ZXh0LCBpbnRsLCwpCisgZmkKKyAKKy0jIENoZWNrIGZvciBsaWJpY29u
 dl9vcGVuIGlmIHdlIGNhbid0IGZpbmQgaWNvbnZfb3Blbi4gU2lsbHkgT1MgWCBkb2VzCistIyB3
 ZWlyZCBtYWNybyBtYWdpYyBmb3IgdGhlIHNvbGUgcHVycG9zZSBvZiBhbXVzaW5nIG1lLgorLUFD
 X1NFQVJDSF9MSUJTKCBpY29udl9vcGVuLCBpY29udiwgLCBbQUNfU0VBUkNIX0xJQlMoIGxpYmlj
 b252X29wZW4sIGljb252LCAsIFtBQ19NU0dfRVJST1IoW0NvdWxkIG5vdCBmaW5kIGFuIGljb252
 IGltcGxlbWVudGF0aW9uLCBuZWVkZWQgdG8gYnVpbGQgZmlzaF0pXSApXSApCistCistTElCU19G
 SVNIPSRMSUJTCistTElCUz0kTElCU19DT01NT04KKy0KKy0jCistIyBDaGVjayBmb3IgbGlicmFy
 aWVzIG5lZWRlZCBieSBmaXNoX2luZGVudC4gCistIworLQorLUxJQlNfQ09NTU9OPSRMSUJTCist
 TElCUz0iJExJQlNfU0hBUkVEIgorLWlmIHRlc3QgeCRsb2NhbF9nZXR0ZXh0ICE9IHhubzsgdGhl
 biAKKy0JQUNfU0VBUkNIX0xJQlMoIGdldHRleHQsIGludGwsLCkKKy1maQorLUxJQlNfRklTSF9J
 TkRFTlQ9JExJQlMKKy1MSUJTPSRMSUJTX0NPTU1PTgorLQorLSMKKy0jIENoZWNrIGZvciBsaWJy
 YXJpZXMgbmVlZGVkIGJ5IGZpc2hfcGFnZXIuIAorLSMKKy0KKy1MSUJTX0NPTU1PTj0kTElCUwor
 LUxJQlM9IiRMSUJTX1NIQVJFRCIKKy1pZiB0ZXN0IHgkbG9jYWxfZ2V0dGV4dCAhPSB4bm87IHRo
 ZW4gCistCUFDX1NFQVJDSF9MSUJTKCBnZXR0ZXh0LCBpbnRsLCwpCistZmkKKy1BQ19TRUFSQ0hf
 TElCUyggaWNvbnZfb3BlbiwgaWNvbnYsICwgW0FDX01TR19FUlJPUihbQ291bGQgbm90IGZpbmQg
 YW4gaWNvbnYgaW1wbGVtZW50YXRpb24sIG5lZWRlZCB0byBidWlsZCBmaXNoXSldICkKKy1MSUJT
 X0ZJU0hfUEFHRVI9JExJQlMKKy1MSUJTPSRMSUJTX0NPTU1PTgorLQorLSMKKy0jIENoZWNrIGZv
 ciBsaWJyYXJpZXMgbmVlZGVkIGJ5IGZpc2hkLiAKKy0jCistCistTElCU19DT01NT049JExJQlMK
 Ky1MSUJTPSIkTElCU19TSEFSRUQiCistaWYgdGVzdCB4JGxvY2FsX2dldHRleHQgIT0geG5vOyB0
 aGVuIAorLQlBQ19TRUFSQ0hfTElCUyggZ2V0dGV4dCwgaW50bCwsKQorLWZpCistQUNfU0VBUkNI
 X0xJQlMoIGljb252X29wZW4sIGljb252LCAsIFtBQ19NU0dfRVJST1IoW0NvdWxkIG5vdCBmaW5k
 IGFuIGljb252IGltcGxlbWVudGF0aW9uLCBuZWVkZWQgdG8gYnVpbGQgZmlzaF0pXSApCistTElC
 U19GSVNIRD0kTElCUworLUxJQlM9JExJQlNfQ09NTU9OCistCistIworLSMgQ2hlY2sgZm9yIGxp
 YnJhcmllcyBuZWVkZWQgYnkgbWltZWRiLiAKKy0jCistCistTElCU19DT01NT049JExJQlMKKy1M
 SUJTPSIkTElCU19TSEFSRUQiCistaWYgdGVzdCB4JGxvY2FsX2dldHRleHQgIT0geG5vOyB0aGVu
 IAorLQlBQ19TRUFSQ0hfTElCUyggZ2V0dGV4dCwgaW50bCwsKQorLWZpCistTElCU19NSU1FREI9
 JExJQlMKKy1MSUJTPSRMSUJTX0NPTU1PTgorLQorLQorLSMKKy0jIENoZWNrIGZvciBsaWJyYXJp
 ZXMgbmVlZGVkIGJ5IHNldF9jb2xvciAKKy0jCistCistTElCU19DT01NT049JExJQlMKKy1MSUJT
 PSIkTElCU19TSEFSRUQiCistaWYgdGVzdCB4JGxvY2FsX2dldHRleHQgIT0geG5vOyB0aGVuIAor
 LQlBQ19TRUFSQ0hfTElCUyggZ2V0dGV4dCwgaW50bCwsKQogLWZpCi0rQUNfU1VCU1QoZG9jZGly
 LCBbJGRhdGFkaXIvZG9jL2Zpc2hdICkKKy1MSUJTX1NFVF9DT0xPUj0kTElCUworLUxJQlM9JExJ
 QlNfQ09NTU9OCiAgCisgIworICMgQ2hlY2sgcHJlc2Vuc2Ugb2YgdmFyaW91cyBoZWFkZXIgZmls
 ZXMKZGlmZiAtcnVOIGZpc2gub3JpZy9wa2ctcGxpc3QgZmlzaC9wa2ctcGxpc3QKLS0tIGZpc2gu
 b3JpZy9wa2ctcGxpc3QJMjAwOS0wOS0xNiAyMDowODoxNS4wMDAwMDAwMDAgLTA3MDAKKysrIGZp
 c2gvcGtnLXBsaXN0CTIwMDktMDktMTkgMTQ6NTU6MDUuMDAwMDAwMDAwIC0wNzAwCkBAIC0xLDI5
 ICsxLDI5IEBACi1iaW4vY291bnQKIGJpbi9maXNoCitiaW4vZmlzaF9pbmRlbnQKIGJpbi9maXNo
 X3BhZ2VyCiBiaW4vZmlzaGQKIGJpbi9taW1lZGIKIGJpbi9zZXEKIGJpbi9zZXRfY29sb3IKICUl
 WFNFTCUlYmluL3hzZWwKLWV0Yy9maXNoL2NvbmZpZy5maXNoCi1ldGMvZmlzaC9maXNoX2lucHV0
 cmMKLSUlRE9DU0RJUiUlL0NoYW5nZUxvZwotJSVET0NTRElSJSUvY29tbWFuZHMuaHRtbAotJSVE
 T0NTRElSJSUvZGVzaWduLmh0bWwKLSUlRE9DU0RJUiUlL2RvY184aC1zb3VyY2UuaHRtbAotJSVE
 T0NTRElSJSUvZG9jXzhoX3NvdXJjZS5odG1sCi0lJURPQ1NESVIlJS9kb3h5Z2VuLmNzcwotJSVE
 T0NTRElSJSUvZG94eWdlbi5wbmcKLSUlRE9DU0RJUiUlL2ZhcS5odG1sCi0lJURPQ1NESVIlJS9m
 aWxlcy5odG1sCi0lJURPQ1NESVIlJS9pbmRleC5odG1sCi0lJURPQ1NESVIlJS9saWNlbnNlLmh0
 bWwKLSUlRE9DU0RJUiUlL3BhZ2VzLmh0bWwKLSUlRE9DU0RJUiUlL3RhYl9iLmdpZgotJSVET0NT
 RElSJSUvdGFiX2wuZ2lmCi0lJURPQ1NESVIlJS90YWJfci5naWYKLSUlRE9DU0RJUiUlL3RhYnMu
 Y3NzCislJUVUQ0RJUiUlL2NvbmZpZy5maXNoCitzaGFyZS9kb2MvQ2hhbmdlTG9nCitzaGFyZS9k
 b2MvY29tbWFuZHMuaHRtbAorc2hhcmUvZG9jL2Rlc2lnbi5odG1sCitzaGFyZS9kb2MvZG9jXzho
 LXNvdXJjZS5odG1sCitzaGFyZS9kb2MvZG94eWdlbi5jc3MKK3NoYXJlL2RvYy9kb3h5Z2VuLnBu
 Zworc2hhcmUvZG9jL2ZhcS5odG1sCitzaGFyZS9kb2MvZmlsZXMuaHRtbAorc2hhcmUvZG9jL2lu
 ZGV4Lmh0bWwKK3NoYXJlL2RvYy9saWNlbnNlLmh0bWwKK3NoYXJlL2RvYy9wYWdlcy5odG1sCitz
 aGFyZS9kb2MvdGFiX2IuZ2lmCitzaGFyZS9kb2MvdGFiX2wuZ2lmCitzaGFyZS9kb2MvdGFiX3Iu
 Z2lmCitzaGFyZS9kb2MvdGFicy5jc3MKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL2FjcGkuZmlz
 aAorJSVEQVRBRElSJSUvY29tcGxldGlvbnMvYWRkdXNlci5maXNoCiAlJURBVEFESVIlJS9jb21w
 bGV0aW9ucy9hbmQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvYW50LmZpc2gKICUlREFU
 QURJUiUlL2NvbXBsZXRpb25zL2FwbS5maXNoCkBAIC01Niw5ICs1NiwxMiBAQAogJSVEQVRBRElS
 JSUvY29tcGxldGlvbnMvYXRkLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2F0cS5maXNo
 CiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9hdHJtLmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRp
 b25zL2F3ay5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9iYWRibG9ja3MuZmlzaAogJSVE
 QVRBRElSJSUvY29tcGxldGlvbnMvYmMuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvYmcu
 ZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvYmluZC5maXNoCislJURBVEFESVIlJS9jb21w
 bGV0aW9ucy9iaXNvbi5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9ibG9jay5maXNoCiAl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy9icmVhay5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9u
 cy9idGRvd25sb2FkY3Vyc2VzLnB5LmZpc2gKQEAgLTczLDYgKzc2LDcgQEAKICUlREFUQURJUiUl
 L2NvbXBsZXRpb25zL2NkLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2NkcmVjb3JkLmZp
 c2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2NoZ3JwLmZpc2gKKyUlREFUQURJUiUlL2NvbXBs
 ZXRpb25zL2NobW9kLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2Nob3duLmZpc2gKICUl
 REFUQURJUiUlL2NvbXBsZXRpb25zL2Noc2guZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMv
 Y29tbWFuZC5maXNoCkBAIC04MCw2ICs4NCw4IEBACiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9j
 b21wbGV0ZS5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9jb25maWd1cmUuZmlzaAogJSVE
 QVRBRElSJSUvY29tcGxldGlvbnMvY29udGludWUuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlv
 bnMvY293c2F5LmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL2Nvd3RoaW5rLmZpc2gKICUl
 REFUQURJUiUlL2NvbXBsZXRpb25zL2NwLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2N1
 dC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9jdnMuZmlzaApAQCAtOTIsNiArOTgsNyBA
 QAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZHZpcGRmLmZpc2gKICUlREFUQURJUiUlL2NvbXBs
 ZXRpb25zL2R2aXBkZm0uZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZWNoby5maXNoCisl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy9lZmZlY3R2LmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRp
 b25zL2VpeC1zeW5jLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2VpeC5maXNoCiAlJURB
 VEFESVIlJS9jb21wbGV0aW9ucy9lbGF0ZXguZmlzaApAQCAtMTAxLDIxICsxMDgsMjYgQEAKICUl
 REFUQURJUiUlL2NvbXBsZXRpb25zL2VxdWVyeS5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9u
 cy9ldGV4LmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2V2YWwuZmlzaAorJSVEQVRBRElS
 JSUvY29tcGxldGlvbnMvZXZpbmNlLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2V4ZWMu
 ZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZXhpdC5maXNoCiAlJURBVEFESVIlJS9jb21w
 bGV0aW9ucy9mZy5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9maWxlLmZpc2gKICUlREFU
 QURJUiUlL2NvbXBsZXRpb25zL2ZpbmQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZmlz
 aC5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9maXNoX2luZGVudC5maXNoCiAlJURBVEFE
 SVIlJS9jb21wbGV0aW9ucy9mbGFjLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2Z1bmN0
 aW9uLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL2Z1bmN0aW9ucy5maXNoCiAlJURBVEFE
 SVIlJS9jb21wbGV0aW9ucy9mdXNlcm1vdW50LmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25z
 L2djYy5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9nZGIuZmlzaAogJSVEQVRBRElSJSUv
 Y29tcGxldGlvbnMvZ2VtLmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL2dpdC5maXNoCiAl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy9ncGcuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMv
 Z3Byb2YuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZ3JlcC5maXNoCislJURBVEFESVIl
 JS9jb21wbGV0aW9ucy9ncm91cGFkZC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9ndW56
 aXAuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvZ3ppcC5maXNoCiAlJURBVEFESVIlJS9j
 b21wbGV0aW9ucy9oZWxwLmZpc2gKQEAgLTEyMyw2ICsxMzUsNyBAQAogJSVEQVRBRElSJSUvY29t
 cGxldGlvbnMvaWNvbnYuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvaWQuZmlzaAogJSVE
 QVRBRElSJSUvY29tcGxldGlvbnMvaWZjb25maWcuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlv
 bnMvaW52b2tlLXJjLmQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvam9icy5maXNoCiAl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy9raWxsLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25z
 L2xhLmZpc2gKQEAgLTEzMSwyMSArMTQ0LDI2IEBACiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9s
 bC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9sb2NhdGUuZmlzaAogJSVEQVRBRElSJSUv
 Y29tcGxldGlvbnMvbHMuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlvbnMvbTQuZmlzaAogJSVE
 QVRBRElSJSUvY29tcGxldGlvbnMvbWFrZS5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9t
 YWtlZGVwZW5kLmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL21ha2Vwa2cuZmlzaAogJSVE
 QVRBRElSJSUvY29tcGxldGlvbnMvbWFuLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL21p
 bWVkYi5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9tb2Rwcm9iZS5maXNoCiAlJURBVEFE
 SVIlJS9jb21wbGV0aW9ucy9tb3VudC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9tcGxh
 eWVyLmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL21zZ2ZtdC5maXNoCiAlJURBVEFESVIl
 JS9jb21wbGV0aW9ucy9tdXR0LmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL212LmZpc2gK
 KyUlREFUQURJUiUlL2NvbXBsZXRpb25zL25ldGNhdC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0
 aW9ucy9uZXh0ZC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9uaWNlLmZpc2gKICUlREFU
 QURJUiUlL2NvbXBsZXRpb25zL25vdC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9vZ2dl
 bmMuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvb21lZ2EuZmlzaAogJSVEQVRBRElSJSUv
 Y29tcGxldGlvbnMvb3IuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlvbnMvcGFjbWFuLmZpc2gK
 ICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3BhdGNoLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRp
 b25zL3BkZmVsYXRleC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9wZGZldGV4LmZpc2gK
 QEAgLTE1NCwxNCArMTcyLDIyIEBACiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9wZXJsLmZpc2gK
 ICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3BpbmUuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlv
 bnMvcGluZy5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9wa2dhZGQuZmlzaAorJSVEQVRB
 RElSJSUvY29tcGxldGlvbnMvcGtnaW5mby5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9w
 a2dtay5maXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9wa2dybS5maXNoCislJURBVEFESVIl
 JS9jb21wbGV0aW9ucy9wb3J0cy5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9wcmV2ZC5m
 aXNoCislJURBVEFESVIlJS9jb21wbGV0aW9ucy9wcnQtZ2V0LmZpc2gKICUlREFUQURJUiUlL2Nv
 bXBsZXRpb25zL3BzLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3BzMnBkZi5maXNoCiAl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy9wc3ViLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25z
 L3B1c2hkLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3B5dGhvbi5maXNoCislJURBVEFE
 SVIlJS9jb21wbGV0aW9ucy9xdWlsdC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9yYW5k
 b20uZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvcmVhZC5maXNoCislJURBVEFESVIlJS9j
 b21wbGV0aW9ucy9yZWptZXJnZS5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9yZW5pY2Uu
 ZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvcmV0dXJuLmZpc2gKICUlREFUQURJUiUlL2Nv
 bXBsZXRpb25zL3JtLmZpc2gKQEAgLTE2OSw2ICsxOTUsNyBAQAogJSVEQVRBRElSJSUvY29tcGxl
 dGlvbnMvcnBtLmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3JzeW5jLmZpc2gKICUlREFU
 QURJUiUlL2NvbXBsZXRpb25zL3J1YnkuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlvbnMvc2Nv
 bnMuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvc2NwLmZpc2gKICUlREFUQURJUiUlL2Nv
 bXBsZXRpb25zL3NjcmVlbi5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy9zZWQuZmlzaApA
 QCAtMjAwLDYgKzIyNyw3IEBACiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy91bnJhci5maXNoCiAl
 JURBVEFESVIlJS9jb21wbGV0aW9ucy91cGRhdGUtZWl4LXJlbW90ZS5maXNoCiAlJURBVEFESVIl
 JS9jb21wbGV0aW9ucy91cGRhdGUtZWl4LmZpc2gKKyUlREFUQURJUiUlL2NvbXBsZXRpb25zL3Vz
 ZXJhZGQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvdmFsZ3JpbmQuZmlzaAogJSVEQVRB
 RElSJSUvY29tcGxldGlvbnMvdmFyZWQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvdmku
 ZmlzaApAQCAtMjA3LDEyICsyMzUsMTQgQEAKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3cuZmlz
 aAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvd2FqaWcuZmlzaAogJSVEQVRBRElSJSUvY29tcGxl
 dGlvbnMvd2MuZmlzaAorJSVEQVRBRElSJSUvY29tcGxldGlvbnMvd2Vzbm90aC5maXNoCiAlJURB
 VEFESVIlJS9jb21wbGV0aW9ucy93Z2V0LmZpc2gKICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3do
 YXRpcy5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy93aGljaC5maXNoCiAlJURBVEFESVIl
 JS9jb21wbGV0aW9ucy93aG8uZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvd3BhX2NsaS5m
 aXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy94YXJncy5maXNoCislJURBVEFESVIlJS9jb21w
 bGV0aW9ucy94Z2V0dGV4dC5maXNoCiAlJURBVEFESVIlJS9jb21wbGV0aW9ucy94bW1zLmZpc2gK
 ICUlREFUQURJUiUlL2NvbXBsZXRpb25zL3hwZGYuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlv
 bnMveHByb3AuZmlzaApAQCAtMjIyLDE2ICsyNTIsMjIgQEAKICUlREFUQURJUiUlL2NvbXBsZXRp
 b25zL3pjYXQuZmlzaAogJSVEQVRBRElSJSUvY29tcGxldGlvbnMvemlwLmZpc2gKICUlREFUQURJ
 UiUlL2NvbmZpZy5maXNoCi0lJURBVEFESVIlJS9jb25maWdfaW50ZXJhY3RpdmUuZmlzaAogJSVE
 QVRBRElSJSUvZnVuY3Rpb25zL05fLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fLmZpc2gK
 ICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfYXBwZW5kLmZpc2gKKyUlREFUQURJUiUlL2Z1
 bmN0aW9ucy9fX2Zpc2hfYmluZF90ZXN0MS5maXNoCislJURBVEFESVIlJS9mdW5jdGlvbnMvX19m
 aXNoX2JpbmRfdGVzdDIuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21tYW5k
 bGluZV90ZXN0LmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfY29tcGxldGVfYW50
 X3RhcmdldHMuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV9iaXR0
 b3JyZW50LmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfY29tcGxldGVfY2QuZmlz
 aAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV9jb21tYW5kLmZpc2gKICUl
 REFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfY29tcGxldGVfZGlyZWN0b3JpZXMuZmlzaAorJSVE
 QVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV9maWxlX3VybC5maXNoCislJURBVEFE
 SVIlJS9mdW5jdGlvbnMvX19maXNoX2NvbXBsZXRlX2dyb3Vwcy5maXNoCiAlJURBVEFESVIlJS9m
 dW5jdGlvbnMvX19maXNoX2NvbXBsZXRlX2xzLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9f
 X2Zpc2hfY29tcGxldGVfbWFuLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfY29t
 cGxldGVfbWltZS5maXNoCiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX2NvbXBsZXRlX3Bp
 ZHMuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV9zc2guZmlzaAog
 JSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV9zdWJjb21tYW5kLmZpc2gKQEAg
 LTI0MCwzMCArMjc2LDUzIEBACiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX2NvbXBsZXRl
 X3Rhci5maXNoCiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX2NvbXBsZXRlX3RleC5maXNo
 CiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX2NvbXBsZXRlX3VucmFyLmZpc2gKKyUlREFU
 QURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfY29tcGxldGVfdXNlcnMuZmlzaAogJSVEQVRBRElSJSUv
 ZnVuY3Rpb25zL19fZmlzaF9jb21wbGV0ZV92aS5maXNoCislJURBVEFESVIlJS9mdW5jdGlvbnMv
 X19maXNoX2NvbmZpZ19pbnRlcmFjdGl2ZS5maXNoCiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19m
 aXNoX2NvbnRhaW5zX29wdC5maXNoCislJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX2NydXhf
 cGFja2FnZXMuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9kZXNjcmliZV9jb21t
 YW5kLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfZmlsdGVyX2FudF90YXJnZXRz
 LmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfZmlsdGVyX21pbWUuZmlzaAorJSVE
 QVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9naXRfYnJhbmNoX3Byb21wdC5maXNoCiAlJURBVEFE
 SVIlJS9mdW5jdGlvbnMvX19maXNoX2dudV9jb21wbGV0ZS5maXNoCiAlJURBVEFESVIlJS9mdW5j
 dGlvbnMvX19maXNoX2lzX2ZpcnN0X3Rva2VuLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9f
 X2Zpc2hfbGlzdF9jdXJyZW50X3Rva2VuLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zp
 c2hfbW92ZV9sYXN0LmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfbm9fYXJndW1l
 bnRzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfbm90X2NvbnRhaW5fb3B0LmZp
 c2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfcGFnaW5hdGUuZmlzaAorJSVEQVRBRElS
 JSUvZnVuY3Rpb25zL19fZmlzaF9wb3J0c19kaXJzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9u
 cy9fX2Zpc2hfcHJpbnRfYWRkcmVzc2VzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zp
 c2hfcHJpbnRfZGViaWFuX3NlcnZpY2VzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zp
 c2hfcHJpbnRfZW5jb2RpbmdzLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfcHJp
 bnRfZmlsZXN5c3RlbXMuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9wcmludF9m
 dW5jdGlvbl9wcm90b3R5cGVzLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9fX2Zpc2hfcHJp
 bnRfaGVscC5maXNoCiAlJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX3ByaW50X2hvc3RuYW1l
 cy5maXNoCislJURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX3ByaW50X2ludGVyZmFjZXMuZmlz
 aAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9wcmludF9tYWtlX3RhcmdldHMuZmlzaAog
 JSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9wcmludF9wYWNrYWdlcy5maXNoCislJURBVEFE
 SVIlJS9mdW5jdGlvbnMvX19maXNoX3ByaW50X3VzZXJzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0
 aW9ucy9fX2Zpc2hfcHJ0X25vX3N1YmNvbW1hbmQuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25z
 L19fZmlzaF9wcnRfcGFja2FnZXMuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9w
 cnRfcG9ydHMuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9wcnRfdXNlX3BhY2th
 Z2UuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9wcnRfdXNlX3BvcnQuZmlzaAog
 JSVEQVRBRElSJSUvZnVuY3Rpb25zL19fZmlzaF9zZWVuX3N1YmNvbW1hbmRfZnJvbS5maXNoCiAl
 JURBVEFESVIlJS9mdW5jdGlvbnMvX19maXNoX3Rlc3RfYXJnLmZpc2gKICUlREFUQURJUiUlL2Z1
 bmN0aW9ucy9fX2Zpc2hfdXNlX3N1YmNvbW1hbmQuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25z
 L2FsaWFzLmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9jZC5maXNoCi0lJURBVEFESVIlJS9m
 dW5jdGlvbnMvY29udGFpbnMuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL2RlbGV0ZS1vci1l
 eGl0LmZpc2gKICUlREFUQURJUiUlL2Z1bmN0aW9ucy9kaXJoLmZpc2gKICUlREFUQURJUiUlL2Z1
 bmN0aW9ucy9kaXJzLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy9kb3duLW9yLXNlYXJjaC5m
 aXNoCislJURBVEFESVIlJS9mdW5jdGlvbnMvZXZhbC5maXNoCislJURBVEFESVIlJS9mdW5jdGlv
 bnMvZmlzaF9kZWZhdWx0X2tleV9iaW5kaW5ncy5maXNoCiAlJURBVEFESVIlJS9mdW5jdGlvbnMv
 ZmlzaF9wcm9tcHQuZmlzaAorJSVEQVRBRElSJSUvZnVuY3Rpb25zL2Z1bmNlZC5maXNoCislJURB
 VEFESVIlJS9mdW5jdGlvbnMvZnVuY3NhdmUuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL2dy
 ZXAuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL2hlbHAuZmlzaAogJSVEQVRBRElSJSUvZnVu
 Y3Rpb25zL2lzYXR0eS5maXNoCkBAIC0yODEsMTIgKzM0MCwxMiBAQAogJSVEQVRBRElSJSUvZnVu
 Y3Rpb25zL3BzdWIuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL3B1c2hkLmZpc2gKICUlREFU
 QURJUiUlL2Z1bmN0aW9ucy9wd2QuZmlzaAotJSVEQVRBRElSJSUvZnVuY3Rpb25zL3NhdmVfZnVu
 Y3Rpb24uZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL3NldGVudi5maXNoCiAlJURBVEFESVIl
 JS9mdW5jdGlvbnMvc2dyZXAuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL3RyYXAuZmlzaAog
 JSVEQVRBRElSJSUvZnVuY3Rpb25zL3R5cGUuZmlzaAogJSVEQVRBRElSJSUvZnVuY3Rpb25zL3Vt
 YXNrLmZpc2gKKyUlREFUQURJUiUlL2Z1bmN0aW9ucy91cC1vci1zZWFyY2guZmlzaAogJSVEQVRB
 RElSJSUvZnVuY3Rpb25zL3ZhcmVkLmZpc2gKICUlTkxTJSVzaGFyZS9sb2NhbGUvZGUvTENfTUVT
 U0FHRVMvZmlzaC5tbwogJSVOTFMlJXNoYXJlL2xvY2FsZS9lbi9MQ19NRVNTQUdFUy9maXNoLm1v
 CkBAIC0yOTUsNyArMzU0LDYgQEAKIEBkaXJybSAlJURBVEFESVIlJS9mdW5jdGlvbnMKIEBkaXJy
 bSAlJURBVEFESVIlJS9jb21wbGV0aW9ucwogQGRpcnJtICUlREFUQURJUiUlCi1AZGlycm0gJSVE
 T0NTRElSJSUKLUBkaXJybSBldGMvZmlzaAorQGRpcnJtICUlRVRDRElSJSUKIEBleGVjIGNwIC9l
 dGMvc2hlbGxzIC9ldGMvc2hlbGxzLmJhazsgKGdyZXAgLXYgJUQvYmluL2Zpc2ggL2V0Yy9zaGVs
 bHMuYmFrOyBlY2hvICVEL2Jpbi9maXNoKSA+IC9ldGMvc2hlbGxzOyBybSAtZiAvZXRjL3NoZWxs
 cy5iYWsKIEB1bmV4ZWMgY3AgL2V0Yy9zaGVsbHMgL2V0Yy9zaGVsbHMuYmFrOyAoZ3JlcCAtdiAl
 RC9iaW4vZmlzaCAvZXRjL3NoZWxscy5iYWspID4gL2V0Yy9zaGVsbHM7IHJtIC1mIC9ldGMvc2hl
 bGxzLmJhawo=
 --00c09f8e5be4a133fd0473f56cfe--

From: Rob Farmer <rfarmer@predatorlabs.net>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/138958: [patch] update shells/fish to 1.23.1
Date: Sat, 19 Sep 2009 15:47:42 -0700

 --WIyZ46R2i8wDzkSu
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Sat, 19 Sep 2009 at 08:19:42 PM +0000, linimon@FreeBSD.org wrote:
 
 Hopefully non messed up version of the patch.
 
 
 --WIyZ46R2i8wDzkSu
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 diff -ruN fish.orig/Makefile fish/Makefile
 --- fish.orig/Makefile	2009-09-16 20:08:15.000000000 -0700
 +++ fish/Makefile	2009-09-19 14:55:05.000000000 -0700
 @@ -6,14 +6,11 @@
  #
  
  PORTNAME=	fish
 -PORTVERSION=	1.22.3
 -PORTREVISION=	4
 +PORTVERSION=	1.23.1
  CATEGORIES=	shells
 -MASTER_SITES=	http://www.fishshell.org/files/1.22.3/ \
 -		http://roo.no-ip.org/fish/files/1.22.3/ \
 -		http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
 +MASTER_SITES=	SF
  
 -MAINTAINER=	kaiw27@gmail.com
 +MAINTAINER=	rfarmer@predatorlabs.net
  COMMENT=	A user friendly command line shell
  
  USE_AUTOTOOLS=	autoconf:262
 @@ -30,18 +27,18 @@
  OPTIONS=	NLS	"Native language support"	on \
  		XSEL	"Build with xsel"		on
  
 -MAN1=		count.1 fish.1 fish_pager.1 fishd.1 \
 -		mimedb.1 set_color.1 alias.1 and.1 begin.1 \
 -		bg.1 bind.1 block.1 break.1 builtin.1 \
 -		case.1 cd.1 command.1 commandline.1 complete.1 \
 -		contains.1 continue.1 dirh.1 dirs.1 else.1 \
 -		end.1 eval.1 exec.1 exit.1 fg.1 for.1 \
 -		function.1 functions.1 help.1 if.1 isatty.1 \
 -		jobs.1 math.1 nextd.1 not.1 open.1 or.1 \
 -		popd.1 prevd.1 psub.1 pushd.1 random.1 \
 -		read.1 return.1 save_function.1 set.1 \
 -		source.1 status.1 switch.1 trap.1 type.1 \
 -		ulimit.1 umask.1 vared.1 while.1
 +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
  
  .include <bsd.port.pre.mk>
  
 @@ -66,10 +63,6 @@
  .if !defined(WITHOUT_XSEL)
  	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1
  .endif
 -# remove duplicate manpages
 -.for i in count.1 fish.1 fish_pager.1 fishd.1 mimedb.1 set_color.1
 -	cd ${DATADIR}/man && ${RM} -f ${i}
 -.endfor
  	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
  	${RM} -rf ${DATADIR}/man
  	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
 diff -ruN fish.orig/distinfo fish/distinfo
 --- fish.orig/distinfo	2009-09-16 20:08:15.000000000 -0700
 +++ fish/distinfo	2009-09-19 14:55:05.000000000 -0700
 @@ -1,3 +1,3 @@
 -MD5 (fish-1.22.3.tar.gz) = 088a977e08c5026bbad300e56dcb6ac3
 -SHA256 (fish-1.22.3.tar.gz) = 5d55d90fed997762cb42ac002eedbd5b156af21f4b0c93a579415ff62fb60769
 -SIZE (fish-1.22.3.tar.gz) = 1045212
 +MD5 (fish-1.23.1.tar.gz) = 4b2436843e63bebba467cc4add11428a
 +SHA256 (fish-1.23.1.tar.gz) = a7f2890b0112d57b4760975f3d8f8c7e0cd240edcb2b3a87b5d66744a8deaf64
 +SIZE (fish-1.23.1.tar.gz) = 1152997
 diff -ruN fish.orig/files/patch-configure.ac fish/files/patch-configure.ac
 --- fish.orig/files/patch-configure.ac	2009-09-16 20:08:15.000000000 -0700
 +++ fish/files/patch-configure.ac	2009-09-19 14:55:05.000000000 -0700
 @@ -1,13 +1,118 @@
 ---- configure.ac.orig	2007-02-08 09:38:58.000000000 -0800
 -+++ configure.ac	2007-09-22 18:29:24.000000000 -0700
 -@@ -412,9 +412,3 @@
 +--- 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
 --	AC_SUBST(docdir, [$datadir/doc/fish] )
 +-	docdir=$datadir/doc/fish
  -else
 --	AC_SUBST(docdir, [$docdir])
 +-	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
 -+AC_SUBST(docdir, [$datadir/doc/fish] )
 +-LIBS_SET_COLOR=$LIBS
 +-LIBS=$LIBS_COMMON
   
 + #
 + # Check presense of various header files
 diff -ruN fish.orig/pkg-plist fish/pkg-plist
 --- fish.orig/pkg-plist	2009-09-16 20:08:15.000000000 -0700
 +++ fish/pkg-plist	2009-09-19 14:55:05.000000000 -0700
 @@ -1,29 +1,29 @@
 -bin/count
  bin/fish
 +bin/fish_indent
  bin/fish_pager
  bin/fishd
  bin/mimedb
  bin/seq
  bin/set_color
  %%XSEL%%bin/xsel
 -etc/fish/config.fish
 -etc/fish/fish_inputrc
 -%%DOCSDIR%%/ChangeLog
 -%%DOCSDIR%%/commands.html
 -%%DOCSDIR%%/design.html
 -%%DOCSDIR%%/doc_8h-source.html
 -%%DOCSDIR%%/doc_8h_source.html
 -%%DOCSDIR%%/doxygen.css
 -%%DOCSDIR%%/doxygen.png
 -%%DOCSDIR%%/faq.html
 -%%DOCSDIR%%/files.html
 -%%DOCSDIR%%/index.html
 -%%DOCSDIR%%/license.html
 -%%DOCSDIR%%/pages.html
 -%%DOCSDIR%%/tab_b.gif
 -%%DOCSDIR%%/tab_l.gif
 -%%DOCSDIR%%/tab_r.gif
 -%%DOCSDIR%%/tabs.css
 +%%ETCDIR%%/config.fish
 +share/doc/ChangeLog
 +share/doc/commands.html
 +share/doc/design.html
 +share/doc/doc_8h-source.html
 +share/doc/doxygen.css
 +share/doc/doxygen.png
 +share/doc/faq.html
 +share/doc/files.html
 +share/doc/index.html
 +share/doc/license.html
 +share/doc/pages.html
 +share/doc/tab_b.gif
 +share/doc/tab_l.gif
 +share/doc/tab_r.gif
 +share/doc/tabs.css
 +%%DATADIR%%/completions/acpi.fish
 +%%DATADIR%%/completions/adduser.fish
  %%DATADIR%%/completions/and.fish
  %%DATADIR%%/completions/ant.fish
  %%DATADIR%%/completions/apm.fish
 @@ -56,9 +56,12 @@
  %%DATADIR%%/completions/atd.fish
  %%DATADIR%%/completions/atq.fish
  %%DATADIR%%/completions/atrm.fish
 +%%DATADIR%%/completions/awk.fish
 +%%DATADIR%%/completions/badblocks.fish
  %%DATADIR%%/completions/bc.fish
  %%DATADIR%%/completions/bg.fish
  %%DATADIR%%/completions/bind.fish
 +%%DATADIR%%/completions/bison.fish
  %%DATADIR%%/completions/block.fish
  %%DATADIR%%/completions/break.fish
  %%DATADIR%%/completions/btdownloadcurses.py.fish
 @@ -73,6 +76,7 @@
  %%DATADIR%%/completions/cd.fish
  %%DATADIR%%/completions/cdrecord.fish
  %%DATADIR%%/completions/chgrp.fish
 +%%DATADIR%%/completions/chmod.fish
  %%DATADIR%%/completions/chown.fish
  %%DATADIR%%/completions/chsh.fish
  %%DATADIR%%/completions/command.fish
 @@ -80,6 +84,8 @@
  %%DATADIR%%/completions/complete.fish
  %%DATADIR%%/completions/configure.fish
  %%DATADIR%%/completions/continue.fish
 +%%DATADIR%%/completions/cowsay.fish
 +%%DATADIR%%/completions/cowthink.fish
  %%DATADIR%%/completions/cp.fish
  %%DATADIR%%/completions/cut.fish
  %%DATADIR%%/completions/cvs.fish
 @@ -92,6 +98,7 @@
  %%DATADIR%%/completions/dvipdf.fish
  %%DATADIR%%/completions/dvipdfm.fish
  %%DATADIR%%/completions/echo.fish
 +%%DATADIR%%/completions/effectv.fish
  %%DATADIR%%/completions/eix-sync.fish
  %%DATADIR%%/completions/eix.fish
  %%DATADIR%%/completions/elatex.fish
 @@ -101,21 +108,26 @@
  %%DATADIR%%/completions/equery.fish
  %%DATADIR%%/completions/etex.fish
  %%DATADIR%%/completions/eval.fish
 +%%DATADIR%%/completions/evince.fish
  %%DATADIR%%/completions/exec.fish
  %%DATADIR%%/completions/exit.fish
  %%DATADIR%%/completions/fg.fish
  %%DATADIR%%/completions/file.fish
  %%DATADIR%%/completions/find.fish
  %%DATADIR%%/completions/fish.fish
 +%%DATADIR%%/completions/fish_indent.fish
  %%DATADIR%%/completions/flac.fish
  %%DATADIR%%/completions/function.fish
  %%DATADIR%%/completions/functions.fish
  %%DATADIR%%/completions/fusermount.fish
  %%DATADIR%%/completions/gcc.fish
 +%%DATADIR%%/completions/gdb.fish
  %%DATADIR%%/completions/gem.fish
 +%%DATADIR%%/completions/git.fish
  %%DATADIR%%/completions/gpg.fish
  %%DATADIR%%/completions/gprof.fish
  %%DATADIR%%/completions/grep.fish
 +%%DATADIR%%/completions/groupadd.fish
  %%DATADIR%%/completions/gunzip.fish
  %%DATADIR%%/completions/gzip.fish
  %%DATADIR%%/completions/help.fish
 @@ -123,6 +135,7 @@
  %%DATADIR%%/completions/iconv.fish
  %%DATADIR%%/completions/id.fish
  %%DATADIR%%/completions/ifconfig.fish
 +%%DATADIR%%/completions/invoke-rc.d.fish
  %%DATADIR%%/completions/jobs.fish
  %%DATADIR%%/completions/kill.fish
  %%DATADIR%%/completions/la.fish
 @@ -131,21 +144,26 @@
  %%DATADIR%%/completions/ll.fish
  %%DATADIR%%/completions/locate.fish
  %%DATADIR%%/completions/ls.fish
 +%%DATADIR%%/completions/m4.fish
  %%DATADIR%%/completions/make.fish
  %%DATADIR%%/completions/makedepend.fish
 +%%DATADIR%%/completions/makepkg.fish
  %%DATADIR%%/completions/man.fish
  %%DATADIR%%/completions/mimedb.fish
  %%DATADIR%%/completions/modprobe.fish
  %%DATADIR%%/completions/mount.fish
  %%DATADIR%%/completions/mplayer.fish
 +%%DATADIR%%/completions/msgfmt.fish
  %%DATADIR%%/completions/mutt.fish
  %%DATADIR%%/completions/mv.fish
 +%%DATADIR%%/completions/netcat.fish
  %%DATADIR%%/completions/nextd.fish
  %%DATADIR%%/completions/nice.fish
  %%DATADIR%%/completions/not.fish
  %%DATADIR%%/completions/oggenc.fish
  %%DATADIR%%/completions/omega.fish
  %%DATADIR%%/completions/or.fish
 +%%DATADIR%%/completions/pacman.fish
  %%DATADIR%%/completions/patch.fish
  %%DATADIR%%/completions/pdfelatex.fish
  %%DATADIR%%/completions/pdfetex.fish
 @@ -154,14 +172,22 @@
  %%DATADIR%%/completions/perl.fish
  %%DATADIR%%/completions/pine.fish
  %%DATADIR%%/completions/ping.fish
 +%%DATADIR%%/completions/pkgadd.fish
 +%%DATADIR%%/completions/pkginfo.fish
 +%%DATADIR%%/completions/pkgmk.fish
 +%%DATADIR%%/completions/pkgrm.fish
 +%%DATADIR%%/completions/ports.fish
  %%DATADIR%%/completions/prevd.fish
 +%%DATADIR%%/completions/prt-get.fish
  %%DATADIR%%/completions/ps.fish
  %%DATADIR%%/completions/ps2pdf.fish
  %%DATADIR%%/completions/psub.fish
  %%DATADIR%%/completions/pushd.fish
  %%DATADIR%%/completions/python.fish
 +%%DATADIR%%/completions/quilt.fish
  %%DATADIR%%/completions/random.fish
  %%DATADIR%%/completions/read.fish
 +%%DATADIR%%/completions/rejmerge.fish
  %%DATADIR%%/completions/renice.fish
  %%DATADIR%%/completions/return.fish
  %%DATADIR%%/completions/rm.fish
 @@ -169,6 +195,7 @@
  %%DATADIR%%/completions/rpm.fish
  %%DATADIR%%/completions/rsync.fish
  %%DATADIR%%/completions/ruby.fish
 +%%DATADIR%%/completions/scons.fish
  %%DATADIR%%/completions/scp.fish
  %%DATADIR%%/completions/screen.fish
  %%DATADIR%%/completions/sed.fish
 @@ -200,6 +227,7 @@
  %%DATADIR%%/completions/unrar.fish
  %%DATADIR%%/completions/update-eix-remote.fish
  %%DATADIR%%/completions/update-eix.fish
 +%%DATADIR%%/completions/useradd.fish
  %%DATADIR%%/completions/valgrind.fish
  %%DATADIR%%/completions/vared.fish
  %%DATADIR%%/completions/vi.fish
 @@ -207,12 +235,14 @@
  %%DATADIR%%/completions/w.fish
  %%DATADIR%%/completions/wajig.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/wpa_cli.fish
  %%DATADIR%%/completions/xargs.fish
 +%%DATADIR%%/completions/xgettext.fish
  %%DATADIR%%/completions/xmms.fish
  %%DATADIR%%/completions/xpdf.fish
  %%DATADIR%%/completions/xprop.fish
 @@ -222,16 +252,22 @@
  %%DATADIR%%/completions/zcat.fish
  %%DATADIR%%/completions/zip.fish
  %%DATADIR%%/config.fish
 -%%DATADIR%%/config_interactive.fish
  %%DATADIR%%/functions/N_.fish
  %%DATADIR%%/functions/_.fish
  %%DATADIR%%/functions/__fish_append.fish
 +%%DATADIR%%/functions/__fish_bind_test1.fish
 +%%DATADIR%%/functions/__fish_bind_test2.fish
 +%%DATADIR%%/functions/__fish_commandline_test.fish
  %%DATADIR%%/functions/__fish_complete_ant_targets.fish
  %%DATADIR%%/functions/__fish_complete_bittorrent.fish
  %%DATADIR%%/functions/__fish_complete_cd.fish
 +%%DATADIR%%/functions/__fish_complete_command.fish
  %%DATADIR%%/functions/__fish_complete_directories.fish
 +%%DATADIR%%/functions/__fish_complete_file_url.fish
 +%%DATADIR%%/functions/__fish_complete_groups.fish
  %%DATADIR%%/functions/__fish_complete_ls.fish
  %%DATADIR%%/functions/__fish_complete_man.fish
 +%%DATADIR%%/functions/__fish_complete_mime.fish
  %%DATADIR%%/functions/__fish_complete_pids.fish
  %%DATADIR%%/functions/__fish_complete_ssh.fish
  %%DATADIR%%/functions/__fish_complete_subcommand.fish
 @@ -240,30 +276,53 @@
  %%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_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_gnu_complete.fish
  %%DATADIR%%/functions/__fish_is_first_token.fish
  %%DATADIR%%/functions/__fish_list_current_token.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_addresses.fish
 +%%DATADIR%%/functions/__fish_print_debian_services.fish
 +%%DATADIR%%/functions/__fish_print_encodings.fish
  %%DATADIR%%/functions/__fish_print_filesystems.fish
  %%DATADIR%%/functions/__fish_print_function_prototypes.fish
  %%DATADIR%%/functions/__fish_print_help.fish
  %%DATADIR%%/functions/__fish_print_hostnames.fish
 +%%DATADIR%%/functions/__fish_print_interfaces.fish
 +%%DATADIR%%/functions/__fish_print_make_targets.fish
  %%DATADIR%%/functions/__fish_print_packages.fish
 +%%DATADIR%%/functions/__fish_print_users.fish
 +%%DATADIR%%/functions/__fish_prt_no_subcommand.fish
 +%%DATADIR%%/functions/__fish_prt_packages.fish
 +%%DATADIR%%/functions/__fish_prt_ports.fish
 +%%DATADIR%%/functions/__fish_prt_use_package.fish
 +%%DATADIR%%/functions/__fish_prt_use_port.fish
  %%DATADIR%%/functions/__fish_seen_subcommand_from.fish
  %%DATADIR%%/functions/__fish_test_arg.fish
  %%DATADIR%%/functions/__fish_use_subcommand.fish
  %%DATADIR%%/functions/alias.fish
  %%DATADIR%%/functions/cd.fish
 -%%DATADIR%%/functions/contains.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_default_key_bindings.fish
  %%DATADIR%%/functions/fish_prompt.fish
 +%%DATADIR%%/functions/funced.fish
 +%%DATADIR%%/functions/funcsave.fish
  %%DATADIR%%/functions/grep.fish
  %%DATADIR%%/functions/help.fish
  %%DATADIR%%/functions/isatty.fish
 @@ -281,12 +340,12 @@
  %%DATADIR%%/functions/psub.fish
  %%DATADIR%%/functions/pushd.fish
  %%DATADIR%%/functions/pwd.fish
 -%%DATADIR%%/functions/save_function.fish
  %%DATADIR%%/functions/setenv.fish
  %%DATADIR%%/functions/sgrep.fish
  %%DATADIR%%/functions/trap.fish
  %%DATADIR%%/functions/type.fish
  %%DATADIR%%/functions/umask.fish
 +%%DATADIR%%/functions/up-or-search.fish
  %%DATADIR%%/functions/vared.fish
  %%NLS%%share/locale/de/LC_MESSAGES/fish.mo
  %%NLS%%share/locale/en/LC_MESSAGES/fish.mo
 @@ -295,7 +354,6 @@
  @dirrm %%DATADIR%%/functions
  @dirrm %%DATADIR%%/completions
  @dirrm %%DATADIR%%
 -@dirrm %%DOCSDIR%%
 -@dirrm etc/fish
 +@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
 
 --WIyZ46R2i8wDzkSu--

From: Rob Farmer <rfarmer@predatorlabs.net>
To: bug-followup@FreeBSD.org, rfarmer@predatorlabs.net
Cc:  
Subject: Re: ports/138958: [patch] update shells/fish to 1.23.1
Date: Sun, 20 Sep 2009 14:29:35 -0700

 Since gmail keeps messing up my attachments, updated patch is at:
 http://students.washington.edu/rfarmer/patch.txt
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Sep 21 11:35:51 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138958 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138958: commit references a PR
Date: Mon, 21 Sep 2009 11:35:46 +0000 (UTC)

 miwi        2009-09-21 11:35:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     shells/fish          Makefile distinfo pkg-plist 
     shells/fish/files    patch-configure.ac 
   Log:
   - Update to 1.23.1
   - Pass maintainership to submitter
   
   PR:             138958
   Submitted by:   Rob Farmer <rfarmer@predatorlabs.net>
   Approved by:    maintainer
   Feature safe:   yes
   
   Revision  Changes    Path
   1.7       +15 -22    ports/shells/fish/Makefile
   1.2       +3 -3      ports/shells/fish/distinfo
   1.2       +111 -6    ports/shells/fish/files/patch-configure.ac
   1.3       +82 -24    ports/shells/fish/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
