Attachment #134221 for bug #178868




# $FreeBSD: head/shells/fish/Makefile 316683 2013-04-27 18:25:24Z mva $

PORTNAME=	fish
PORTVERSION=	2.0.0
PORTREVISION=	9
CATEGORIES=	shells
MASTER_SITES=	http://fishshell.com/files/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTVERSION}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	User friendly command line shell

OPTIONS_DEFINE=	DOCS NLS
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ENV+=	LIBS="${LDFLAGS}"
CONFIGURE_ARGS=	--docdir=${DOCSDIR}

OPTIONS_DEFINE=	XSEL DOXYGEN
OPTIONS_DEFAULT=	XSEL DOXYGEN
XSEL_DESC=	Build with xsel

USES=		iconv
USE_GMAKE=	yes
USE_AUTOTOOLS=	autoconf
CONFIGURE_ARGS=	--docdir=${WRKDIR}/tmproot
MAKE_JOBS_SAFE=	yes
		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

CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib -pthread

MAN1=		fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1
RUN_DEPENDS=	xsel:${PORTSDIR}/x11/xsel-conrad
.endif

.include <bsd.port.options.mk>
BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
.endif

.if ${PORT_OPTIONS:MNLS}
USES+=		gettext
CONFIGURE_ENV+=	ac_cv_func_gettext=yes
PLIST_SUB+=	NLS=""
.else
CONFIGURE_ARGS+=--without-gettext
PLIST_SUB+=	NLS="@comment "
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \
		 s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \
		 /fish\/man\/man1/d' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		's|-rdynamic|-Wl,--export-dynamic| ; \
		 /pthread_create/d ; \
		 s|ncurses curses|curses| ; \
		 s|ncurses.h||' ${WRKSRC}/configure.ac

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
.endif
.for i in fish fish_indent fish_pager fishd mimedb
	@${STRIP_CMD} ${PREFIX}/bin/${i}
.endfor
	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
		${TRUE}; \
	else \

Lines 1-2 Link Here

(-)shells/fish/distinfo (-2 / +2 lines)
1	SHA256 (fish-1.23.1.tar.gz) = a7f2890b0112d57b4760975f3d8f8c7e0cd240edcb2b3a87b5d66744a8deaf64	1	SHA256 (fish-2.0.0.tar.gz) = 7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303
2	SIZE (fish-1.23.1.tar.gz) = 1152997	2	SIZE (fish-2.0.0.tar.gz) = 1540652




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

Lines 1-14 Link Here

