Attachment #99778 for bug #138958

View | Details | Raw Unified | Return to bug 138958
Collapse All | Expand All




#

PORTNAME=	fish
PORTVERSION=	1.23.1
PORTREVISION=	4
CATEGORIES=	shells
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

OPTIONS=	NLS	"Native language support"	on \
		XSEL	"Build with xsel"		on

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>


.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 \

Lines 1-3 Link Here

(-)fish/distinfo (-3 / +3 lines)
1	MD5 (fish-1.22.3.tar.gz) = 088a977e08c5026bbad300e56dcb6ac3	1	MD5 (fish-1.23.1.tar.gz) = 4b2436843e63bebba467cc4add11428a
2	SHA256 (fish-1.22.3.tar.gz) = 5d55d90fed997762cb42ac002eedbd5b156af21f4b0c93a579415ff62fb60769	2	SHA256 (fish-1.23.1.tar.gz) = a7f2890b0112d57b4760975f3d8f8c7e0cd240edcb2b3a87b5d66744a8deaf64
3	SIZE (fish-1.22.3.tar.gz) = 1045212	3	SIZE (fish-1.23.1.tar.gz) = 1152997




--- 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




bin/count
bin/fish
bin/fish_indent
bin/fish_pager
bin/fishd
bin/mimedb
bin/seq
bin/set_color
%%XSEL%%bin/xsel
%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

%%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

@dirrm %%DATADIR%%/functions
@dirrm %%DATADIR%%/completions
@dirrm %%DATADIR%%
@dirrm %%ETCDIR%%
@dirrm etc/fish
@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

Return to bug 138958

Lines 6-16 Link Here

