diff options
| -rw-r--r-- | shells/fish/Makefile | 18 | ||||
| -rw-r--r-- | shells/fish/distinfo | 4 | ||||
| -rw-r--r-- | shells/fish/files/patch-exec.cpp | 26 | ||||
| -rw-r--r-- | shells/fish/files/patch-io.h | 11 | ||||
| -rw-r--r-- | shells/fish/pkg-plist | 33 |
5 files changed, 28 insertions, 64 deletions
diff --git a/shells/fish/Makefile b/shells/fish/Makefile index 44f6293..086c0a2 100644 --- a/shells/fish/Makefile +++ b/shells/fish/Makefile @@ -2,25 +2,24 @@ # $FreeBSD$ PORTNAME= fish -PORTVERSION= 2.0.0 +PORTVERSION= 2.1.0 CATEGORIES= shells -MASTER_SITES= http://fishshell.com/files/%SUBDIR%/ -MASTER_SITE_SUBDIR= ${PORTVERSION} +MASTER_SITES= http://fishshell.com/files/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@FreeBSD.org COMMENT= User friendly command line shell -OPTIONS_DEFINE= DOCS NLS -OPTIONS_SUB= yes - -WRKSRC= ${WRKDIR}/${PORTNAME} - USES= gmake iconv USE_AUTOTOOLS= autoconf CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread ${ICONV_LIB} +PORTDOCS= * + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + NLS_USES= gettext NLS_CONFIGURE_ENV= ac_cv_func_gettext=yes NLS_CONFIGURE_OFF= --without-gettext @@ -30,6 +29,7 @@ post-patch: '/^all:/s|user_doc|| ; \ s| "$$(HAVE_GETTEXT)" = 1| x$$(HAVE_GETTEXT) = x1| ; \ s| $$(HAVE_GETTEXT) = 1| x$$(HAVE_GETTEXT) = x1| ; \ + s|$$(DESTDIR)$$(bindir)/fish|$$(bindir)/fish|g ; \ /fish\/man\/man1/d' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-rdynamic|-Wl,--export-dynamic| ; \ diff --git a/shells/fish/distinfo b/shells/fish/distinfo index 7f2fd75..ad07b56 100644 --- a/shells/fish/distinfo +++ b/shells/fish/distinfo @@ -1,2 +1,2 @@ -SHA256 (fish-2.0.0.tar.gz) = 7e4c4a0b3c518769a3d31b235e743de7a8d52f851ad19d2df9d53534e6238303 -SIZE (fish-2.0.0.tar.gz) = 1540652 +SHA256 (fish-2.1.0.tar.gz) = af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044 +SIZE (fish-2.1.0.tar.gz) = 1707921 diff --git a/shells/fish/files/patch-exec.cpp b/shells/fish/files/patch-exec.cpp deleted file mode 100644 index 6d0c4c7..0000000 --- a/shells/fish/files/patch-exec.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- exec.cpp.orig -+++ exec.cpp -@@ -343,7 +343,11 @@ - */ - static int has_fd(const io_chain_t &d, int fd) - { -+#if defined(_LIBCPP_VERSION) -+ return io_chain_get(d, fd) != nullptr; -+#else - return io_chain_get(d, fd) != NULL; -+#endif - } - - /** -@@ -606,7 +610,11 @@ - j->io.insert(j->io.begin(), parser.block_io.begin(), parser.block_io.end()); - } - -+#if defined(LIBCPP_VERSION) -+ const io_buffer_t *input_redirect = nullptr; -+#else - const io_buffer_t *input_redirect = NULL; -+#endif - for (size_t idx = 0; idx < j->io.size(); idx++) - { - const shared_ptr<io_data_t> &io = j->io.at(idx); diff --git a/shells/fish/files/patch-io.h b/shells/fish/files/patch-io.h deleted file mode 100644 index 4540762..0000000 --- a/shells/fish/files/patch-io.h +++ /dev/null @@ -1,11 +0,0 @@ ---- io.h.orig -+++ io.h -@@ -2,7 +2,7 @@ - #define FISH_IO_H - - #include <vector> --#if __cplusplus > 199711L -+#if __cplusplus > 199711L || defined(_LIBCPP_VERSION) - // C++11 - #include <memory> - using std::shared_ptr; diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist index fadc688..80412b7 100644 --- a/shells/fish/pkg-plist +++ b/shells/fish/pkg-plist @@ -9,20 +9,6 @@ man/man1/fish_indent.1.gz man/man1/fish_pager.1.gz man/man1/fishd.1.gz man/man1/mimedb.1.gz -%%PORTDOCS%%%%DOCSDIR%%/commands.html -%%PORTDOCS%%%%DOCSDIR%%/design.html -%%PORTDOCS%%%%DOCSDIR%%/doc_8h_source.html -%%PORTDOCS%%%%DOCSDIR%%/doxygen.css -%%PORTDOCS%%%%DOCSDIR%%/doxygen.png -%%PORTDOCS%%%%DOCSDIR%%/faq.html -%%PORTDOCS%%%%DOCSDIR%%/files.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/license.html -%%PORTDOCS%%%%DOCSDIR%%/pages.html -%%PORTDOCS%%%%DOCSDIR%%/tab_b.gif -%%PORTDOCS%%%%DOCSDIR%%/tab_l.gif -%%PORTDOCS%%%%DOCSDIR%%/tab_r.gif -%%PORTDOCS%%%%DOCSDIR%%/tabs.css %%DATADIR%%/completions/abook.fish %%DATADIR%%/completions/acat.fish %%DATADIR%%/completions/accept.fish @@ -50,6 +36,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/apt-key.fish %%DATADIR%%/completions/apt-listbugs.fish %%DATADIR%%/completions/apt-listchanges.fish +%%DATADIR%%/completions/apt-mark.fish %%DATADIR%%/completions/apt-move.fish %%DATADIR%%/completions/apt-proxy-import.fish %%DATADIR%%/completions/apt-rdepends.fish @@ -82,6 +69,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/btdownloadcurses.py.fish %%DATADIR%%/completions/btdownloadheadless.py.fish %%DATADIR%%/completions/builtin.fish +%%DATADIR%%/completions/bundle.fish %%DATADIR%%/completions/bunzip2.fish %%DATADIR%%/completions/bzcat.fish %%DATADIR%%/completions/bzip2.fish @@ -90,6 +78,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/cabal-dev.fish %%DATADIR%%/completions/cabal.fish %%DATADIR%%/completions/cancel.fish +%%DATADIR%%/completions/canto.fish %%DATADIR%%/completions/case.fish %%DATADIR%%/completions/cat.fish %%DATADIR%%/completions/cd.fish @@ -184,6 +173,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/gvim.fish %%DATADIR%%/completions/gvimdiff.fish %%DATADIR%%/completions/gzip.fish +%%DATADIR%%/completions/head.fish %%DATADIR%%/completions/help.fish %%DATADIR%%/completions/hg.fish %%DATADIR%%/completions/highlight.fish @@ -225,6 +215,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/lsof.fish %%DATADIR%%/completions/lua.fish %%DATADIR%%/completions/lualatex.fish +%%DATADIR%%/completions/lunchy.fish %%DATADIR%%/completions/lxpanel.fish %%DATADIR%%/completions/m4.fish %%DATADIR%%/completions/make.fish @@ -249,6 +240,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/namei.fish %%DATADIR%%/completions/ncdu.fish %%DATADIR%%/completions/netcat.fish +%%DATADIR%%/completions/netctl.fish %%DATADIR%%/completions/nextd.fish %%DATADIR%%/completions/nice.fish %%DATADIR%%/completions/nl.fish @@ -283,11 +275,13 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/pkill.fish %%DATADIR%%/completions/poff.fish %%DATADIR%%/completions/pon.fish +%%DATADIR%%/completions/portmaster.fish %%DATADIR%%/completions/ports.fish %%DATADIR%%/completions/prevd.fish %%DATADIR%%/completions/prt-get.fish %%DATADIR%%/completions/ps.fish %%DATADIR%%/completions/ps2pdf.fish +%%DATADIR%%/completions/psql.fish %%DATADIR%%/completions/psub.fish %%DATADIR%%/completions/pushd.fish %%DATADIR%%/completions/pydf.fish @@ -340,6 +334,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/sudo.fish %%DATADIR%%/completions/svn.fish %%DATADIR%%/completions/sylpheed.fish +%%DATADIR%%/completions/systemctl.fish %%DATADIR%%/completions/tail.fish %%DATADIR%%/completions/tar.fish %%DATADIR%%/completions/tee.fish @@ -365,9 +360,11 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/update-eix-remote.fish %%DATADIR%%/completions/update-eix.fish %%DATADIR%%/completions/useradd.fish +%%DATADIR%%/completions/vagrant.fish %%DATADIR%%/completions/valgrind.fish %%DATADIR%%/completions/vared.fish %%DATADIR%%/completions/vi.fish +%%DATADIR%%/completions/vim-addons.fish %%DATADIR%%/completions/vim.fish %%DATADIR%%/completions/vimdiff.fish %%DATADIR%%/completions/w.fish @@ -400,6 +397,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/completions/yum.fish %%DATADIR%%/completions/zcat.fish %%DATADIR%%/completions/zip.fish +%%DATADIR%%/completions/zypper.fish %%DATADIR%%/config.fish %%DATADIR%%/functions/N_.fish %%DATADIR%%/functions/_.fish @@ -494,8 +492,10 @@ man/man1/mimedb.1.gz %%DATADIR%%/functions/__fish_prt_ports.fish %%DATADIR%%/functions/__fish_prt_use_package.fish %%DATADIR%%/functions/__fish_prt_use_port.fish +%%DATADIR%%/functions/__fish_pwd.fish %%DATADIR%%/functions/__fish_seen_subcommand_from.fish %%DATADIR%%/functions/__fish_test_arg.fish +%%DATADIR%%/functions/__fish_urlencode.fish %%DATADIR%%/functions/__fish_use_subcommand.fish %%DATADIR%%/functions/__terlar_git_prompt.fish %%DATADIR%%/functions/alias.fish @@ -516,6 +516,7 @@ man/man1/mimedb.1.gz %%DATADIR%%/functions/grep.fish %%DATADIR%%/functions/help.fish %%DATADIR%%/functions/history.fish +%%DATADIR%%/functions/hostname.fish %%DATADIR%%/functions/isatty.fish %%DATADIR%%/functions/la.fish %%DATADIR%%/functions/ll.fish @@ -549,6 +550,7 @@ man/man1/mimedb.1.gz %%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/informative_git.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 @@ -560,16 +562,15 @@ man/man1/mimedb.1.gz %%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/en/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 |
