5 files changed, 394 insertions, 0 deletions

diff --git a/shells/Makefile b/shells/Makefile
index c5c3c7df7388..0e4b8be91ce9 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -12,6 +12,7 @@
     SUBDIR += es
     SUBDIR += esh
     SUBDIR += fd
+    SUBDIR += fish
     SUBDIR += flash
     SUBDIR += gscommander
     SUBDIR += ibsh
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
new file mode 100644
index 000000000000..d885ae6b6644
--- /dev/null
+++ b/shells/fish/Makefile
@@ -0,0 +1,86 @@
+# New ports collection makefile for:	fish
+# Date created:		2007-02-26
+# Whom:			Kai Wang <kaiw27@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fish
+PORTVERSION=	1.22.3
+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/
+
+MAINTAINER=	kaiw27@gmail.com
+COMMENT=	A user friendly command line shell
+
+USE_AUTOTOOLS=	autoconf:259
+USE_ICONV=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LIBS="${LDFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
+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
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--without-gettext
+PLIST_SUB+=		NLS="@comment "
+.endif
+
+.if !defined(WITHOUT_XSEL)
+CONFLICTS=		xsel-[0-9]*
+PLIST_SUB+=		XSEL=""
+MAN1+=			xsel.1
+.else
+CONFIGURE_ARGS+=	--without-xsel
+PLIST_SUB+=		XSEL="@comment "
+.endif
+
+post-install:
+.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 \
+		${TRUE}; \
+	else \
+		${ECHO_CMD} '${PREFIX}/bin/${PORTNAME}' >> /etc/shells; \
+	fi
+
+post-deinstall:
+	${CP} /etc/shells /etc/shells.bak
+	${GREP} -v '${PREFIX}/bin/${PORTNAME}' /etc/shells.bak \
+		>> /etc/shells
+	${RM} -f /etc/shells.bak
+
+.include <bsd.port.post.mk>
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
new file mode 100644
index 000000000000..d19275fe4e78
--- /dev/null
+++ b/shells/fish/distinfo
@@ -0,0 +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
diff --git a/shells/fish/pkg-descr b/shells/fish/pkg-descr
new file mode 100644
index 000000000000..d61164f9b113
--- /dev/null
+++ b/shells/fish/pkg-descr
@@ -0,0 +1,4 @@
+fish is a user friendly commandline shell intended mostly for
+interactive use.
+
+WWW:	http://www.fishshell.org/
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
new file mode 100644
index 000000000000..33ef6d231622
--- /dev/null
+++ b/shells/fish/pkg-plist
@@ -0,0 +1,300 @@
+bin/count
+bin/fish
+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%%/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
+%%DATADIR%%/completions/and.fish
+%%DATADIR%%/completions/ant.fish
+%%DATADIR%%/completions/apm.fish
+%%DATADIR%%/completions/apropos.fish
+%%DATADIR%%/completions/apt-build.fish
+%%DATADIR%%/completions/apt-cache.fish
+%%DATADIR%%/completions/apt-cdrom.fish
+%%DATADIR%%/completions/apt-config.fish
+%%DATADIR%%/completions/apt-extracttemplates.fish
+%%DATADIR%%/completions/apt-file.fish
+%%DATADIR%%/completions/apt-ftparchive.fish
+%%DATADIR%%/completions/apt-get.fish
+%%DATADIR%%/completions/apt-key.fish
+%%DATADIR%%/completions/apt-listbugs.fish
+%%DATADIR%%/completions/apt-listchanges.fish
+%%DATADIR%%/completions/apt-move.fish
+%%DATADIR%%/completions/apt-proxy-import.fish
+%%DATADIR%%/completions/apt-rdepends.fish
+%%DATADIR%%/completions/apt-setup.fish
+%%DATADIR%%/completions/apt-show-source.fish
+%%DATADIR%%/completions/apt-show-versions.fish
+%%DATADIR%%/completions/apt-sortpkgs.fish
+%%DATADIR%%/completions/apt-spy.fish
+%%DATADIR%%/completions/apt-src.fish
+%%DATADIR%%/completions/apt-zip-inst.fish
+%%DATADIR%%/completions/apt-zip-list.fish
+%%DATADIR%%/completions/aptitude.fish
+%%DATADIR%%/completions/arp.fish
+%%DATADIR%%/completions/at.fish
+%%DATADIR%%/completions/atd.fish
+%%DATADIR%%/completions/atq.fish
+%%DATADIR%%/completions/atrm.fish
+%%DATADIR%%/completions/bc.fish
+%%DATADIR%%/completions/bg.fish
+%%DATADIR%%/completions/bind.fish
+%%DATADIR%%/completions/block.fish
+%%DATADIR%%/completions/break.fish
+%%DATADIR%%/completions/btdownloadcurses.py.fish
+%%DATADIR%%/completions/btdownloadheadless.py.fish
+%%DATADIR%%/completions/builtin.fish
+%%DATADIR%%/completions/bunzip2.fish
+%%DATADIR%%/completions/bzcat.fish
+%%DATADIR%%/completions/bzip2.fish
+%%DATADIR%%/completions/bzip2recover.fish
+%%DATADIR%%/completions/case.fish
+%%DATADIR%%/completions/cat.fish
+%%DATADIR%%/completions/cd.fish
+%%DATADIR%%/completions/cdrecord.fish
+%%DATADIR%%/completions/chgrp.fish
+%%DATADIR%%/completions/chown.fish
+%%DATADIR%%/completions/chsh.fish
+%%DATADIR%%/completions/command.fish
+%%DATADIR%%/completions/commandline.fish
+%%DATADIR%%/completions/complete.fish
+%%DATADIR%%/completions/configure.fish
+%%DATADIR%%/completions/continue.fish
+%%DATADIR%%/completions/cp.fish
+%%DATADIR%%/completions/cut.fish
+%%DATADIR%%/completions/cvs.fish
+%%DATADIR%%/completions/darcs.fish
+%%DATADIR%%/completions/date.fish
+%%DATADIR%%/completions/dcop.fish
+%%DATADIR%%/completions/df.fish
+%%DATADIR%%/completions/diff.fish
+%%DATADIR%%/completions/du.fish
+%%DATADIR%%/completions/dvipdf.fish
+%%DATADIR%%/completions/dvipdfm.fish
+%%DATADIR%%/completions/echo.fish
+%%DATADIR%%/completions/eix-sync.fish
+%%DATADIR%%/completions/eix.fish
+%%DATADIR%%/completions/elatex.fish
+%%DATADIR%%/completions/emacs.fish
+%%DATADIR%%/completions/emerge.fish
+%%DATADIR%%/completions/env.fish
+%%DATADIR%%/completions/equery.fish
+%%DATADIR%%/completions/etex.fish
+%%DATADIR%%/completions/eval.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/flac.fish
+%%DATADIR%%/completions/function.fish
+%%DATADIR%%/completions/functions.fish
+%%DATADIR%%/completions/fusermount.fish
+%%DATADIR%%/completions/gcc.fish
+%%DATADIR%%/completions/gem.fish
+%%DATADIR%%/completions/gpg.fish
+%%DATADIR%%/completions/gprof.fish
+%%DATADIR%%/completions/grep.fish
+%%DATADIR%%/completions/gunzip.fish
+%%DATADIR%%/completions/gzip.fish
+%%DATADIR%%/completions/help.fish
+%%DATADIR%%/completions/hg.fish
+%%DATADIR%%/completions/iconv.fish
+%%DATADIR%%/completions/id.fish
+%%DATADIR%%/completions/ifconfig.fish
+%%DATADIR%%/completions/jobs.fish
+%%DATADIR%%/completions/kill.fish
+%%DATADIR%%/completions/la.fish
+%%DATADIR%%/completions/latex.fish
+%%DATADIR%%/completions/less.fish
+%%DATADIR%%/completions/ll.fish
+%%DATADIR%%/completions/locate.fish
+%%DATADIR%%/completions/ls.fish
+%%DATADIR%%/completions/make.fish
+%%DATADIR%%/completions/makedepend.fish
+%%DATADIR%%/completions/man.fish
+%%DATADIR%%/completions/mimedb.fish
+%%DATADIR%%/completions/modprobe.fish
+%%DATADIR%%/completions/mount.fish
+%%DATADIR%%/completions/mplayer.fish
+%%DATADIR%%/completions/mutt.fish
+%%DATADIR%%/completions/mv.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/patch.fish
+%%DATADIR%%/completions/pdfelatex.fish
+%%DATADIR%%/completions/pdfetex.fish
+%%DATADIR%%/completions/pdflatex.fish
+%%DATADIR%%/completions/pdftex.fish
+%%DATADIR%%/completions/perl.fish
+%%DATADIR%%/completions/pine.fish
+%%DATADIR%%/completions/ping.fish
+%%DATADIR%%/completions/prevd.fish
+%%DATADIR%%/completions/ps.fish
+%%DATADIR%%/completions/ps2pdf.fish
+%%DATADIR%%/completions/psub.fish
+%%DATADIR%%/completions/pushd.fish
+%%DATADIR%%/completions/python.fish
+%%DATADIR%%/completions/random.fish
+%%DATADIR%%/completions/read.fish
+%%DATADIR%%/completions/renice.fish
+%%DATADIR%%/completions/return.fish
+%%DATADIR%%/completions/rm.fish
+%%DATADIR%%/completions/rmdir.fish
+%%DATADIR%%/completions/rpm.fish
+%%DATADIR%%/completions/rsync.fish
+%%DATADIR%%/completions/ruby.fish
+%%DATADIR%%/completions/scp.fish
+%%DATADIR%%/completions/screen.fish
+%%DATADIR%%/completions/sed.fish
+%%DATADIR%%/completions/service.fish
+%%DATADIR%%/completions/set.fish
+%%DATADIR%%/completions/set_color.fish
+%%DATADIR%%/completions/sort.fish
+%%DATADIR%%/completions/ssh.fish
+%%DATADIR%%/completions/sshfs.fish
+%%DATADIR%%/completions/status.fish
+%%DATADIR%%/completions/su.fish
+%%DATADIR%%/completions/sudo.fish
+%%DATADIR%%/completions/svn.fish
+%%DATADIR%%/completions/sylpheed.fish
+%%DATADIR%%/completions/tar.fish
+%%DATADIR%%/completions/telnet.fish
+%%DATADIR%%/completions/test.fish
+%%DATADIR%%/completions/tex.fish
+%%DATADIR%%/completions/time.fish
+%%DATADIR%%/completions/top.fish
+%%DATADIR%%/completions/totem.fish
+%%DATADIR%%/completions/touch.fish
+%%DATADIR%%/completions/trap.fish
+%%DATADIR%%/completions/type.fish
+%%DATADIR%%/completions/ulimit.fish
+%%DATADIR%%/completions/umount.fish
+%%DATADIR%%/completions/uname.fish
+%%DATADIR%%/completions/uniq.fish
+%%DATADIR%%/completions/unrar.fish
+%%DATADIR%%/completions/update-eix-remote.fish
+%%DATADIR%%/completions/update-eix.fish
+%%DATADIR%%/completions/valgrind.fish
+%%DATADIR%%/completions/vared.fish
+%%DATADIR%%/completions/vi.fish
+%%DATADIR%%/completions/vim.fish
+%%DATADIR%%/completions/w.fish
+%%DATADIR%%/completions/wajig.fish
+%%DATADIR%%/completions/wc.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/xmms.fish
+%%DATADIR%%/completions/xpdf.fish
+%%DATADIR%%/completions/xprop.fish
+%%DATADIR%%/completions/xsel.fish
+%%DATADIR%%/completions/xterm.fish
+%%DATADIR%%/completions/yum.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_complete_ant_targets.fish
+%%DATADIR%%/functions/__fish_complete_bittorrent.fish
+%%DATADIR%%/functions/__fish_complete_cd.fish
+%%DATADIR%%/functions/__fish_complete_directories.fish
+%%DATADIR%%/functions/__fish_complete_ls.fish
+%%DATADIR%%/functions/__fish_complete_man.fish
+%%DATADIR%%/functions/__fish_complete_pids.fish
+%%DATADIR%%/functions/__fish_complete_ssh.fish
+%%DATADIR%%/functions/__fish_complete_subcommand.fish
+%%DATADIR%%/functions/__fish_complete_subcommand_root.fish
+%%DATADIR%%/functions/__fish_complete_suffix.fish
+%%DATADIR%%/functions/__fish_complete_tar.fish
+%%DATADIR%%/functions/__fish_complete_tex.fish
+%%DATADIR%%/functions/__fish_complete_unrar.fish
+%%DATADIR%%/functions/__fish_complete_vi.fish
+%%DATADIR%%/functions/__fish_contains_opt.fish
+%%DATADIR%%/functions/__fish_describe_command.fish
+%%DATADIR%%/functions/__fish_filter_mime.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_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_packages.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/fish_prompt.fish
+%%DATADIR%%/functions/grep.fish
+%%DATADIR%%/functions/help.fish
+%%DATADIR%%/functions/isatty.fish
+%%DATADIR%%/functions/la.fish
+%%DATADIR%%/functions/ll.fish
+%%DATADIR%%/functions/ls.fish
+%%DATADIR%%/functions/math.fish
+%%DATADIR%%/functions/nextd-or-forward-word.fish
+%%DATADIR%%/functions/nextd.fish
+%%DATADIR%%/functions/open.fish
+%%DATADIR%%/functions/popd.fish
+%%DATADIR%%/functions/prevd-or-backward-word.fish
+%%DATADIR%%/functions/prevd.fish
+%%DATADIR%%/functions/prompt_pwd.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/vared.fish
+%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
+@dirrm %%DATADIR%%/functions
+@dirrm %%DATADIR%%/completions
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
+@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