(-)fish/Makefile (-20 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= fish	8	PORTNAME= fish
9	PORTVERSION= 1.22.3	9	PORTVERSION= 1.23.1
10	PORTREVISION= 4
11	CATEGORIES= shells	10	CATEGORIES= shells
12	MASTER_SITES= http://www.fishshell.org/files/1.22.3/ \	11	MASTER_SITES= http://www.fishshell.org/files/${PORTVERSION}/ \
13	http://roo.no-ip.org/fish/files/1.22.3/ \	12	http://roo.no-ip.org/fish/files/${PORTVERSION}/ \
14	http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/	13	http://web.student.chalmers.se/~kaiw/FreeBSD/disfiles/
15		14
16	MAINTAINER= kaiw27@gmail.com	15	MAINTAINER= kaiw27@gmail.com
Lines 30-47 Link Here
30	OPTIONS= NLS "Native language support" on \	29	OPTIONS= NLS "Native language support" on \
31	XSEL "Build with xsel" on	30	XSEL "Build with xsel" on
32		31
33	MAN1= count.1 fish.1 fish_pager.1 fishd.1 \	32	MAN1= alias.1 and.1 begin.1 bg.1 bind.1 block.1 \
34	mimedb.1 set_color.1 alias.1 and.1 begin.1 \	33	break.1 breakpoint.1 builtin.1 case.1 cd.1 \
35	bg.1 bind.1 block.1 break.1 builtin.1 \	34	command.1 commandline.1 complete.1 contains.1 \
36	case.1 cd.1 command.1 commandline.1 complete.1 \	35	continue.1 count.1 dirh.1 dirs.1 else.1 \
37	contains.1 continue.1 dirh.1 dirs.1 else.1 \	36	emit.1 end.1 eval.1 exec.1 exit.1 fg.1 fish.1 \
38	end.1 eval.1 exec.1 exit.1 fg.1 for.1 \	37	fish_indent.1 fish_pager.1 fish_prompt.1 \
39	function.1 functions.1 help.1 if.1 isatty.1 \	38	fishd.1 for.1 funced.1 funcsave.1 function.1 \
40	jobs.1 math.1 nextd.1 not.1 open.1 or.1 \	39	functions.1 help.1 if.1 isatty.1 jobs.1 math.1 \
41	popd.1 prevd.1 psub.1 pushd.1 random.1 \	40	mimedb.1 nextd.1 not.1 open.1 or.1 popd.1 \
42	read.1 return.1 save_function.1 set.1 \	41	prevd.1 psub.1 pushd.1 random.1 read.1 return.1 \
43	source.1 status.1 switch.1 trap.1 type.1 \	42	set.1 set_color.1 source.1 status.1 switch.1 \
44	ulimit.1 umask.1 vared.1 while.1	43	trap.1 type.1 ulimit.1 umask.1 vared.1 while.1
45		44
46	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
47		46
Lines 66-75 Link Here
66	.if !defined(WITHOUT_XSEL)	65	.if !defined(WITHOUT_XSEL)
67	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1	66	${MV} ${PREFIX}/man/man1/xsel.1x ${PREFIX}/man/man1/xsel.1
68	.endif	67	.endif
69	# remove duplicate manpages
70	.for i in count.1 fish.1 fish_pager.1 fishd.1 mimedb.1 set_color.1
71	cd ${DATADIR}/man && ${RM} -f ${i}
72	.endfor
73	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/	68	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/
74	${RM} -rf ${DATADIR}/man	69	${RM} -rf ${DATADIR}/man
75	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \	70	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \

Lines 1-13 Link Here

(-)fish/files/patch-configure.ac (-6 / +111 lines)
1	--- configure.ac.orig 2007-02-08 09:38:58.000000000 -0800	1	--- configure.ac.orig 2009-03-08 07:46:47.000000000 -0700
2	+++ configure.ac 2007-09-22 18:29:24.000000000 -0700	2	+++ configure.ac 2009-09-18 21:28:07.000000000 -0700
3	@@ -412,9 +412,3 @@	3	@@ -451,20 +451,6 @@
4		4
		5
		6	#
		7	-# Set up the directory where the documentation files should be
		8	-# installed
		9	-#
		10	-
5	-AC_ARG_VAR( [docdir], [Documentation direcotry] )	11	-AC_ARG_VAR( [docdir], [Documentation direcotry] )
6	-	12	-
7	-if test -z $docdir; then	13	-if test -z $docdir; then
8	- AC_SUBST(docdir, [$datadir/doc/fish] )	14	- docdir=$datadir/doc/fish
9	-else	15	-else
10	- AC_SUBST(docdir, [$docdir])	16	- docdir=$docdir
		17	-fi
		18	-
		19	-
		20	-#
		21	# Set up locale directory. This is where the .po files will be
		22	# installed.
		23	#
		24	@@ -500,94 +486,19 @@
		25	#
		26
		27	# Check for os dependant libraries for all binaries.
		28	-LIBS_COMMON=$LIBS
		29	-LIBS=""
		30	AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
		31	AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
		32	AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
		33	AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
		34	-LIBS_SHARED=$LIBS
		35	-LIBS=$LIBS_COMMON
		36
		37	#
		38	# Check for libraries needed by fish.
		39	#
		40
		41	-LIBS_COMMON=$LIBS
		42	-LIBS="$LIBS_SHARED"
		43	if test x$local_gettext != xno; then
		44	AC_SEARCH_LIBS( gettext, intl,,)
		45	fi
		46
		47	-# Check for libiconv_open if we can't find iconv_open. Silly OS X does
		48	-# weird macro magic for the sole purpose of amusing me.
		49	-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])] )] )
		50	-
		51	-LIBS_FISH=$LIBS
		52	-LIBS=$LIBS_COMMON
		53	-
		54	-#
		55	-# Check for libraries needed by fish_indent.
		56	-#
		57	-
		58	-LIBS_COMMON=$LIBS
		59	-LIBS="$LIBS_SHARED"
		60	-if test x$local_gettext != xno; then
		61	- AC_SEARCH_LIBS( gettext, intl,,)
		62	-fi
		63	-LIBS_FISH_INDENT=$LIBS
		64	-LIBS=$LIBS_COMMON
		65	-
		66	-#
		67	-# Check for libraries needed by fish_pager.
		68	-#
		69	-
		70	-LIBS_COMMON=$LIBS
		71	-LIBS="$LIBS_SHARED"
		72	-if test x$local_gettext != xno; then
		73	- AC_SEARCH_LIBS( gettext, intl,,)
		74	-fi
		75	-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
		76	-LIBS_FISH_PAGER=$LIBS
		77	-LIBS=$LIBS_COMMON
		78	-
		79	-#
		80	-# Check for libraries needed by fishd.
81	-#
82	-
83	-LIBS_COMMON=$LIBS
84	-LIBS="$LIBS_SHARED"
85	-if test x$local_gettext != xno; then
86	- AC_SEARCH_LIBS( gettext, intl,,)
87	-fi
88	-AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
89	-LIBS_FISHD=$LIBS
90	-LIBS=$LIBS_COMMON
91	-
92	-#
93	-# Check for libraries needed by mimedb.
94	-#
95	-
96	-LIBS_COMMON=$LIBS
97	-LIBS="$LIBS_SHARED"
98	-if test x$local_gettext != xno; then
99	- AC_SEARCH_LIBS( gettext, intl,,)
100	-fi
101	-LIBS_MIMEDB=$LIBS
102	-LIBS=$LIBS_COMMON
103	-
104	-
105	-#
106	-# Check for libraries needed by set_color
107	-#
108	-
109	-LIBS_COMMON=$LIBS
110	-LIBS="$LIBS_SHARED"
111	-if test x$local_gettext != xno; then
112	- AC_SEARCH_LIBS( gettext, intl,,)
11	-fi	113	-fi
12	+AC_SUBST(docdir, [$datadir/doc/fish] )	114	-LIBS_SET_COLOR=$LIBS
		115	-LIBS=$LIBS_COMMON