(-)shells/fish/files/patch-util.c (-14 lines)
1
2	--- util.c.orig 2010-01-13 06:44:46.000000000 -0800
3	+++ util.c 2010-01-13 06:46:39.000000000 -0800
4	@@ -320,7 +320,7 @@
5	{
6	int pos;
7
8	- if( (float)(h->count+1)/h->size > 0.75f )
9	+ if( (float)(h->count+1) > 0.75f * h->size )
10	{
11	if( !hash_realloc( h, (h->size+1) * 2 -1 ) )
12	{
13
14

Lines 1-4 Link Here

(-)shells/fish/pkg-descr (-1 / +1 lines)
1	fish is a user friendly commandline shell intended mostly for	1	fish is a user friendly commandline shell intended mostly for
2	interactive use.	2	interactive use.
3		3
4	WWW: http://www.fishshell.org/	4	WWW: http://fishshell.com/




bin/fish_indent
bin/fish_pager
bin/fishd
%%SEQ%%bin/seq
bin/mimedb
bin/set_color
%%ETCDIR%%/config.fish
%%PORTDOCS%%%%DOCSDIR%%/bc_s.png
%%PORTDOCS%%%%DOCSDIR%%/bdwn.png
%%PORTDOCS%%%%DOCSDIR%%/closed.png
%%PORTDOCS%%%%DOCSDIR%%/commands.html
%%PORTDOCS%%%%DOCSDIR%%/design.html
%%PORTDOCS%%%%DOCSDIR%%/doc_8h_source.html
%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
%%PORTDOCS%%%%DOCSDIR%%/dynsections.js
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/files.html
%%PORTDOCS%%%%DOCSDIR%%/ftv2blank.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2cl.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2doc.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2folderclosed.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2folderopen.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2lastnode.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2link.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2mlastnode.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2mnode.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2mo.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2node.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2ns.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2plastnode.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2pnode.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2splitbar.png
%%PORTDOCS%%%%DOCSDIR%%/ftv2vertline.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/jquery.js
%%PORTDOCS%%%%DOCSDIR%%/license.html
%%PORTDOCS%%%%DOCSDIR%%/nav_f.png
%%PORTDOCS%%%%DOCSDIR%%/nav_g.png
%%PORTDOCS%%%%DOCSDIR%%/nav_h.png
%%PORTDOCS%%%%DOCSDIR%%/open.png
%%PORTDOCS%%%%DOCSDIR%%/pages.html
%%PORTDOCS%%%%DOCSDIR%%/sync_off.png
%%PORTDOCS%%%%DOCSDIR%%/sync_on.png
%%PORTDOCS%%%%DOCSDIR%%/tab_a.png
%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif
%%PORTDOCS%%%%DOCSDIR%%/tab_b.png
%%PORTDOCS%%%%DOCSDIR%%/tab_h.png
%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
%%PORTDOCS%%%%DOCSDIR%%/tab_s.png
%%PORTDOCS%%%%DOCSDIR%%/tabs.css
%%DATADIR%%/completions/abook.fish
%%DATADIR%%/completions/acat.fish
%%DATADIR%%/completions/accept.fish
%%DATADIR%%/completions/ack.fish
%%DATADIR%%/completions/acpi.fish
%%DATADIR%%/completions/adduser.fish
%%DATADIR%%/completions/adiff.fish
%%DATADIR%%/completions/als.fish
%%DATADIR%%/completions/amixer.fish
%%DATADIR%%/completions/anamnesis.fish
%%DATADIR%%/completions/and.fish
%%DATADIR%%/completions/animate.fish
%%DATADIR%%/completions/ant.fish
%%DATADIR%%/completions/apack.fish
%%DATADIR%%/completions/apm.fish
%%DATADIR%%/completions/apropos.fish
%%DATADIR%%/completions/apt-build.fish

%%DATADIR%%/completions/apt-zip-inst.fish
%%DATADIR%%/completions/apt-zip-list.fish
%%DATADIR%%/completions/aptitude.fish
%%DATADIR%%/completions/arepack.fish
%%DATADIR%%/completions/arp.fish
%%DATADIR%%/completions/at.fish
%%DATADIR%%/completions/atd.fish
%%DATADIR%%/completions/atool.fish
%%DATADIR%%/completions/atq.fish
%%DATADIR%%/completions/atrm.fish
%%DATADIR%%/completions/aunpack.fish
%%DATADIR%%/completions/awk.fish
%%DATADIR%%/completions/badblocks.fish
%%DATADIR%%/completions/bc.fish

%%DATADIR%%/completions/bison.fish
%%DATADIR%%/completions/block.fish
%%DATADIR%%/completions/break.fish
%%DATADIR%%/completions/brew.fish
%%DATADIR%%/completions/btdownloadcurses.py.fish
%%DATADIR%%/completions/btdownloadheadless.py.fish
%%DATADIR%%/completions/builtin.fish

%%DATADIR%%/completions/bzcat.fish
%%DATADIR%%/completions/bzip2.fish
%%DATADIR%%/completions/bzip2recover.fish
%%DATADIR%%/completions/bzr.fish
%%DATADIR%%/completions/cabal-dev.fish
%%DATADIR%%/completions/cabal.fish
%%DATADIR%%/completions/cancel.fish
%%DATADIR%%/completions/case.fish
%%DATADIR%%/completions/cat.fish
%%DATADIR%%/completions/cd.fish

%%DATADIR%%/completions/chmod.fish
%%DATADIR%%/completions/chown.fish
%%DATADIR%%/completions/chsh.fish
%%DATADIR%%/completions/colordiff.fish
%%DATADIR%%/completions/colorsvn.fish
%%DATADIR%%/completions/combine.fish
%%DATADIR%%/completions/command.fish
%%DATADIR%%/completions/commandline.fish
%%DATADIR%%/completions/compare.fish
%%DATADIR%%/completions/complete.fish
%%DATADIR%%/completions/composite.fish
%%DATADIR%%/completions/configure.fish
%%DATADIR%%/completions/conjure.fish
%%DATADIR%%/completions/continue.fish
%%DATADIR%%/completions/convert.fish
%%DATADIR%%/completions/cower.fish
%%DATADIR%%/completions/cowsay.fish
%%DATADIR%%/completions/cowthink.fish
%%DATADIR%%/completions/cp.fish
%%DATADIR%%/completions/cupsaccept.fish
%%DATADIR%%/completions/cupsdisable.fish
%%DATADIR%%/completions/cupsenable.fish
%%DATADIR%%/completions/cupsreject.fish
%%DATADIR%%/completions/cut.fish
%%DATADIR%%/completions/cvs.fish
%%DATADIR%%/completions/darcs.fish
%%DATADIR%%/completions/date.fish
%%DATADIR%%/completions/dcop.fish
%%DATADIR%%/completions/dd.fish
%%DATADIR%%/completions/df.fish
%%DATADIR%%/completions/diff.fish
%%DATADIR%%/completions/display.fish
%%DATADIR%%/completions/djview.fish
%%DATADIR%%/completions/djview3.fish
%%DATADIR%%/completions/djview4.fish
%%DATADIR%%/completions/dlocate.fish
%%DATADIR%%/completions/dmesg.fish
%%DATADIR%%/completions/dpkg.fish
%%DATADIR%%/completions/du.fish
%%DATADIR%%/completions/duply.fish
%%DATADIR%%/completions/dvipdf.fish
%%DATADIR%%/completions/dvipdfm.fish
%%DATADIR%%/completions/echo.fish
%%DATADIR%%/completions/effectv.fish
%%DATADIR%%/completions/egrep.fish
%%DATADIR%%/completions/eix-sync.fish
%%DATADIR%%/completions/eix.fish
%%DATADIR%%/completions/elatex.fish

%%DATADIR%%/completions/evince.fish
%%DATADIR%%/completions/exec.fish
%%DATADIR%%/completions/exit.fish
%%DATADIR%%/completions/expand.fish
%%DATADIR%%/completions/fg.fish
%%DATADIR%%/completions/fgrep.fish
%%DATADIR%%/completions/file.fish
%%DATADIR%%/completions/find.fish
%%DATADIR%%/completions/fish.fish
%%DATADIR%%/completions/fish_indent.fish
%%DATADIR%%/completions/flac.fish
%%DATADIR%%/completions/fluxbox-remote.fish
%%DATADIR%%/completions/ftp.fish
%%DATADIR%%/completions/funced.fish
%%DATADIR%%/completions/funcsave.fish
%%DATADIR%%/completions/function.fish
%%DATADIR%%/completions/functions.fish
%%DATADIR%%/completions/fuser.fish
%%DATADIR%%/completions/fusermount.fish
%%DATADIR%%/completions/gcc.fish
%%DATADIR%%/completions/gdb.fish
%%DATADIR%%/completions/gem.fish
%%DATADIR%%/completions/git.fish
%%DATADIR%%/completions/go.fish
%%DATADIR%%/completions/gpasswd.fish
%%DATADIR%%/completions/gpg.fish
%%DATADIR%%/completions/gphoto2.fish
%%DATADIR%%/completions/gprof.fish
%%DATADIR%%/completions/grep.fish
%%DATADIR%%/completions/groupadd.fish
%%DATADIR%%/completions/gunzip.fish
%%DATADIR%%/completions/gv.fish
%%DATADIR%%/completions/gvim.fish
%%DATADIR%%/completions/gvimdiff.fish
%%DATADIR%%/completions/gzip.fish
%%DATADIR%%/completions/help.fish
%%DATADIR%%/completions/hg.fish
%%DATADIR%%/completions/highlight.fish
%%DATADIR%%/completions/history.fish
%%DATADIR%%/completions/htop.fish
%%DATADIR%%/completions/iconv.fish
%%DATADIR%%/completions/id.fish
%%DATADIR%%/completions/identify.fish
%%DATADIR%%/completions/ifconfig.fish
%%DATADIR%%/completions/ifdata.fish
%%DATADIR%%/completions/ifdown.fish
%%DATADIR%%/completions/ifup.fish
%%DATADIR%%/completions/import.fish
%%DATADIR%%/completions/invoke-rc.d.fish
%%DATADIR%%/completions/jobs.fish
%%DATADIR%%/completions/kill.fish
%%DATADIR%%/completions/killall.fish
%%DATADIR%%/completions/la.fish
%%DATADIR%%/completions/latex.fish
%%DATADIR%%/completions/latexmk.fish
%%DATADIR%%/completions/lein.fish
%%DATADIR%%/completions/less.fish
%%DATADIR%%/completions/ll.fish
%%DATADIR%%/completions/ln.fish
%%DATADIR%%/completions/locate.fish
%%DATADIR%%/completions/logkeys.fish
%%DATADIR%%/completions/lp.fish
%%DATADIR%%/completions/lpadmin.fish
%%DATADIR%%/completions/lpinfo.fish
%%DATADIR%%/completions/lpmove.fish
%%DATADIR%%/completions/lpoptions.fish
%%DATADIR%%/completions/lppasswd.fish
%%DATADIR%%/completions/lpq.fish
%%DATADIR%%/completions/lpr.fish
%%DATADIR%%/completions/lprm.fish
%%DATADIR%%/completions/lpstat.fish
%%DATADIR%%/completions/ls.fish
%%DATADIR%%/completions/lsblk.fish
%%DATADIR%%/completions/lsof.fish
%%DATADIR%%/completions/lua.fish
%%DATADIR%%/completions/lualatex.fish
%%DATADIR%%/completions/lxpanel.fish
%%DATADIR%%/completions/m4.fish
%%DATADIR%%/completions/make.fish
%%DATADIR%%/completions/makedepend.fish
%%DATADIR%%/completions/makepkg.fish
%%DATADIR%%/completions/man.fish
%%DATADIR%%/completions/mc.fish
%%DATADIR%%/completions/md5sum.fish
%%DATADIR%%/completions/mimedb.fish
%%DATADIR%%/completions/mktemp.fish
%%DATADIR%%/completions/mocp.fish
%%DATADIR%%/completions/modprobe.fish
%%DATADIR%%/completions/mogrify.fish
%%DATADIR%%/completions/montage.fish
%%DATADIR%%/completions/mosh.fish
%%DATADIR%%/completions/mount.fish
%%DATADIR%%/completions/mplayer.fish
%%DATADIR%%/completions/msgfmt.fish
%%DATADIR%%/completions/mupdf.fish
%%DATADIR%%/completions/mutt.fish
%%DATADIR%%/completions/mv.fish
%%DATADIR%%/completions/namei.fish
%%DATADIR%%/completions/ncdu.fish
%%DATADIR%%/completions/netcat.fish
%%DATADIR%%/completions/nextd.fish
%%DATADIR%%/completions/nice.fish
%%DATADIR%%/completions/nl.fish
%%DATADIR%%/completions/nm.fish
%%DATADIR%%/completions/nmcli.fish
%%DATADIR%%/completions/not.fish
%%DATADIR%%/completions/oggenc.fish
%%DATADIR%%/completions/omega.fish
%%DATADIR%%/completions/or.fish
%%DATADIR%%/completions/pacman-color.fish
%%DATADIR%%/completions/pacman-key.fish
%%DATADIR%%/completions/pacman.fish
%%DATADIR%%/completions/pacmatic.fish
%%DATADIR%%/completions/pactree.fish
%%DATADIR%%/completions/patch.fish
%%DATADIR%%/completions/pbget.fish
%%DATADIR%%/completions/pdfelatex.fish
%%DATADIR%%/completions/pdfetex.fish
%%DATADIR%%/completions/pdflatex.fish
%%DATADIR%%/completions/pdftex.fish
%%DATADIR%%/completions/perl.fish
%%DATADIR%%/completions/pftp.fish
%%DATADIR%%/completions/pgrep.fish
%%DATADIR%%/completions/pine.fish
%%DATADIR%%/completions/ping.fish
%%DATADIR%%/completions/pinky.fish
%%DATADIR%%/completions/pkgadd.fish
%%DATADIR%%/completions/pkgfile.fish
%%DATADIR%%/completions/pkginfo.fish
%%DATADIR%%/completions/pkgmk.fish
%%DATADIR%%/completions/pkgrm.fish
%%DATADIR%%/completions/pkill.fish
%%DATADIR%%/completions/poff.fish
%%DATADIR%%/completions/pon.fish
%%DATADIR%%/completions/ports.fish
%%DATADIR%%/completions/prevd.fish
%%DATADIR%%/completions/prt-get.fish

%%DATADIR%%/completions/ps2pdf.fish
%%DATADIR%%/completions/psub.fish
%%DATADIR%%/completions/pushd.fish
%%DATADIR%%/completions/pydf.fish
%%DATADIR%%/completions/python.fish
%%DATADIR%%/completions/python2.fish
%%DATADIR%%/completions/python3.fish
%%DATADIR%%/completions/quilt.fish
%%DATADIR%%/completions/random.fish
%%DATADIR%%/completions/rbenv.fish
%%DATADIR%%/completions/rc.d.fish
%%DATADIR%%/completions/read.fish
%%DATADIR%%/completions/readlink.fish
%%DATADIR%%/completions/realpath.fish
%%DATADIR%%/completions/reject.fish
%%DATADIR%%/completions/rejmerge.fish
%%DATADIR%%/completions/renice.fish
%%DATADIR%%/completions/return.fish
%%DATADIR%%/completions/rfkill.fish
%%DATADIR%%/completions/rgrep.fish
%%DATADIR%%/completions/rm.fish
%%DATADIR%%/completions/rmdir.fish
%%DATADIR%%/completions/root.fish
%%DATADIR%%/completions/rpm.fish
%%DATADIR%%/completions/rsync.fish
%%DATADIR%%/completions/ruby-build.fish
%%DATADIR%%/completions/ruby.fish
%%DATADIR%%/completions/scanimage.fish
%%DATADIR%%/completions/scons.fish
%%DATADIR%%/completions/scp.fish
%%DATADIR%%/completions/screen.fish
%%DATADIR%%/completions/scrot.fish
%%DATADIR%%/completions/sed.fish
%%DATADIR%%/completions/seq.fish
%%DATADIR%%/completions/service.fish
%%DATADIR%%/completions/set.fish
%%DATADIR%%/completions/set_color.fish
%%DATADIR%%/completions/setxkbmap.fish
%%DATADIR%%/completions/sha1sum.fish
%%DATADIR%%/completions/sha224sum.fish
%%DATADIR%%/completions/sha256sum.fish
%%DATADIR%%/completions/sha384sum.fish
%%DATADIR%%/completions/sha512sum.fish
%%DATADIR%%/completions/sort.fish
%%DATADIR%%/completions/ssh.fish
%%DATADIR%%/completions/sshfs.fish
%%DATADIR%%/completions/stat.fish
%%DATADIR%%/completions/status.fish
%%DATADIR%%/completions/stream.fish
%%DATADIR%%/completions/su.fish
%%DATADIR%%/completions/sudo.fish
%%DATADIR%%/completions/svn.fish
%%DATADIR%%/completions/sylpheed.fish
%%DATADIR%%/completions/tail.fish
%%DATADIR%%/completions/tar.fish
%%DATADIR%%/completions/tee.fish
%%DATADIR%%/completions/telnet.fish
%%DATADIR%%/completions/test.fish
%%DATADIR%%/completions/tex.fish
%%DATADIR%%/completions/time.fish
%%DATADIR%%/completions/timeout.fish
%%DATADIR%%/completions/tmux.fish
%%DATADIR%%/completions/top.fish
%%DATADIR%%/completions/totem.fish
%%DATADIR%%/completions/touch.fish
%%DATADIR%%/completions/tr.fish
%%DATADIR%%/completions/trap.fish
%%DATADIR%%/completions/tree.fish
%%DATADIR%%/completions/type.fish
%%DATADIR%%/completions/ulimit.fish
%%DATADIR%%/completions/umount.fish
%%DATADIR%%/completions/uname.fish
%%DATADIR%%/completions/unexpand.fish
%%DATADIR%%/completions/uniq.fish
%%DATADIR%%/completions/unrar.fish
%%DATADIR%%/completions/update-eix-remote.fish

%%DATADIR%%/completions/vared.fish
%%DATADIR%%/completions/vi.fish
%%DATADIR%%/completions/vim.fish
%%DATADIR%%/completions/vimdiff.fish
%%DATADIR%%/completions/w.fish
%%DATADIR%%/completions/wajig.fish
%%DATADIR%%/completions/watch.fish
%%DATADIR%%/completions/wc.fish
%%DATADIR%%/completions/wesnoth.fish
%%DATADIR%%/completions/wget.fish
%%DATADIR%%/completions/whatis.fish
%%DATADIR%%/completions/which.fish
%%DATADIR%%/completions/who.fish
%%DATADIR%%/completions/wicd-cli.fish
%%DATADIR%%/completions/wicd-client.fish
%%DATADIR%%/completions/wicd-gtk.fish
%%DATADIR%%/completions/wpa_cli.fish
%%DATADIR%%/completions/wvdial.fish
%%DATADIR%%/completions/xargs.fish
%%DATADIR%%/completions/xdg-mime.fish
%%DATADIR%%/completions/xdvi.fish
%%DATADIR%%/completions/xelatex.fish
%%DATADIR%%/completions/xgettext.fish
%%DATADIR%%/completions/xmms.fish
%%DATADIR%%/completions/xpdf.fish
%%DATADIR%%/completions/xprop.fish
%%DATADIR%%/completions/xrandr.fish
%%DATADIR%%/completions/xrdb.fish
%%DATADIR%%/completions/xsel.fish
%%DATADIR%%/completions/xterm.fish
%%DATADIR%%/completions/yaourt.fish
%%DATADIR%%/completions/yum.fish
%%DATADIR%%/completions/zcat.fish
%%DATADIR%%/completions/zip.fish

%%DATADIR%%/functions/__fish_bind_test1.fish
%%DATADIR%%/functions/__fish_bind_test2.fish
%%DATADIR%%/functions/__fish_commandline_test.fish
%%DATADIR%%/functions/__fish_complete_abook_formats.fish
%%DATADIR%%/functions/__fish_complete_ant_targets.fish
%%DATADIR%%/functions/__fish_complete_atool.fish
%%DATADIR%%/functions/__fish_complete_atool_archive_contents.fish
%%DATADIR%%/functions/__fish_complete_bittorrent.fish
%%DATADIR%%/functions/__fish_complete_cabal.fish
%%DATADIR%%/functions/__fish_complete_cd.fish
%%DATADIR%%/functions/__fish_complete_command.fish
%%DATADIR%%/functions/__fish_complete_convert_options.fish
%%DATADIR%%/functions/__fish_complete_diff.fish
%%DATADIR%%/functions/__fish_complete_directories.fish
%%DATADIR%%/functions/__fish_complete_file_url.fish
%%DATADIR%%/functions/__fish_complete_ftp.fish
%%DATADIR%%/functions/__fish_complete_grep.fish
%%DATADIR%%/functions/__fish_complete_groups.fish
%%DATADIR%%/functions/__fish_complete_list.fish
%%DATADIR%%/functions/__fish_complete_lpr.fish
%%DATADIR%%/functions/__fish_complete_lpr_option.fish
%%DATADIR%%/functions/__fish_complete_ls.fish
%%DATADIR%%/functions/__fish_complete_man.fish
%%DATADIR%%/functions/__fish_complete_mime.fish
%%DATADIR%%/functions/__fish_complete_pacman.fish
%%DATADIR%%/functions/__fish_complete_pgrep.fish
%%DATADIR%%/functions/__fish_complete_pids.fish
%%DATADIR%%/functions/__fish_complete_ppp_peer.fish
%%DATADIR%%/functions/__fish_complete_proc.fish
%%DATADIR%%/functions/__fish_complete_python.fish
%%DATADIR%%/functions/__fish_complete_setxkbmap.fish
%%DATADIR%%/functions/__fish_complete_ssh.fish
%%DATADIR%%/functions/__fish_complete_subcommand.fish
%%DATADIR%%/functions/__fish_complete_subcommand_root.fish
%%DATADIR%%/functions/__fish_complete_suffix.fish
%%DATADIR%%/functions/__fish_complete_svn.fish
%%DATADIR%%/functions/__fish_complete_svn_diff.fish
%%DATADIR%%/functions/__fish_complete_tar.fish
%%DATADIR%%/functions/__fish_complete_tex.fish
%%DATADIR%%/functions/__fish_complete_unrar.fish
%%DATADIR%%/functions/__fish_complete_users.fish
%%DATADIR%%/functions/__fish_complete_vi.fish
%%DATADIR%%/functions/__fish_complete_wvdial_peers.fish
%%DATADIR%%/functions/__fish_complete_xsum.fish
%%DATADIR%%/functions/__fish_config_interactive.fish
%%DATADIR%%/functions/__fish_contains_opt.fish
%%DATADIR%%/functions/__fish_crux_packages.fish
%%DATADIR%%/functions/__fish_describe_command.fish
%%DATADIR%%/functions/__fish_filter_ant_targets.fish
%%DATADIR%%/functions/__fish_filter_mime.fish
%%DATADIR%%/functions/__fish_git_prompt.fish
%%DATADIR%%/functions/__fish_gnu_complete.fish
%%DATADIR%%/functions/__fish_is_first_token.fish
%%DATADIR%%/functions/__fish_is_token_n.fish
%%DATADIR%%/functions/__fish_list_current_token.fish
%%DATADIR%%/functions/__fish_make_completion_signals.fish
%%DATADIR%%/functions/__fish_move_last.fish
%%DATADIR%%/functions/__fish_no_arguments.fish
%%DATADIR%%/functions/__fish_not_contain_opt.fish
%%DATADIR%%/functions/__fish_paginate.fish
%%DATADIR%%/functions/__fish_ports_dirs.fish
%%DATADIR%%/functions/__fish_print_abook_emails.fish
%%DATADIR%%/functions/__fish_print_addresses.fish
%%DATADIR%%/functions/__fish_print_arch_daemons.fish
%%DATADIR%%/functions/__fish_print_commands.fish
%%DATADIR%%/functions/__fish_print_debian_services.fish
%%DATADIR%%/functions/__fish_print_encodings.fish
%%DATADIR%%/functions/__fish_print_filesystems.fish

%%DATADIR%%/functions/__fish_print_help.fish
%%DATADIR%%/functions/__fish_print_hostnames.fish
%%DATADIR%%/functions/__fish_print_interfaces.fish
%%DATADIR%%/functions/__fish_print_lpr_options.fish
%%DATADIR%%/functions/__fish_print_lpr_printers.fish
%%DATADIR%%/functions/__fish_print_lsblk_columns.fish
%%DATADIR%%/functions/__fish_print_make_targets.fish
%%DATADIR%%/functions/__fish_print_mounted.fish
%%DATADIR%%/functions/__fish_print_packages.fish
%%DATADIR%%/functions/__fish_print_svn_rev.fish
%%DATADIR%%/functions/__fish_print_users.fish
%%DATADIR%%/functions/__fish_print_xdg_mimeapps.fish
%%DATADIR%%/functions/__fish_print_xdg_mimetypes.fish
%%DATADIR%%/functions/__fish_print_xrandr_modes.fish
%%DATADIR%%/functions/__fish_print_xrandr_outputs.fish
%%DATADIR%%/functions/__fish_print_xwindows.fish
%%DATADIR%%/functions/__fish_prt_no_subcommand.fish
%%DATADIR%%/functions/__fish_prt_packages.fish
%%DATADIR%%/functions/__fish_prt_ports.fish

%%DATADIR%%/functions/__fish_seen_subcommand_from.fish
%%DATADIR%%/functions/__fish_test_arg.fish
%%DATADIR%%/functions/__fish_use_subcommand.fish
%%DATADIR%%/functions/__terlar_git_prompt.fish
%%DATADIR%%/functions/alias.fish
%%DATADIR%%/functions/cd.fish
%%DATADIR%%/functions/contains_seq.fish
%%DATADIR%%/functions/delete-or-exit.fish
%%DATADIR%%/functions/dirh.fish
%%DATADIR%%/functions/dirs.fish
%%DATADIR%%/functions/down-or-search.fish
%%DATADIR%%/functions/eval.fish
%%DATADIR%%/functions/fish_config.fish
%%DATADIR%%/functions/fish_default_key_bindings.fish
%%DATADIR%%/functions/fish_indent.fish
%%DATADIR%%/functions/fish_prompt.fish
%%DATADIR%%/functions/fish_update_completions.fish
%%DATADIR%%/functions/funced.fish
%%DATADIR%%/functions/funcsave.fish
%%DATADIR%%/functions/grep.fish
%%DATADIR%%/functions/help.fish
%%DATADIR%%/functions/history.fish
%%DATADIR%%/functions/isatty.fish
%%DATADIR%%/functions/la.fish
%%DATADIR%%/functions/ll.fish
%%DATADIR%%/functions/ls.fish
%%DATADIR%%/functions/man.fish
%%DATADIR%%/functions/math.fish
%%DATADIR%%/functions/mimedb.fish
%%DATADIR%%/functions/nextd-or-forward-word.fish
%%DATADIR%%/functions/nextd.fish
%%DATADIR%%/functions/open.fish

%%DATADIR%%/functions/prompt_pwd.fish
%%DATADIR%%/functions/psub.fish
%%DATADIR%%/functions/pushd.fish
%%DATADIR%%/functions/seq.fish
%%DATADIR%%/functions/setenv.fish
%%DATADIR%%/functions/sgrep.fish
%%DATADIR%%/functions/trap.fish

%%DATADIR%%/functions/umask.fish
%%DATADIR%%/functions/up-or-search.fish
%%DATADIR%%/functions/vared.fish
%%DATADIR%%/tools/create_manpage_completions.py
%%DATADIR%%/tools/deroff.py
%%DATADIR%%/tools/web_config/delete.png
%%DATADIR%%/tools/web_config/index.html
%%DATADIR%%/tools/web_config/jquery.js
%%DATADIR%%/tools/web_config/sample_prompts/classic.fish
%%DATADIR%%/tools/web_config/sample_prompts/classic_git.fish
%%DATADIR%%/tools/web_config/sample_prompts/classic_status.fish
%%DATADIR%%/tools/web_config/sample_prompts/informative.fish
%%DATADIR%%/tools/web_config/sample_prompts/justadollar.fish
%%DATADIR%%/tools/web_config/sample_prompts/lonetwin.fish
%%DATADIR%%/tools/web_config/sample_prompts/minimalist.fish
%%DATADIR%%/tools/web_config/sample_prompts/nim.fish
%%DATADIR%%/tools/web_config/sample_prompts/pythonista.fish
%%DATADIR%%/tools/web_config/sample_prompts/robbyrussell.fish
%%DATADIR%%/tools/web_config/sample_prompts/screen_savvy.fish
%%DATADIR%%/tools/web_config/sample_prompts/terlar.fish
%%DATADIR%%/tools/web_config/sample_prompts/user_host_path.fish
%%DATADIR%%/tools/web_config/webconfig.py
%%NLS%%share/locale/de/LC_MESSAGES/fish.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fish.mo
%%NLS%%share/locale/sv/LC_MESSAGES/fish.mo
%%NLS%%share/locale/en/LC_MESSAGES/fish.mo
@dirrm %%DATADIR%%/tools/web_config/sample_prompts
@dirrm %%DATADIR%%/tools/web_config
@dirrm %%DATADIR%%/tools
@dirrm %%DATADIR%%/functions
@dirrm %%DATADIR%%/completions
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%ETCDIR%%
@exec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak; echo %D/bin/fish) > /etc/shells; rm -f /etc/shells.bak
@unexec cp /etc/shells /etc/shells.bak; (grep -v %D/bin/fish /etc/shells.bak) > /etc/shells; rm -f /etc/shells.bak

Return to bug 178868

Lines 2-72 Link Here

(-)shells/fish/Makefile (-49 / +37 lines)
2	# $FreeBSD: head/shells/fish/Makefile 316683 2013-04-27 18:25:24Z mva $	2	# $FreeBSD: head/shells/fish/Makefile 316683 2013-04-27 18:25:24Z mva $
3		3
4	PORTNAME= fish	4	PORTNAME= fish
5	PORTVERSION= 1.23.1	5	PORTVERSION= 2.0.0
6	PORTREVISION= 9
7	CATEGORIES= shells	6	CATEGORIES= shells
8	MASTER_SITES= SF	7	MASTER_SITES= http://fishshell.com/files/%SUBDIR%/
		8	MASTER_SITE_SUBDIR= ${PORTVERSION}
9		9
10	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
11	COMMENT= A user friendly command line shell	11	COMMENT= User friendly command line shell
12		12
13	USE_AUTOTOOLS= autoconf	13	OPTIONS_DEFINE= DOCS NLS
14	USE_GMAKE= yes
15	GNU_CONFIGURE= yes
16		14
17	USES= gettext iconv	15	WRKSRC= ${WRKDIR}/${PORTNAME}
18	CPPFLAGS+= -I${LOCALBASE}/include
19	LDFLAGS+= -L${LOCALBASE}/lib
20	CONFIGURE_ENV+= LIBS="${LDFLAGS}"
21	CONFIGURE_ARGS= --docdir=${DOCSDIR}
22
23	OPTIONS_DEFINE= XSEL DOXYGEN
24	OPTIONS_DEFAULT= XSEL DOXYGEN
25	XSEL_DESC= Build with xsel
26		16
27	.include <bsd.port.options.mk>	17	USES= iconv
28		18	USE_GMAKE= yes
29	MAN1= alias.1 and.1 begin.1 bg.1 bind.1 block.1 \	19	USE_AUTOTOOLS= autoconf
30	break.1 breakpoint.1 builtin.1 case.1 cd.1 \	20	CONFIGURE_ARGS= --docdir=${WRKDIR}/tmproot
31	command.1 commandline.1 complete.1 contains.1 \	21	MAKE_JOBS_SAFE= yes
32	continue.1 count.1 dirh.1 dirs.1 else.1 \
33	emit.1 end.1 eval.1 exec.1 exit.1 fg.1 fish.1 \
34	fish_indent.1 fish_pager.1 fish_prompt.1 \
35	fishd.1 for.1 funced.1 funcsave.1 function.1 \
36	functions.1 help.1 if.1 isatty.1 jobs.1 math.1 \
37	mimedb.1 nextd.1 not.1 open.1 or.1 popd.1 \
38	prevd.1 psub.1 pushd.1 random.1 read.1 return.1 \
39	set.1 set_color.1 source.1 status.1 switch.1 \
40	trap.1 type.1 ulimit.1 umask.1 vared.1 while.1
41		22
42	# Don't use the bundled xsel	23	CPPFLAGS+= -I${LOCALBASE}/include
43	CONFIGURE_ARGS+= --without-xsel	24	LDFLAGS+= -L${LOCALBASE}/lib -pthread
44		25
45	.if ${PORT_OPTIONS:MXSEL}	26	MAN1= fish.1 fish_indent.1 fish_pager.1 fishd.1 mimedb.1
46	RUN_DEPENDS= xsel:${PORTSDIR}/x11/xsel-conrad
47	.endif
48		27
49	.if ${PORT_OPTIONS:MDOXYGEN}	28	.include <bsd.port.options.mk>
50	BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen
51	.endif
52		29
53	.if ${OSVERSION} > 900008	30	.if ${PORT_OPTIONS:MNLS}
54	# already in base system	31	USES+= gettext
55	PLIST_SUB+= SEQ="@comment "	32	CONFIGURE_ENV+= ac_cv_func_gettext=yes
		33	PLIST_SUB+= NLS=""
56	.else	34	.else
57	PLIST_SUB+= SEQ=""	35	CONFIGURE_ARGS+=--without-gettext
		36	PLIST_SUB+= NLS="@comment "
58	.endif	37	.endif
59		38
60	post-patch:	39	post-patch:
61	.if ! ${PORT_OPTIONS:MDOCS} \|\| ! ${PORT_OPTIONS:MDOXYGEN}	40	@${REINPLACE_CMD} -e \
62	@${REINPLACE_CMD} -e 's\|$(PROGRAMS) user_doc\|$(PROGRAMS)\|' \	41	's\| "$$(HAVE_GETTEXT)" = 1\| x$$(HAVE_GETTEXT) = x1\| ; \
63	${WRKSRC}/Makefile.in	42	s\| $$(HAVE_GETTEXT) = 1\| x$$(HAVE_GETTEXT) = x1\| ; \
64	@${REINPLACE_CMD} -e 589,593d ${WRKSRC}/Makefile.in	43	/fish\/man\/man1/d' ${WRKSRC}/Makefile.in
65	.endif	44	@${REINPLACE_CMD} -e \
		45	's\|-rdynamic\|-Wl,--export-dynamic\| ; \
		46	/pthread_create/d ; \
		47	s\|ncurses curses\|curses\| ; \
		48	s\|ncurses.h\|\|' ${WRKSRC}/configure.ac
66		49
67	post-install:	50	post-install:
68	${CP} ${DATADIR}/man/*.1 ${PREFIX}/man/man1/	51	.if ${PORT_OPTIONS:MDOCS}
69	${RM} -rf ${DATADIR}/man	52	@${MKDIR} ${DOCSDIR}
		53	@(cd ${WRKDIR}/tmproot && ${COPYTREE_SHARE} . ${DOCSDIR})
		54	.endif
		55	.for i in fish fish_indent fish_pager fishd mimedb
		56	@${STRIP_CMD} ${PREFIX}/bin/${i}
		57	.endfor
70	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \	58	if ${GREP} -q '${PREFIX}/bin/${PORTNAME}' /etc/shells; then \
71	${TRUE}; \	59	${TRUE}; \
72	else \	60	else \

Lines 1-118 Link Here

(-)shells/fish/files/patch-configure.ac (-118 lines)
1	--- configure.ac.orig 2009-03-08 07:46:47.000000000 -0700
2	+++ configure.ac 2009-09-18 21:28:07.000000000 -0700
3	@@ -451,20 +451,6 @@
4
5
6	#
7	-# Set up the directory where the documentation files should be
8	-# installed
9	-#
10	-
11	-AC_ARG_VAR( [docdir], [Documentation direcotry] )
12	-
13	-if test -z $docdir; then
14	- docdir=$datadir/doc/fish
15	-else
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,,)
113	-fi
114	-LIBS_SET_COLOR=$LIBS
115	-LIBS=$LIBS_COMMON
116
117	#
118	# Check presense of various header files