13		116
		117	#
		118	# Check presense of various header files

Lines 1-29 Link Here

(-)fish/pkg-plist (-24 / +82 lines)
1	bin/count
2	bin/fish	1	bin/fish
		2	bin/fish_indent
3	bin/fish_pager	3	bin/fish_pager
4	bin/fishd	4	bin/fishd
5	bin/mimedb	5	bin/mimedb
6	bin/seq	6	bin/seq
7	bin/set_color	7	bin/set_color
8	%%XSEL%%bin/xsel	8	%%XSEL%%bin/xsel
9	etc/fish/config.fish	9	%%ETCDIR%%/config.fish
10	etc/fish/fish_inputrc	10	share/doc/ChangeLog
11	%%DOCSDIR%%/ChangeLog	11	share/doc/commands.html
12	%%DOCSDIR%%/commands.html	12	share/doc/design.html
13	%%DOCSDIR%%/design.html	13	share/doc/doc_8h-source.html
14	%%DOCSDIR%%/doc_8h-source.html	14	share/doc/doxygen.css
15	%%DOCSDIR%%/doc_8h_source.html	15	share/doc/doxygen.png
16	%%DOCSDIR%%/doxygen.css	16	share/doc/faq.html
17	%%DOCSDIR%%/doxygen.png	17	share/doc/files.html
18	%%DOCSDIR%%/faq.html	18	share/doc/index.html
19	%%DOCSDIR%%/files.html	19	share/doc/license.html
20	%%DOCSDIR%%/index.html	20	share/doc/pages.html
21	%%DOCSDIR%%/license.html	21	share/doc/tab_b.gif
22	%%DOCSDIR%%/pages.html	22	share/doc/tab_l.gif
23	%%DOCSDIR%%/tab_b.gif	23	share/doc/tab_r.gif
24	%%DOCSDIR%%/tab_l.gif	24	share/doc/tabs.css
25	%%DOCSDIR%%/tab_r.gif	25	%%DATADIR%%/completions/acpi.fish
26	%%DOCSDIR%%/tabs.css	26	%%DATADIR%%/completions/adduser.fish
27	%%DATADIR%%/completions/and.fish	27	%%DATADIR%%/completions/and.fish
28	%%DATADIR%%/completions/ant.fish	28	%%DATADIR%%/completions/ant.fish
29	%%DATADIR%%/completions/apm.fish	29	%%DATADIR%%/completions/apm.fish
Lines 56-64 Link Here
56	%%DATADIR%%/completions/atd.fish	56	%%DATADIR%%/completions/atd.fish
57	%%DATADIR%%/completions/atq.fish	57	%%DATADIR%%/completions/atq.fish
58	%%DATADIR%%/completions/atrm.fish	58	%%DATADIR%%/completions/atrm.fish
		59	%%DATADIR%%/completions/awk.fish
		60	%%DATADIR%%/completions/badblocks.fish
59	%%DATADIR%%/completions/bc.fish	61	%%DATADIR%%/completions/bc.fish
60	%%DATADIR%%/completions/bg.fish	62	%%DATADIR%%/completions/bg.fish
61	%%DATADIR%%/completions/bind.fish	63	%%DATADIR%%/completions/bind.fish
		64	%%DATADIR%%/completions/bison.fish
62	%%DATADIR%%/completions/block.fish	65	%%DATADIR%%/completions/block.fish
63	%%DATADIR%%/completions/break.fish	66	%%DATADIR%%/completions/break.fish
64	%%DATADIR%%/completions/btdownloadcurses.py.fish	67	%%DATADIR%%/completions/btdownloadcurses.py.fish
Lines 73-78 Link Here
73	%%DATADIR%%/completions/cd.fish	76	%%DATADIR%%/completions/cd.fish
74	%%DATADIR%%/completions/cdrecord.fish	77	%%DATADIR%%/completions/cdrecord.fish
75	%%DATADIR%%/completions/chgrp.fish	78	%%DATADIR%%/completions/chgrp.fish
		79	%%DATADIR%%/completions/chmod.fish
76	%%DATADIR%%/completions/chown.fish	80	%%DATADIR%%/completions/chown.fish
77	%%DATADIR%%/completions/chsh.fish	81	%%DATADIR%%/completions/chsh.fish
78	%%DATADIR%%/completions/command.fish	82	%%DATADIR%%/completions/command.fish
Lines 80-85 Link Here
80	%%DATADIR%%/completions/complete.fish	84	%%DATADIR%%/completions/complete.fish
81	%%DATADIR%%/completions/configure.fish	85	%%DATADIR%%/completions/configure.fish
82	%%DATADIR%%/completions/continue.fish	86	%%DATADIR%%/completions/continue.fish
		87	%%DATADIR%%/completions/cowsay.fish
		88	%%DATADIR%%/completions/cowthink.fish
83	%%DATADIR%%/completions/cp.fish	89	%%DATADIR%%/completions/cp.fish
84	%%DATADIR%%/completions/cut.fish	90	%%DATADIR%%/completions/cut.fish
85	%%DATADIR%%/completions/cvs.fish	91	%%DATADIR%%/completions/cvs.fish
Lines 92-97 Link Here
92	%%DATADIR%%/completions/dvipdf.fish	98	%%DATADIR%%/completions/dvipdf.fish
93	%%DATADIR%%/completions/dvipdfm.fish	99	%%DATADIR%%/completions/dvipdfm.fish
94	%%DATADIR%%/completions/echo.fish	100	%%DATADIR%%/completions/echo.fish
		101	%%DATADIR%%/completions/effectv.fish
95	%%DATADIR%%/completions/eix-sync.fish	102	%%DATADIR%%/completions/eix-sync.fish
96	%%DATADIR%%/completions/eix.fish	103	%%DATADIR%%/completions/eix.fish
97	%%DATADIR%%/completions/elatex.fish	104	%%DATADIR%%/completions/elatex.fish
Lines 101-121 Link Here
101	%%DATADIR%%/completions/equery.fish	108	%%DATADIR%%/completions/equery.fish
102	%%DATADIR%%/completions/etex.fish	109	%%DATADIR%%/completions/etex.fish
103	%%DATADIR%%/completions/eval.fish	110	%%DATADIR%%/completions/eval.fish
		111	%%DATADIR%%/completions/evince.fish
104	%%DATADIR%%/completions/exec.fish	112	%%DATADIR%%/completions/exec.fish
105	%%DATADIR%%/completions/exit.fish	113	%%DATADIR%%/completions/exit.fish
106	%%DATADIR%%/completions/fg.fish	114	%%DATADIR%%/completions/fg.fish
107	%%DATADIR%%/completions/file.fish	115	%%DATADIR%%/completions/file.fish
108	%%DATADIR%%/completions/find.fish	116	%%DATADIR%%/completions/find.fish
109	%%DATADIR%%/completions/fish.fish	117	%%DATADIR%%/completions/fish.fish
		118	%%DATADIR%%/completions/fish_indent.fish
110	%%DATADIR%%/completions/flac.fish	119	%%DATADIR%%/completions/flac.fish
111	%%DATADIR%%/completions/function.fish	120	%%DATADIR%%/completions/function.fish
112	%%DATADIR%%/completions/functions.fish	121	%%DATADIR%%/completions/functions.fish
113	%%DATADIR%%/completions/fusermount.fish	122	%%DATADIR%%/completions/fusermount.fish
114	%%DATADIR%%/completions/gcc.fish	123	%%DATADIR%%/completions/gcc.fish
		124	%%DATADIR%%/completions/gdb.fish
115	%%DATADIR%%/completions/gem.fish	125	%%DATADIR%%/completions/gem.fish
		126	%%DATADIR%%/completions/git.fish
116	%%DATADIR%%/completions/gpg.fish	127	%%DATADIR%%/completions/gpg.fish
117	%%DATADIR%%/completions/gprof.fish	128	%%DATADIR%%/completions/gprof.fish
118	%%DATADIR%%/completions/grep.fish	129	%%DATADIR%%/completions/grep.fish
		130	%%DATADIR%%/completions/groupadd.fish
119	%%DATADIR%%/completions/gunzip.fish	131	%%DATADIR%%/completions/gunzip.fish
120	%%DATADIR%%/completions/gzip.fish	132	%%DATADIR%%/completions/gzip.fish
121	%%DATADIR%%/completions/help.fish	133	%%DATADIR%%/completions/help.fish
Lines 123-128 Link Here
123	%%DATADIR%%/completions/iconv.fish	135	%%DATADIR%%/completions/iconv.fish
124	%%DATADIR%%/completions/id.fish	136	%%DATADIR%%/completions/id.fish
125	%%DATADIR%%/completions/ifconfig.fish	137	%%DATADIR%%/completions/ifconfig.fish
		138	%%DATADIR%%/completions/invoke-rc.d.fish
126	%%DATADIR%%/completions/jobs.fish	139	%%DATADIR%%/completions/jobs.fish
127	%%DATADIR%%/completions/kill.fish	140	%%DATADIR%%/completions/kill.fish
128	%%DATADIR%%/completions/la.fish	141	%%DATADIR%%/completions/la.fish
Lines 131-151 Link Here
131	%%DATADIR%%/completions/ll.fish	144	%%DATADIR%%/completions/ll.fish
132	%%DATADIR%%/completions/locate.fish	145	%%DATADIR%%/completions/locate.fish
133	%%DATADIR%%/completions/ls.fish	146	%%DATADIR%%/completions/ls.fish
		147	%%DATADIR%%/completions/m4.fish
134	%%DATADIR%%/completions/make.fish	148	%%DATADIR%%/completions/make.fish
135	%%DATADIR%%/completions/makedepend.fish	149	%%DATADIR%%/completions/makedepend.fish
		150	%%DATADIR%%/completions/makepkg.fish
136	%%DATADIR%%/completions/man.fish	151	%%DATADIR%%/completions/man.fish
137	%%DATADIR%%/completions/mimedb.fish	152	%%DATADIR%%/completions/mimedb.fish
138	%%DATADIR%%/completions/modprobe.fish	153	%%DATADIR%%/completions/modprobe.fish
139	%%DATADIR%%/completions/mount.fish	154	%%DATADIR%%/completions/mount.fish
140	%%DATADIR%%/completions/mplayer.fish	155	%%DATADIR%%/completions/mplayer.fish
		156	%%DATADIR%%/completions/msgfmt.fish
141	%%DATADIR%%/completions/mutt.fish	157	%%DATADIR%%/completions/mutt.fish
142	%%DATADIR%%/completions/mv.fish	158	%%DATADIR%%/completions/mv.fish
		159	%%DATADIR%%/completions/netcat.fish
143	%%DATADIR%%/completions/nextd.fish	160	%%DATADIR%%/completions/nextd.fish
144	%%DATADIR%%/completions/nice.fish	161	%%DATADIR%%/completions/nice.fish
145	%%DATADIR%%/completions/not.fish	162	%%DATADIR%%/completions/not.fish
146	%%DATADIR%%/completions/oggenc.fish	163	%%DATADIR%%/completions/oggenc.fish
147	%%DATADIR%%/completions/omega.fish	164	%%DATADIR%%/completions/omega.fish
148	%%DATADIR%%/completions/or.fish	165	%%DATADIR%%/completions/or.fish
		166	%%DATADIR%%/completions/pacman.fish
149	%%DATADIR%%/completions/patch.fish	167	%%DATADIR%%/completions/patch.fish
150	%%DATADIR%%/completions/pdfelatex.fish	168	%%DATADIR%%/completions/pdfelatex.fish
151	%%DATADIR%%/completions/pdfetex.fish	169	%%DATADIR%%/completions/pdfetex.fish
Lines 154-167 Link Here
154	%%DATADIR%%/completions/perl.fish	172	%%DATADIR%%/completions/perl.fish
155	%%DATADIR%%/completions/pine.fish	173	%%DATADIR%%/completions/pine.fish
156	%%DATADIR%%/completions/ping.fish	174	%%DATADIR%%/completions/ping.fish
		175	%%DATADIR%%/completions/pkgadd.fish
		176	%%DATADIR%%/completions/pkginfo.fish
		177	%%DATADIR%%/completions/pkgmk.fish
		178	%%DATADIR%%/completions/pkgrm.fish
		179	%%DATADIR%%/completions/ports.fish
157	%%DATADIR%%/completions/prevd.fish	180	%%DATADIR%%/completions/prevd.fish
		181	%%DATADIR%%/completions/prt-get.fish
158	%%DATADIR%%/completions/ps.fish	182	%%DATADIR%%/completions/ps.fish
159	%%DATADIR%%/completions/ps2pdf.fish	183	%%DATADIR%%/completions/ps2pdf.fish
160	%%DATADIR%%/completions/psub.fish	184	%%DATADIR%%/completions/psub.fish
161	%%DATADIR%%/completions/pushd.fish	185	%%DATADIR%%/completions/pushd.fish
162	%%DATADIR%%/completions/python.fish	186	%%DATADIR%%/completions/python.fish
		187	%%DATADIR%%/completions/quilt.fish
163	%%DATADIR%%/completions/random.fish	188	%%DATADIR%%/completions/random.fish
164	%%DATADIR%%/completions/read.fish	189	%%DATADIR%%/completions/read.fish
		190	%%DATADIR%%/completions/rejmerge.fish
165	%%DATADIR%%/completions/renice.fish	191	%%DATADIR%%/completions/renice.fish
166	%%DATADIR%%/completions/return.fish	192	%%DATADIR%%/completions/return.fish
167	%%DATADIR%%/completions/rm.fish	193	%%DATADIR%%/completions/rm.fish
Lines 169-174 Link Here
169	%%DATADIR%%/completions/rpm.fish	195	%%DATADIR%%/completions/rpm.fish
170	%%DATADIR%%/completions/rsync.fish	196	%%DATADIR%%/completions/rsync.fish
171	%%DATADIR%%/completions/ruby.fish	197	%%DATADIR%%/completions/ruby.fish
		198	%%DATADIR%%/completions/scons.fish
172	%%DATADIR%%/completions/scp.fish	199	%%DATADIR%%/completions/scp.fish
173	%%DATADIR%%/completions/screen.fish	200	%%DATADIR%%/completions/screen.fish
174	%%DATADIR%%/completions/sed.fish	201	%%DATADIR%%/completions/sed.fish
Lines 200-205 Link Here
200	%%DATADIR%%/completions/unrar.fish	227	%%DATADIR%%/completions/unrar.fish
201	%%DATADIR%%/completions/update-eix-remote.fish	228	%%DATADIR%%/completions/update-eix-remote.fish
202	%%DATADIR%%/completions/update-eix.fish	229	%%DATADIR%%/completions/update-eix.fish
		230	%%DATADIR%%/completions/useradd.fish
203	%%DATADIR%%/completions/valgrind.fish	231	%%DATADIR%%/completions/valgrind.fish
204	%%DATADIR%%/completions/vared.fish	232	%%DATADIR%%/completions/vared.fish
205	%%DATADIR%%/completions/vi.fish	233	%%DATADIR%%/completions/vi.fish
Lines 207-218 Link Here
207	%%DATADIR%%/completions/w.fish	235	%%DATADIR%%/completions/w.fish
208	%%DATADIR%%/completions/wajig.fish	236	%%DATADIR%%/completions/wajig.fish
209	%%DATADIR%%/completions/wc.fish	237	%%DATADIR%%/completions/wc.fish
		238	%%DATADIR%%/completions/wesnoth.fish
210	%%DATADIR%%/completions/wget.fish	239	%%DATADIR%%/completions/wget.fish
211	%%DATADIR%%/completions/whatis.fish	240	%%DATADIR%%/completions/whatis.fish
212	%%DATADIR%%/completions/which.fish	241	%%DATADIR%%/completions/which.fish
213	%%DATADIR%%/completions/who.fish	242	%%DATADIR%%/completions/who.fish
214	%%DATADIR%%/completions/wpa_cli.fish	243	%%DATADIR%%/completions/wpa_cli.fish
215	%%DATADIR%%/completions/xargs.fish	244	%%DATADIR%%/completions/xargs.fish
		245	%%DATADIR%%/completions/xgettext.fish
216	%%DATADIR%%/completions/xmms.fish	246	%%DATADIR%%/completions/xmms.fish
217	%%DATADIR%%/completions/xpdf.fish	247	%%DATADIR%%/completions/xpdf.fish
218	%%DATADIR%%/completions/xprop.fish	248	%%DATADIR%%/completions/xprop.fish
Lines 222-237 Link Here
222	%%DATADIR%%/completions/zcat.fish	252	%%DATADIR%%/completions/zcat.fish
223	%%DATADIR%%/completions/zip.fish	253	%%DATADIR%%/completions/zip.fish
224	%%DATADIR%%/config.fish	254	%%DATADIR%%/config.fish
225	%%DATADIR%%/config_interactive.fish
226	%%DATADIR%%/functions/N_.fish	255	%%DATADIR%%/functions/N_.fish
227	%%DATADIR%%/functions/_.fish	256	%%DATADIR%%/functions/_.fish
228	%%DATADIR%%/functions/__fish_append.fish	257	%%DATADIR%%/functions/__fish_append.fish
		258	%%DATADIR%%/functions/__fish_bind_test1.fish
		259	%%DATADIR%%/functions/__fish_bind_test2.fish
		260	%%DATADIR%%/functions/__fish_commandline_test.fish
229	%%DATADIR%%/functions/__fish_complete_ant_targets.fish	261	%%DATADIR%%/functions/__fish_complete_ant_targets.fish
230	%%DATADIR%%/functions/__fish_complete_bittorrent.fish	262	%%DATADIR%%/functions/__fish_complete_bittorrent.fish
231	%%DATADIR%%/functions/__fish_complete_cd.fish	263	%%DATADIR%%/functions/__fish_complete_cd.fish
		264	%%DATADIR%%/functions/__fish_complete_command.fish
232	%%DATADIR%%/functions/__fish_complete_directories.fish	265	%%DATADIR%%/functions/__fish_complete_directories.fish
		266	%%DATADIR%%/functions/__fish_complete_file_url.fish
		267	%%DATADIR%%/functions/__fish_complete_groups.fish
233	%%DATADIR%%/functions/__fish_complete_ls.fish	268	%%DATADIR%%/functions/__fish_complete_ls.fish
234	%%DATADIR%%/functions/__fish_complete_man.fish	269	%%DATADIR%%/functions/__fish_complete_man.fish
		270	%%DATADIR%%/functions/__fish_complete_mime.fish
235	%%DATADIR%%/functions/__fish_complete_pids.fish	271	%%DATADIR%%/functions/__fish_complete_pids.fish
236	%%DATADIR%%/functions/__fish_complete_ssh.fish	272	%%DATADIR%%/functions/__fish_complete_ssh.fish
237	%%DATADIR%%/functions/__fish_complete_subcommand.fish	273	%%DATADIR%%/functions/__fish_complete_subcommand.fish
Lines 240-269 Link Here
240	%%DATADIR%%/functions/__fish_complete_tar.fish	276	%%DATADIR%%/functions/__fish_complete_tar.fish
241	%%DATADIR%%/functions/__fish_complete_tex.fish	277	%%DATADIR%%/functions/__fish_complete_tex.fish
242	%%DATADIR%%/functions/__fish_complete_unrar.fish	278	%%DATADIR%%/functions/__fish_complete_unrar.fish
		279	%%DATADIR%%/functions/__fish_complete_users.fish
243	%%DATADIR%%/functions/__fish_complete_vi.fish	280	%%DATADIR%%/functions/__fish_complete_vi.fish
		281	%%DATADIR%%/functions/__fish_config_interactive.fish
244	%%DATADIR%%/functions/__fish_contains_opt.fish	282	%%DATADIR%%/functions/__fish_contains_opt.fish
		283	%%DATADIR%%/functions/__fish_crux_packages.fish
245	%%DATADIR%%/functions/__fish_describe_command.fish	284	%%DATADIR%%/functions/__fish_describe_command.fish
		285	%%DATADIR%%/functions/__fish_filter_ant_targets.fish
246	%%DATADIR%%/functions/__fish_filter_mime.fish	286	%%DATADIR%%/functions/__fish_filter_mime.fish
		287	%%DATADIR%%/functions/__fish_git_branch_prompt.fish
247	%%DATADIR%%/functions/__fish_gnu_complete.fish	288	%%DATADIR%%/functions/__fish_gnu_complete.fish
248	%%DATADIR%%/functions/__fish_is_first_token.fish	289	%%DATADIR%%/functions/__fish_is_first_token.fish
249	%%DATADIR%%/functions/__fish_list_current_token.fish	290	%%DATADIR%%/functions/__fish_list_current_token.fish
250	%%DATADIR%%/functions/__fish_move_last.fish	291	%%DATADIR%%/functions/__fish_move_last.fish
251	%%DATADIR%%/functions/__fish_no_arguments.fish	292	%%DATADIR%%/functions/__fish_no_arguments.fish
		293	%%DATADIR%%/functions/__fish_not_contain_opt.fish
		294	%%DATADIR%%/functions/__fish_paginate.fish
		295	%%DATADIR%%/functions/__fish_ports_dirs.fish
		296	%%DATADIR%%/functions/__fish_print_addresses.fish
		297	%%DATADIR%%/functions/__fish_print_debian_services.fish
		298	%%DATADIR%%/functions/__fish_print_encodings.fish
252	%%DATADIR%%/functions/__fish_print_filesystems.fish	299	%%DATADIR%%/functions/__fish_print_filesystems.fish
253	%%DATADIR%%/functions/__fish_print_function_prototypes.fish	300	%%DATADIR%%/functions/__fish_print_function_prototypes.fish
254	%%DATADIR%%/functions/__fish_print_help.fish	301	%%DATADIR%%/functions/__fish_print_help.fish
255	%%DATADIR%%/functions/__fish_print_hostnames.fish	302	%%DATADIR%%/functions/__fish_print_hostnames.fish
		303	%%DATADIR%%/functions/__fish_print_interfaces.fish
		304	%%DATADIR%%/functions/__fish_print_make_targets.fish
256	%%DATADIR%%/functions/__fish_print_packages.fish	305	%%DATADIR%%/functions/__fish_print_packages.fish
		306	%%DATADIR%%/functions/__fish_print_users.fish
		307	%%DATADIR%%/functions/__fish_prt_no_subcommand.fish
		308	%%DATADIR%%/functions/__fish_prt_packages.fish
		309	%%DATADIR%%/functions/__fish_prt_ports.fish
		310	%%DATADIR%%/functions/__fish_prt_use_package.fish
		311	%%DATADIR%%/functions/__fish_prt_use_port.fish
257	%%DATADIR%%/functions/__fish_seen_subcommand_from.fish	312	%%DATADIR%%/functions/__fish_seen_subcommand_from.fish
258	%%DATADIR%%/functions/__fish_test_arg.fish	313	%%DATADIR%%/functions/__fish_test_arg.fish
259	%%DATADIR%%/functions/__fish_use_subcommand.fish	314	%%DATADIR%%/functions/__fish_use_subcommand.fish
260	%%DATADIR%%/functions/alias.fish	315	%%DATADIR%%/functions/alias.fish
261	%%DATADIR%%/functions/cd.fish	316	%%DATADIR%%/functions/cd.fish
262	%%DATADIR%%/functions/contains.fish
263	%%DATADIR%%/functions/delete-or-exit.fish	317	%%DATADIR%%/functions/delete-or-exit.fish
264	%%DATADIR%%/functions/dirh.fish	318	%%DATADIR%%/functions/dirh.fish
265	%%DATADIR%%/functions/dirs.fish	319	%%DATADIR%%/functions/dirs.fish
		320	%%DATADIR%%/functions/down-or-search.fish
		321	%%DATADIR%%/functions/eval.fish
		322	%%DATADIR%%/functions/fish_default_key_bindings.fish
266	%%DATADIR%%/functions/fish_prompt.fish	323	%%DATADIR%%/functions/fish_prompt.fish
		324	%%DATADIR%%/functions/funced.fish
		325	%%DATADIR%%/functions/funcsave.fish
267	%%DATADIR%%/functions/grep.fish	326	%%DATADIR%%/functions/grep.fish
268	%%DATADIR%%/functions/help.fish	327	%%DATADIR%%/functions/help.fish
269	%%DATADIR%%/functions/isatty.fish	328	%%DATADIR%%/functions/isatty.fish
Lines 281-292 Link Here
281	%%DATADIR%%/functions/psub.fish	340	%%DATADIR%%/functions/psub.fish
282	%%DATADIR%%/functions/pushd.fish	341	%%DATADIR%%/functions/pushd.fish
283	%%DATADIR%%/functions/pwd.fish	342	%%DATADIR%%/functions/pwd.fish
284	%%DATADIR%%/functions/save_function.fish
285	%%DATADIR%%/functions/setenv.fish	343	%%DATADIR%%/functions/setenv.fish
286	%%DATADIR%%/functions/sgrep.fish	344	%%DATADIR%%/functions/sgrep.fish
287	%%DATADIR%%/functions/trap.fish	345	%%DATADIR%%/functions/trap.fish
288	%%DATADIR%%/functions/type.fish	346	%%DATADIR%%/functions/type.fish
289	%%DATADIR%%/functions/umask.fish	347	%%DATADIR%%/functions/umask.fish
		348	%%DATADIR%%/functions/up-or-search.fish
290	%%DATADIR%%/functions/vared.fish	349	%%DATADIR%%/functions/vared.fish
291	%%NLS%%share/locale/de/LC_MESSAGES/fish.mo	350	%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
292	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo	351	%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
Lines 295-301 Link Here
295	@dirrm %%DATADIR%%/functions	354	@dirrm %%DATADIR%%/functions
296	@dirrm %%DATADIR%%/completions	355	@dirrm %%DATADIR%%/completions
297	@dirrm %%DATADIR%%	356	@dirrm %%DATADIR%%
298	@dirrm %%DOCSDIR%%	357	@dirrm %%ETCDIR%%
299	@dirrm etc/fish
300	@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	358	@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
301	@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak	359	@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak