Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
shells/fish/Makefile
View File

@@ -1,15 +1,16 @@
# $NetBSD: Makefile,v 1.4 2014/02/07 21:29:09 wiz Exp $
# $NetBSD: Makefile,v 1.6 2015/03/06 21:03:20 ryoon Exp $
DISTNAME= fish-1.23.1
PKGREVISION= 1
FISHVER= 2.1.2
DISTNAME= fish-${FISHVER}
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fish/}
MASTER_SITES= http://fishshell.com/files/${FISHVER}/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.fishshell.org/
HOMEPAGE= http://www.fishshell.com/
COMMENT= User friendly command line shell for UNIX-like operating systems
LICENSE= gnu-gpl-v2
USE_LANGUAGES+= c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-xsel
@@ -20,13 +21,18 @@ INSTALL_ENV+= EGDIR=${EGDIR}
PKG_SHELL= bin/fish
REPLACE_PYTHON+= share/tools/*.py
REPLACE_PYTHON+= share/tools/web_config/webconfig.py
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
CPPFLAGS+= -DHAVE_BACKTRACE
CPPFLAGS+= -DHAVE_BACKTRACE_SYMBOLS
CXXFLAGS.NetBSD+= -fpermissive
LDFLAGS+= -lexecinfo
.endif
.include "../../lang/python/application.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

397
shells/fish/PLIST
View File

@@ -1,36 +1,62 @@
@comment $NetBSD: PLIST,v 1.1 2012/12/12 13:21:42 wiz Exp $
@comment $NetBSD: PLIST,v 1.2 2015/03/06 21:03:20 ryoon Exp $
bin/fish
bin/fish_indent
bin/fish_pager
bin/fishd
bin/mimedb
bin/set_color
man/man1/fish.1
man/man1/fish_indent.1
man/man1/fish_pager.1
man/man1/fishd.1
man/man1/mimedb.1
man/man1/set_color.1
share/doc/fish/ChangeLog
share/doc/fish/arrowdown.png
share/doc/fish/arrowright.png
share/doc/fish/bc_s.png
share/doc/fish/bdwn.png
share/doc/fish/closed.png
share/doc/fish/commands.html
share/doc/fish/design.html
share/doc/fish/doc_8h-source.html
share/doc/fish/doc.png
share/doc/fish/doc_8h_source.html
share/doc/fish/doxygen.css
share/doc/fish/doxygen.png
share/doc/fish/dynsections.js
share/doc/fish/faq.html
share/doc/fish/files.html
share/doc/fish/folderclosed.png
share/doc/fish/folderopen.png
share/doc/fish/index.html
share/doc/fish/jquery.js
share/doc/fish/license.html
share/doc/fish/nav_f.png
share/doc/fish/nav_g.png
share/doc/fish/nav_h.png
share/doc/fish/open.png
share/doc/fish/pages.html
share/doc/fish/tab_b.gif
share/doc/fish/tab_l.gif
share/doc/fish/tab_r.gif
share/doc/fish/splitbar.png
share/doc/fish/sync_off.png
share/doc/fish/sync_on.png
share/doc/fish/tab_a.png
share/doc/fish/tab_b.png
share/doc/fish/tab_h.png
share/doc/fish/tab_s.png
share/doc/fish/tabs.css
share/doc/fish/tutorial.html
share/examples/fish/fish/config.fish
share/fish/completions/abook.fish
share/fish/completions/acat.fish
share/fish/completions/accept.fish
share/fish/completions/ack.fish
share/fish/completions/acpi.fish
share/fish/completions/adduser.fish
share/fish/completions/adiff.fish
share/fish/completions/als.fish
share/fish/completions/amixer.fish
share/fish/completions/anamnesis.fish
share/fish/completions/and.fish
share/fish/completions/animate.fish
share/fish/completions/ant.fish
share/fish/completions/apack.fish
share/fish/completions/apm.fish
share/fish/completions/apropos.fish
share/fish/completions/apt-build.fish
@@ -44,6 +70,7 @@ share/fish/completions/apt-get.fish
share/fish/completions/apt-key.fish
share/fish/completions/apt-listbugs.fish
share/fish/completions/apt-listchanges.fish
share/fish/completions/apt-mark.fish
share/fish/completions/apt-move.fish
share/fish/completions/apt-proxy-import.fish
share/fish/completions/apt-rdepends.fish
@@ -56,11 +83,14 @@ share/fish/completions/apt-src.fish
share/fish/completions/apt-zip-inst.fish
share/fish/completions/apt-zip-list.fish
share/fish/completions/aptitude.fish
share/fish/completions/arepack.fish
share/fish/completions/arp.fish
share/fish/completions/at.fish
share/fish/completions/atd.fish
share/fish/completions/atool.fish
share/fish/completions/atq.fish
share/fish/completions/atrm.fish
share/fish/completions/aunpack.fish
share/fish/completions/awk.fish
share/fish/completions/badblocks.fish
share/fish/completions/bc.fish
@@ -69,13 +99,20 @@ share/fish/completions/bind.fish
share/fish/completions/bison.fish
share/fish/completions/block.fish
share/fish/completions/break.fish
share/fish/completions/brew.fish
share/fish/completions/btdownloadcurses.py.fish
share/fish/completions/btdownloadheadless.py.fish
share/fish/completions/builtin.fish
share/fish/completions/bundle.fish
share/fish/completions/bunzip2.fish
share/fish/completions/bzcat.fish
share/fish/completions/bzip2.fish
share/fish/completions/bzip2recover.fish
share/fish/completions/bzr.fish
share/fish/completions/cabal-dev.fish
share/fish/completions/cabal.fish
share/fish/completions/cancel.fish
share/fish/completions/canto.fish
share/fish/completions/case.fish
share/fish/completions/cat.fish
share/fish/completions/cd.fish
@@ -84,26 +121,48 @@ share/fish/completions/chgrp.fish
share/fish/completions/chmod.fish
share/fish/completions/chown.fish
share/fish/completions/chsh.fish
share/fish/completions/colordiff.fish
share/fish/completions/colorsvn.fish
share/fish/completions/combine.fish
share/fish/completions/command.fish
share/fish/completions/commandline.fish
share/fish/completions/compare.fish
share/fish/completions/complete.fish
share/fish/completions/composite.fish
share/fish/completions/configure.fish
share/fish/completions/conjure.fish
share/fish/completions/continue.fish
share/fish/completions/convert.fish
share/fish/completions/cower.fish
share/fish/completions/cowsay.fish
share/fish/completions/cowthink.fish
share/fish/completions/cp.fish
share/fish/completions/cupsaccept.fish
share/fish/completions/cupsdisable.fish
share/fish/completions/cupsenable.fish
share/fish/completions/cupsreject.fish
share/fish/completions/cut.fish
share/fish/completions/cvs.fish
share/fish/completions/darcs.fish
share/fish/completions/date.fish
share/fish/completions/dcop.fish
share/fish/completions/dd.fish
share/fish/completions/df.fish
share/fish/completions/diff.fish
share/fish/completions/display.fish
share/fish/completions/djview.fish
share/fish/completions/djview3.fish
share/fish/completions/djview4.fish
share/fish/completions/dlocate.fish
share/fish/completions/dmesg.fish
share/fish/completions/dpkg.fish
share/fish/completions/du.fish
share/fish/completions/duply.fish
share/fish/completions/dvipdf.fish
share/fish/completions/dvipdfm.fish
share/fish/completions/echo.fish
share/fish/completions/effectv.fish
share/fish/completions/egrep.fish
share/fish/completions/eix-sync.fish
share/fish/completions/eix.fish
share/fish/completions/elatex.fish
@@ -116,146 +175,263 @@ share/fish/completions/eval.fish
share/fish/completions/evince.fish
share/fish/completions/exec.fish
share/fish/completions/exit.fish
share/fish/completions/expand.fish
share/fish/completions/fg.fish
share/fish/completions/fgrep.fish
share/fish/completions/file.fish
share/fish/completions/find.fish
share/fish/completions/fish.fish
share/fish/completions/fish_indent.fish
share/fish/completions/flac.fish
share/fish/completions/fluxbox-remote.fish
share/fish/completions/ftp.fish
share/fish/completions/funced.fish
share/fish/completions/funcsave.fish
share/fish/completions/function.fish
share/fish/completions/functions.fish
share/fish/completions/fuser.fish
share/fish/completions/fusermount.fish
share/fish/completions/gcc.fish
share/fish/completions/gdb.fish
share/fish/completions/gem.fish
share/fish/completions/git.fish
share/fish/completions/go.fish
share/fish/completions/gpasswd.fish
share/fish/completions/gpg.fish
share/fish/completions/gphoto2.fish
share/fish/completions/gprof.fish
share/fish/completions/grep.fish
share/fish/completions/groupadd.fish
share/fish/completions/gunzip.fish
share/fish/completions/gv.fish
share/fish/completions/gvim.fish
share/fish/completions/gvimdiff.fish
share/fish/completions/gzip.fish
share/fish/completions/head.fish
share/fish/completions/help.fish
share/fish/completions/hg.fish
share/fish/completions/highlight.fish
share/fish/completions/history.fish
share/fish/completions/htop.fish
share/fish/completions/iconv.fish
share/fish/completions/id.fish
share/fish/completions/identify.fish
share/fish/completions/ifconfig.fish
share/fish/completions/ifdata.fish
share/fish/completions/ifdown.fish
share/fish/completions/ifup.fish
share/fish/completions/import.fish
share/fish/completions/invoke-rc.d.fish
share/fish/completions/jobs.fish
share/fish/completions/kill.fish
share/fish/completions/killall.fish
share/fish/completions/la.fish
share/fish/completions/latex.fish
share/fish/completions/latexmk.fish
share/fish/completions/lein.fish
share/fish/completions/less.fish
share/fish/completions/ll.fish
share/fish/completions/ln.fish
share/fish/completions/locate.fish
share/fish/completions/logkeys.fish
share/fish/completions/lp.fish
share/fish/completions/lpadmin.fish
share/fish/completions/lpinfo.fish
share/fish/completions/lpmove.fish
share/fish/completions/lpoptions.fish
share/fish/completions/lppasswd.fish
share/fish/completions/lpq.fish
share/fish/completions/lpr.fish
share/fish/completions/lprm.fish
share/fish/completions/lpstat.fish
share/fish/completions/ls.fish
share/fish/completions/lsblk.fish
share/fish/completions/lsof.fish
share/fish/completions/lua.fish
share/fish/completions/lualatex.fish
share/fish/completions/lunchy.fish
share/fish/completions/lxpanel.fish
share/fish/completions/m4.fish
share/fish/completions/make.fish
share/fish/completions/makedepend.fish
share/fish/completions/makepkg.fish
share/fish/completions/man.fish
share/fish/completions/mc.fish
share/fish/completions/md5sum.fish
share/fish/completions/mimedb.fish
share/fish/completions/mktemp.fish
share/fish/completions/mocp.fish
share/fish/completions/modprobe.fish
share/fish/completions/mogrify.fish
share/fish/completions/montage.fish
share/fish/completions/mosh.fish
share/fish/completions/mount.fish
share/fish/completions/mplayer.fish
share/fish/completions/msgfmt.fish
share/fish/completions/mupdf.fish
share/fish/completions/mutt.fish
share/fish/completions/mv.fish
share/fish/completions/namei.fish
share/fish/completions/ncdu.fish
share/fish/completions/netcat.fish
share/fish/completions/netctl.fish
share/fish/completions/nextd.fish
share/fish/completions/nice.fish
share/fish/completions/nl.fish
share/fish/completions/nm.fish
share/fish/completions/nmcli.fish
share/fish/completions/not.fish
share/fish/completions/oggenc.fish
share/fish/completions/omega.fish
share/fish/completions/or.fish
share/fish/completions/pacman-color.fish
share/fish/completions/pacman-key.fish
share/fish/completions/pacman.fish
share/fish/completions/pacmatic.fish
share/fish/completions/pactree.fish
share/fish/completions/patch.fish
share/fish/completions/pbget.fish
share/fish/completions/pdfelatex.fish
share/fish/completions/pdfetex.fish
share/fish/completions/pdflatex.fish
share/fish/completions/pdftex.fish
share/fish/completions/perl.fish
share/fish/completions/pftp.fish
share/fish/completions/pgrep.fish
share/fish/completions/pine.fish
share/fish/completions/ping.fish
share/fish/completions/pinky.fish
share/fish/completions/pkgadd.fish
share/fish/completions/pkgfile.fish
share/fish/completions/pkginfo.fish
share/fish/completions/pkgmk.fish
share/fish/completions/pkgrm.fish
share/fish/completions/pkill.fish
share/fish/completions/poff.fish
share/fish/completions/pon.fish
share/fish/completions/portmaster.fish
share/fish/completions/ports.fish
share/fish/completions/prevd.fish
share/fish/completions/prt-get.fish
share/fish/completions/ps.fish
share/fish/completions/ps2pdf.fish
share/fish/completions/psql.fish
share/fish/completions/psub.fish
share/fish/completions/pushd.fish
share/fish/completions/pydf.fish
share/fish/completions/python.fish
share/fish/completions/python2.fish
share/fish/completions/python3.fish
share/fish/completions/quilt.fish
share/fish/completions/random.fish
share/fish/completions/rbenv.fish
share/fish/completions/rc.d.fish
share/fish/completions/read.fish
share/fish/completions/readlink.fish
share/fish/completions/realpath.fish
share/fish/completions/reject.fish
share/fish/completions/rejmerge.fish
share/fish/completions/renice.fish
share/fish/completions/return.fish
share/fish/completions/rfkill.fish
share/fish/completions/rgrep.fish
share/fish/completions/rm.fish
share/fish/completions/rmdir.fish
share/fish/completions/root.fish
share/fish/completions/rpm.fish
share/fish/completions/rsync.fish
share/fish/completions/ruby-build.fish
share/fish/completions/ruby.fish
share/fish/completions/scanimage.fish
share/fish/completions/scons.fish
share/fish/completions/scp.fish
share/fish/completions/screen.fish
share/fish/completions/scrot.fish
share/fish/completions/sed.fish
share/fish/completions/seq.fish
share/fish/completions/service.fish
share/fish/completions/set.fish
share/fish/completions/set_color.fish
share/fish/completions/setxkbmap.fish
share/fish/completions/sha1sum.fish
share/fish/completions/sha224sum.fish
share/fish/completions/sha256sum.fish
share/fish/completions/sha384sum.fish
share/fish/completions/sha512sum.fish
share/fish/completions/sort.fish
share/fish/completions/ssh.fish
share/fish/completions/sshfs.fish
share/fish/completions/stat.fish
share/fish/completions/status.fish
share/fish/completions/stream.fish
share/fish/completions/su.fish
share/fish/completions/sudo.fish
share/fish/completions/svn.fish
share/fish/completions/sylpheed.fish
share/fish/completions/systemctl.fish
share/fish/completions/tail.fish
share/fish/completions/tar.fish
share/fish/completions/tee.fish
share/fish/completions/telnet.fish
share/fish/completions/test.fish
share/fish/completions/tex.fish
share/fish/completions/time.fish
share/fish/completions/timeout.fish
share/fish/completions/tmux.fish
share/fish/completions/top.fish
share/fish/completions/totem.fish
share/fish/completions/touch.fish
share/fish/completions/tr.fish
share/fish/completions/trap.fish
share/fish/completions/tree.fish
share/fish/completions/type.fish
share/fish/completions/ulimit.fish
share/fish/completions/umount.fish
share/fish/completions/uname.fish
share/fish/completions/unexpand.fish
share/fish/completions/uniq.fish
share/fish/completions/unrar.fish
share/fish/completions/update-eix-remote.fish
share/fish/completions/update-eix.fish
share/fish/completions/useradd.fish
share/fish/completions/vagrant.fish
share/fish/completions/valgrind.fish
share/fish/completions/vared.fish
share/fish/completions/vi.fish
share/fish/completions/vim-addons.fish
share/fish/completions/vim.fish
share/fish/completions/vimdiff.fish
share/fish/completions/w.fish
share/fish/completions/wajig.fish
share/fish/completions/watch.fish
share/fish/completions/wc.fish
share/fish/completions/wesnoth.fish
share/fish/completions/wget.fish
share/fish/completions/whatis.fish
share/fish/completions/which.fish
share/fish/completions/who.fish
share/fish/completions/wicd-cli.fish
share/fish/completions/wicd-client.fish
share/fish/completions/wicd-gtk.fish
share/fish/completions/wpa_cli.fish
share/fish/completions/wvdial.fish
share/fish/completions/xargs.fish
share/fish/completions/xdg-mime.fish
share/fish/completions/xdvi.fish
share/fish/completions/xelatex.fish
share/fish/completions/xgettext.fish
share/fish/completions/xmms.fish
share/fish/completions/xpdf.fish
share/fish/completions/xprop.fish
share/fish/completions/xrandr.fish
share/fish/completions/xrdb.fish
share/fish/completions/xsel.fish
share/fish/completions/xterm.fish
share/fish/completions/yaourt.fish
share/fish/completions/yum.fish
share/fish/completions/zcat.fish
share/fish/completions/zip.fish
share/fish/completions/zypper.fish
share/fish/config.fish
share/fish/functions/N_.fish
share/fish/functions/_.fish
@@ -263,42 +439,68 @@ share/fish/functions/__fish_append.fish
share/fish/functions/__fish_bind_test1.fish
share/fish/functions/__fish_bind_test2.fish
share/fish/functions/__fish_commandline_test.fish
share/fish/functions/__fish_complete_abook_formats.fish
share/fish/functions/__fish_complete_ant_targets.fish
share/fish/functions/__fish_complete_atool.fish
share/fish/functions/__fish_complete_atool_archive_contents.fish
share/fish/functions/__fish_complete_bittorrent.fish
share/fish/functions/__fish_complete_cabal.fish
share/fish/functions/__fish_complete_cd.fish
share/fish/functions/__fish_complete_command.fish
share/fish/functions/__fish_complete_convert_options.fish
share/fish/functions/__fish_complete_diff.fish
share/fish/functions/__fish_complete_directories.fish
share/fish/functions/__fish_complete_file_url.fish
share/fish/functions/__fish_complete_ftp.fish
share/fish/functions/__fish_complete_grep.fish
share/fish/functions/__fish_complete_groups.fish
share/fish/functions/__fish_complete_list.fish
share/fish/functions/__fish_complete_lpr.fish
share/fish/functions/__fish_complete_lpr_option.fish
share/fish/functions/__fish_complete_ls.fish
share/fish/functions/__fish_complete_man.fish
share/fish/functions/__fish_complete_mime.fish
share/fish/functions/__fish_complete_pacman.fish
share/fish/functions/__fish_complete_pgrep.fish
share/fish/functions/__fish_complete_pids.fish
share/fish/functions/__fish_complete_ppp_peer.fish
share/fish/functions/__fish_complete_proc.fish
share/fish/functions/__fish_complete_python.fish
share/fish/functions/__fish_complete_setxkbmap.fish
share/fish/functions/__fish_complete_ssh.fish
share/fish/functions/__fish_complete_subcommand.fish
share/fish/functions/__fish_complete_subcommand_root.fish
share/fish/functions/__fish_complete_suffix.fish
share/fish/functions/__fish_complete_svn.fish
share/fish/functions/__fish_complete_svn_diff.fish
share/fish/functions/__fish_complete_tar.fish
share/fish/functions/__fish_complete_tex.fish
share/fish/functions/__fish_complete_unrar.fish
share/fish/functions/__fish_complete_users.fish
share/fish/functions/__fish_complete_vi.fish
share/fish/functions/__fish_complete_wvdial_peers.fish
share/fish/functions/__fish_complete_xsum.fish
share/fish/functions/__fish_config_interactive.fish
share/fish/functions/__fish_contains_opt.fish
share/fish/functions/__fish_crux_packages.fish
share/fish/functions/__fish_describe_command.fish
share/fish/functions/__fish_filter_ant_targets.fish
share/fish/functions/__fish_filter_mime.fish
share/fish/functions/__fish_git_branch_prompt.fish
share/fish/functions/__fish_git_prompt.fish
share/fish/functions/__fish_gnu_complete.fish
share/fish/functions/__fish_is_first_token.fish
share/fish/functions/__fish_is_token_n.fish
share/fish/functions/__fish_list_current_token.fish
share/fish/functions/__fish_make_completion_signals.fish
share/fish/functions/__fish_move_last.fish
share/fish/functions/__fish_no_arguments.fish
share/fish/functions/__fish_not_contain_opt.fish
share/fish/functions/__fish_paginate.fish
share/fish/functions/__fish_ports_dirs.fish
share/fish/functions/__fish_print_abook_emails.fish
share/fish/functions/__fish_print_addresses.fish
share/fish/functions/__fish_print_arch_daemons.fish
share/fish/functions/__fish_print_commands.fish
share/fish/functions/__fish_print_debian_services.fish
share/fish/functions/__fish_print_encodings.fish
share/fish/functions/__fish_print_filesystems.fish
@@ -306,35 +508,56 @@ share/fish/functions/__fish_print_function_prototypes.fish
share/fish/functions/__fish_print_help.fish
share/fish/functions/__fish_print_hostnames.fish
share/fish/functions/__fish_print_interfaces.fish
share/fish/functions/__fish_print_lpr_options.fish
share/fish/functions/__fish_print_lpr_printers.fish
share/fish/functions/__fish_print_lsblk_columns.fish
share/fish/functions/__fish_print_make_targets.fish
share/fish/functions/__fish_print_mounted.fish
share/fish/functions/__fish_print_packages.fish
share/fish/functions/__fish_print_svn_rev.fish
share/fish/functions/__fish_print_users.fish
share/fish/functions/__fish_print_xdg_mimeapps.fish
share/fish/functions/__fish_print_xdg_mimetypes.fish
share/fish/functions/__fish_print_xrandr_modes.fish
share/fish/functions/__fish_print_xrandr_outputs.fish
share/fish/functions/__fish_print_xwindows.fish
share/fish/functions/__fish_prt_no_subcommand.fish
share/fish/functions/__fish_prt_packages.fish
share/fish/functions/__fish_prt_ports.fish
share/fish/functions/__fish_prt_use_package.fish
share/fish/functions/__fish_prt_use_port.fish
share/fish/functions/__fish_pwd.fish
share/fish/functions/__fish_seen_subcommand_from.fish
share/fish/functions/__fish_test_arg.fish
share/fish/functions/__fish_urlencode.fish
share/fish/functions/__fish_use_subcommand.fish
share/fish/functions/__terlar_git_prompt.fish
share/fish/functions/alias.fish
share/fish/functions/cd.fish
share/fish/functions/contains_seq.fish
share/fish/functions/delete-or-exit.fish
share/fish/functions/dirh.fish
share/fish/functions/dirs.fish
share/fish/functions/down-or-search.fish
share/fish/functions/eval.fish
share/fish/functions/fish_config.fish
share/fish/functions/fish_default_key_bindings.fish
share/fish/functions/fish_indent.fish
share/fish/functions/fish_prompt.fish
share/fish/functions/fish_update_completions.fish
share/fish/functions/funced.fish
share/fish/functions/funcsave.fish
share/fish/functions/grep.fish
share/fish/functions/help.fish
share/fish/functions/history.fish
share/fish/functions/hostname.fish
share/fish/functions/isatty.fish
share/fish/functions/la.fish
share/fish/functions/ll.fish
share/fish/functions/ls.fish
share/fish/functions/man.fish
share/fish/functions/math.fish
share/fish/functions/mimedb.fish
share/fish/functions/nextd-or-forward-word.fish
share/fish/functions/nextd.fish
share/fish/functions/open.fish
@@ -344,7 +567,7 @@ share/fish/functions/prevd.fish
share/fish/functions/prompt_pwd.fish
share/fish/functions/psub.fish
share/fish/functions/pushd.fish
share/fish/functions/pwd.fish
share/fish/functions/seq.fish
share/fish/functions/setenv.fish
share/fish/functions/sgrep.fish
share/fish/functions/trap.fish
@@ -352,67 +575,93 @@ share/fish/functions/type.fish
share/fish/functions/umask.fish
share/fish/functions/up-or-search.fish
share/fish/functions/vared.fish
share/fish/man/alias.1
share/fish/man/and.1
share/fish/man/begin.1
share/fish/man/bg.1
share/fish/man/bind.1
share/fish/man/block.1
share/fish/man/break.1
share/fish/man/breakpoint.1
share/fish/man/builtin.1
share/fish/man/case.1
share/fish/man/cd.1
share/fish/man/command.1
share/fish/man/commandline.1
share/fish/man/complete.1
share/fish/man/contains.1
share/fish/man/continue.1
share/fish/man/count.1
share/fish/man/dirh.1
share/fish/man/dirs.1
share/fish/man/else.1
share/fish/man/emit.1
share/fish/man/end.1
share/fish/man/eval.1
share/fish/man/exec.1
share/fish/man/exit.1
share/fish/man/fg.1
share/fish/man/fish.1
share/fish/man/fish_indent.1
share/fish/man/fish_pager.1
share/fish/man/fish_prompt.1
share/fish/man/fishd.1
share/fish/man/for.1
share/fish/man/funced.1
share/fish/man/funcsave.1
share/fish/man/function.1
share/fish/man/functions.1
share/fish/man/help.1
share/fish/man/if.1
share/fish/man/isatty.1
share/fish/man/jobs.1
share/fish/man/math.1
share/fish/man/mimedb.1
share/fish/man/nextd.1
share/fish/man/not.1
share/fish/man/open.1
share/fish/man/or.1
share/fish/man/popd.1
share/fish/man/prevd.1
share/fish/man/psub.1
share/fish/man/pushd.1
share/fish/man/random.1
share/fish/man/read.1
share/fish/man/return.1
share/fish/man/set.1
share/fish/man/set_color.1
share/fish/man/source.1
share/fish/man/status.1
share/fish/man/switch.1
share/fish/man/trap.1
share/fish/man/type.1
share/fish/man/ulimit.1
share/fish/man/umask.1
share/fish/man/vared.1
share/fish/man/while.1
share/fish/man/man1/alias.1
share/fish/man/man1/and.1
share/fish/man/man1/begin.1
share/fish/man/man1/bg.1
share/fish/man/man1/bind.1
share/fish/man/man1/block.1
share/fish/man/man1/break.1
share/fish/man/man1/breakpoint.1
share/fish/man/man1/builtin.1
share/fish/man/man1/case.1
share/fish/man/man1/cd.1
share/fish/man/man1/command.1
share/fish/man/man1/commandline.1
share/fish/man/man1/complete.1
share/fish/man/man1/contains.1
share/fish/man/man1/continue.1
share/fish/man/man1/count.1
share/fish/man/man1/dirh.1
share/fish/man/man1/dirs.1
share/fish/man/man1/echo.1
share/fish/man/man1/else.1
share/fish/man/man1/emit.1
share/fish/man/man1/end.1
share/fish/man/man1/eval.1
share/fish/man/man1/exec.1
share/fish/man/man1/exit.1
share/fish/man/man1/fg.1
share/fish/man/man1/fish.1
share/fish/man/man1/fish_config.1
share/fish/man/man1/fish_indent.1
share/fish/man/man1/fish_pager.1
share/fish/man/man1/fish_prompt.1
share/fish/man/man1/fish_right_prompt.1
share/fish/man/man1/fish_update_completions.1
share/fish/man/man1/fishd.1
share/fish/man/man1/for.1
share/fish/man/man1/funced.1
share/fish/man/man1/funcsave.1
share/fish/man/man1/function.1
share/fish/man/man1/functions.1
share/fish/man/man1/help.1
share/fish/man/man1/history.1
share/fish/man/man1/if.1
share/fish/man/man1/isatty.1
share/fish/man/man1/jobs.1
share/fish/man/man1/math.1
share/fish/man/man1/mimedb.1
share/fish/man/man1/nextd.1
share/fish/man/man1/not.1
share/fish/man/man1/or.1
share/fish/man/man1/popd.1
share/fish/man/man1/prevd.1
share/fish/man/man1/psub.1
share/fish/man/man1/pushd.1
share/fish/man/man1/pwd.1
share/fish/man/man1/random.1
share/fish/man/man1/read.1
share/fish/man/man1/return.1
share/fish/man/man1/set.1
share/fish/man/man1/set_color.1
share/fish/man/man1/source.1
share/fish/man/man1/status.1
share/fish/man/man1/switch.1
share/fish/man/man1/test.1
share/fish/man/man1/trap.1
share/fish/man/man1/type.1
share/fish/man/man1/ulimit.1
share/fish/man/man1/umask.1
share/fish/man/man1/vared.1
share/fish/man/man1/while.1
share/fish/tools/create_manpage_completions.py
share/fish/tools/deroff.py
share/fish/tools/web_config/delete.png
share/fish/tools/web_config/index.html
share/fish/tools/web_config/jquery.js
share/fish/tools/web_config/sample_prompts/classic.fish
share/fish/tools/web_config/sample_prompts/classic_git.fish
share/fish/tools/web_config/sample_prompts/classic_status.fish
share/fish/tools/web_config/sample_prompts/informative.fish
share/fish/tools/web_config/sample_prompts/informative_git.fish
share/fish/tools/web_config/sample_prompts/justadollar.fish
share/fish/tools/web_config/sample_prompts/lonetwin.fish
share/fish/tools/web_config/sample_prompts/minimalist.fish
share/fish/tools/web_config/sample_prompts/nim.fish
share/fish/tools/web_config/sample_prompts/pythonista.fish
share/fish/tools/web_config/sample_prompts/robbyrussell.fish
share/fish/tools/web_config/sample_prompts/screen_savvy.fish
share/fish/tools/web_config/sample_prompts/terlar.fish
share/fish/tools/web_config/sample_prompts/user_host_path.fish
share/fish/tools/web_config/webconfig.py

27
shells/fish/distinfo
View File

@@ -1,9 +1,20 @@
$NetBSD: distinfo,v 1.2 2013/10/20 17:53:26 joerg Exp $
$NetBSD: distinfo,v 1.4 2015/03/18 15:03:43 joerg Exp $
SHA1 (fish-1.23.1.tar.gz) = 7b839ffc5b260f1bd1782e4adf84300f5438f833
RMD160 (fish-1.23.1.tar.gz) = b77fe7ffec4ae52b82c1c86b2dc7037306c5fede
Size (fish-1.23.1.tar.gz) = 1152997 bytes
SHA1 (patch-Makefile.in) = d92c531cb15e511f1a712d98a64e222b3316fcdd
SHA1 (patch-configure) = 40a27c297ec56bdba7f34ff6f18a415ae88b504d
SHA1 (patch-proc.h) = 7ac0b704f6ee1b1e966f0bfdc87dfa1e23e9c338
SHA1 (patch-screen.c) = eae536bb965bd2a236a5cd3ff44e5ddbeb24f519
SHA1 (fish-2.1.2.tar.gz) = f7f8d8d26721833be3458b8113c74b747296ec0b
RMD160 (fish-2.1.2.tar.gz) = 109e3fbb07e36a6cf2b651b148d3a60eca9f8930
Size (fish-2.1.2.tar.gz) = 1730198 bytes
SHA1 (patch-Makefile.in) = b7a62d30095fd58cade131ba800b3124ccad29f2
SHA1 (patch-builtin.cpp) = 8fcc2f9a38aaff0c2994d53788b81e789cf05670
SHA1 (patch-common.cpp) = 7ea4e2aa2fed5ddec0916ecdafb49bc16142c491
SHA1 (patch-common.h) = 93082e43847f1f94e00dc6fa991b28f919674d8f
SHA1 (patch-configure) = 9153240e4037fda4ef03412c65b7f3bb5bfb0cd2
SHA1 (patch-env.cpp) = ac3c188de1b24d4a0433d2516c2afa0a8b6f137d
SHA1 (patch-exec.cpp) = 711c2ca4a7c100e40e7e1a2a9235546105d36098
SHA1 (patch-fallback.h) = d2c4edb11877c1b7cf97362bb61fe03d535caef5
SHA1 (patch-history.cpp) = d4d874bd805f9d9e547aebeb780c855a67be079b
SHA1 (patch-output.cpp) = 5c44bec667f4aac0d88e5825a76be893f9852295
SHA1 (patch-output.h) = c40ae78baf08c69e67365c2f032178b0aa12e844
SHA1 (patch-parser.cpp) = e0d2b127e205c23664aab60f6dc0c7872de82dee
SHA1 (patch-parser__keywords.cpp) = 3f8589db528a7e970d5f1bb61104e7db27435571
SHA1 (patch-proc.h) = 3eaf2c20ad0c3a228f20067b1218bdca039bdab6
SHA1 (patch-screen.cpp) = 057d357e312fe55965ff0b92f9ae935b31dfcf4b

15
shells/fish/patches/patch-Makefile.in
View File

@@ -1,21 +1,24 @@
$NetBSD: patch-Makefile.in,v 1.1 2012/12/12 13:21:42 wiz Exp $
$NetBSD: patch-Makefile.in,v 1.2 2015/03/06 21:03:20 ryoon Exp $
Install configuration files to EGDIR
--- Makefile.in.orig 2009-03-08 14:46:47.000000000 +0000
--- Makefile.in.orig 2015-02-16 19:07:12.000000000 +0000
+++ Makefile.in
@@ -569,12 +569,12 @@ install-force: all install-translations
for i in $(PROGRAMS); do\
@@ -600,7 +600,7 @@ install-force: all install-translations
$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
true ;\
done;
- $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
+ $(INSTALL) -m 755 -d $(DESTDIR)$(EGDIR)/fish
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man
@@ -608,7 +608,7 @@ install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
- $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/
+ $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(EGDIR)/fish/
$(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/
for i in $(COMPLETIONS_DIR_FILES); do \
for i in $(COMPLETIONS_DIR_FILES:%='%'); do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \

19
shells/fish/patches/patch-builtin.cpp Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-builtin.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- builtin.cpp.orig 2015-03-17 21:48:35.000000000 +0000
+++ builtin.cpp
@@ -268,11 +268,11 @@ static void builtin_print_help(parser_t
the rest won't fit
*/
- int screen_height, lines;
+ int screen_height, my_lines;
screen_height = common_get_height();
- lines = count_char(str, L'\n');
- if (!get_is_interactive() || (lines > 2*screen_height/3))
+ my_lines = count_char(str, L'\n');
+ if (!get_is_interactive() || (my_lines > 2*screen_height/3))
{
wchar_t *pos;
int cut=0;

22
shells/fish/patches/patch-common.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-common.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- common.cpp.orig 2015-03-17 21:55:04.000000000 +0000
+++ common.cpp
@@ -599,7 +599,7 @@ bool contains_internal(const wchar_t *a,
}
/* wcstring variant of contains_internal. The first parameter is a wcstring, the rest are const wchar_t* */
-__sentinel bool contains_internal(const wcstring &needle, ...)
+__sentinel bool contains_internal(const wcstring *needle, ...)
{
const wchar_t *arg;
va_list va;
@@ -608,7 +608,7 @@ __sentinel bool contains_internal(const
va_start(va, needle);
while ((arg=va_arg(va, const wchar_t *))!= 0)
{
- if (needle == arg)
+ if (*needle == arg)
{
res=1;
break;

13
shells/fish/patches/patch-common.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-common.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- common.h.orig 2015-03-17 21:55:55.000000000 +0000
+++ common.h
@@ -654,7 +654,7 @@ wcstring wsetlocale(int category, const
\return zero if needle is not found, of if needle is null, non-zero otherwise
*/
__sentinel bool contains_internal(const wchar_t *needle, ...);
-__sentinel bool contains_internal(const wcstring &needle, ...);
+__sentinel bool contains_internal(const wcstring *needle, ...);
/**
Call read while blocking the SIGCHLD signal. Should only be called

15
shells/fish/patches/patch-configure
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-configure,v 1.2 2013/10/20 17:53:26 joerg Exp $
$NetBSD: patch-configure,v 1.3 2015/03/06 21:03:20 ryoon Exp $
Expand variable where it's defined
--- configure.orig 2009-03-08 14:46:47.000000000 +0000
--- configure.orig 2015-02-24 18:17:38.000000000 +0000
+++ configure
@@ -740,7 +740,7 @@ sharedstatedir='${prefix}/com'
@@ -814,7 +814,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
@@ -13,12 +13,3 @@ Expand variable where it's defined
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1848,7 +1848,7 @@ echo $ECHO_N "checking for $i/lib librar
if test -d $i/lib; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+ LDFLAGS="$LDFLAGS -L$i/lib/ ${COMPILER_RPATH_FLAG}$i/lib/"
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }

13
shells/fish/patches/patch-env.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-env.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- env.cpp.orig 2015-03-17 21:56:51.000000000 +0000
+++ env.cpp
@@ -710,7 +710,7 @@ int env_set(const wcstring &key, const w
int is_universal = 0;
- if (val && contains(key, L"PWD", L"HOME"))
+ if (val && contains(&key, L"PWD", L"HOME"))
{
/* Canoncalize our path; if it changes, recurse and try again. */
wcstring val_canonical = val;

13
shells/fish/patches/patch-exec.cpp Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-exec.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- exec.cpp.orig 2015-03-17 21:57:15.000000000 +0000
+++ exec.cpp
@@ -572,7 +572,7 @@ static void exec_no_exec(parser_t &parse
if (builtin_name_cstr != NULL)
{
const wcstring builtin_name = builtin_name_cstr;
- if (contains(builtin_name, L"for", L"function", L"begin", L"switch"))
+ if (contains(&builtin_name, L"for", L"function", L"begin", L"switch"))
{
// The above builtins are the ones that produce an unbalanced block from within their function implementation
// This list should be maintained somewhere else

25
shells/fish/patches/patch-fallback.h Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-fallback.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- fallback.h.orig 2015-03-17 21:45:59.000000000 +0000
+++ fallback.h
@@ -43,7 +43,7 @@ int fish_wcswidth(const wchar_t *str, si
expects. Hopefully.
*/
-#ifdef NCURSES_VERSION
+#if defined(__NetBSD__) || defined(NCURSES_VERSION)
typedef int tputs_arg_t;
#else
typedef char tputs_arg_t;
@@ -86,7 +86,10 @@ int tputs(const char *str, int affcnt, i
#endif
-#ifdef TPARM_SOLARIS_KLUDGE
+#ifdef __NetBSD__
+#include <term.h>
+#define tparm tiparm
+#elif defined(TPARM_SOLARIS_KLUDGE)
/**
Solaris tparm has a set fixed of paramters in it's curses implementation,

61
shells/fish/patches/patch-history.cpp Normal file
View File

@@ -0,0 +1,61 @@
$NetBSD: patch-history.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- history.cpp.orig 2015-03-17 21:50:56.000000000 +0000
+++ history.cpp
@@ -380,12 +380,12 @@ static size_t offset_of_next_item_fish_2
const char * const line_start = begin + cursor;
/* Advance the cursor to the next line */
- const char *newline = (const char *)memchr(line_start, '\n', mmap_length - cursor);
- if (newline == NULL)
+ const char *my_newline = (const char *)memchr(line_start, '\n', mmap_length - cursor);
+ if (my_newline == NULL)
break;
/* Advance the cursor past this line. +1 is for the newline */
- size_t line_len = newline - line_start;
+ size_t line_len = my_newline - line_start;
cursor += line_len + 1;
/* Skip lines with a leading space, since these are in the interior of one of our items */
@@ -699,14 +699,14 @@ static size_t read_line(const char *base
/* Locate the newline */
assert(cursor <= len);
const char *start = base + cursor;
- const char *newline = (char *)memchr(start, '\n', len - cursor);
- if (newline != NULL)
+ const char *my_newline = (char *)memchr(start, '\n', len - cursor);
+ if (my_newline != NULL)
{
/* We found a newline. */
- result.assign(start, newline - start);
+ result.assign(start, my_newline - start);
/* Return the amount to advance the cursor; skip over the newline */
- return newline - start + 1;
+ return my_newline - start + 1;
}
else
{
@@ -1610,9 +1610,9 @@ void history_t::populate_from_bash(FILE
if (success)
{
/* Skip the newline */
- char *newline = strchr(buff, '\n');
- if (newline) *newline = '\0';
- has_newline = (newline != NULL);
+ char *my_newline = strchr(buff, '\n');
+ if (my_newline) *my_newline = '\0';
+ has_newline = (my_newline != NULL);
/* Append what we've got */
line.append(buff);
@@ -1737,7 +1737,7 @@ void history_t::add_with_file_detection(
potential_paths.push_back(potential_path);
/* What a hack! */
- impending_exit = impending_exit || contains(potential_path, L"exec", L"exit", L"reboot");
+ impending_exit = impending_exit || contains(&potential_path, L"exec", L"exit", L"reboot");
}
}
}

22
shells/fish/patches/patch-output.cpp Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-output.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- output.cpp.orig 2015-03-17 21:47:33.000000000 +0000
+++ output.cpp
@@ -151,7 +151,7 @@ unsigned char index_for_color(rgb_color_
}
-static bool write_color(char *todo, unsigned char idx, bool is_fg)
+static bool write_color(const char *todo, unsigned char idx, bool is_fg)
{
bool result = false;
if (idx < 16 || term256_support_is_native())
@@ -418,7 +418,7 @@ int writeb(tputs_arg_t b)
return 0;
}
-int writembs_internal(char *str)
+int writembs_internal(const char *str)
{
CHECK(str, 1);

22
shells/fish/patches/patch-output.h Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-output.h,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- output.h.orig 2015-03-17 21:47:35.000000000 +0000
+++ output.h
@@ -80,7 +80,7 @@ void set_color(rgb_color_t c, rgb_color_
*/
#define writembs( mbs ) \
{ \
- char *tmp = mbs; \
+ const char *tmp = mbs; \
if( tmp ) \
{ \
writembs_internal( tmp ); \
@@ -104,7 +104,7 @@ void set_color(rgb_color_t c, rgb_color_
as the sending function. But a weird bug on PPC Linux means that on
this platform, write is instead used directly.
*/
-int writembs_internal(char *str);
+int writembs_internal(const char *str);
/**
Write a wide character using the output method specified using output_set_writer().

62
shells/fish/patches/patch-parser.cpp Normal file
View File

@@ -0,0 +1,62 @@
$NetBSD: patch-parser.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- parser.cpp.orig 2015-03-17 21:50:15.000000000 +0000
+++ parser.cpp
@@ -446,7 +446,7 @@ const wchar_t *parser_t::get_block_desc(
*/
static int parser_is_pipe_forbidden(const wcstring &word)
{
- return contains(word,
+ return contains(&word,
L"exec",
L"case",
L"break",
@@ -1726,7 +1726,7 @@ int parser_t::parse_job(process_t *p,
mark = tok_get_pos(tok);
- if (contains(nxt,
+ if (contains(&nxt,
L"command",
L"builtin",
L"not",
@@ -2398,9 +2398,9 @@ void parser_t::eval_job(tokenizer_t *tok
if (job_start_pos < tok_get_pos(tok))
{
long stop_pos = tok_get_pos(tok);
- const wchar_t *newline = wcschr(tok_string(tok)+start_pos, L'\n');
- if (newline)
- stop_pos = mini<long>(stop_pos, newline - tok_string(tok));
+ const wchar_t *my_newline = wcschr(tok_string(tok)+start_pos, L'\n');
+ if (my_newline)
+ stop_pos = mini<long>(stop_pos, my_newline - tok_string(tok));
j->set_command(wcstring(tok_string(tok)+start_pos, stop_pos-start_pos));
}
@@ -3024,7 +3024,7 @@ int parser_t::test(const wchar_t *buff,
command is needed, such as after 'and' or
'while'
*/
- if (contains(command,
+ if (contains(&command,
L"end"))
{
err=1;
@@ -3129,7 +3129,7 @@ int parser_t::test(const wchar_t *buff,
had_cmd = 0;
}
- if (contains(command,
+ if (contains(&command,
L"or",
L"and"))
{
@@ -3255,7 +3255,7 @@ int parser_t::test(const wchar_t *buff,
/*
Test that break and continue are only used within loop blocks
*/
- if (contains(command, L"break", L"continue"))
+ if (contains(&command, L"break", L"continue"))
{
bool found_loop = false;
size_t block_idx = block_infos.size();

40
shells/fish/patches/patch-parser__keywords.cpp Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-parser__keywords.cpp,v 1.1 2015/03/18 15:03:43 joerg Exp $
--- parser_keywords.cpp.orig 2015-03-17 22:07:00.000000000 +0000
+++ parser_keywords.cpp
@@ -32,7 +32,7 @@ bool parser_keywords_is_switch(const wcs
bool parser_keywords_skip_arguments(const wcstring &cmd)
{
- return contains(cmd,
+ return contains(&cmd,
L"else",
L"begin");
}
@@ -42,7 +42,7 @@ bool parser_keywords_is_subcommand(const
{
return parser_keywords_skip_arguments(cmd) ||
- contains(cmd,
+ contains(&cmd,
L"command",
L"builtin",
L"while",
@@ -56,7 +56,7 @@ bool parser_keywords_is_subcommand(const
bool parser_keywords_is_block(const wcstring &word)
{
- return contains(word,
+ return contains(&word,
L"for",
L"while",
L"if",
@@ -69,7 +69,7 @@ bool parser_keywords_is_reserved(const w
{
return parser_keywords_is_block(word) ||
parser_keywords_is_subcommand(word) ||
- contains(word,
+ contains(&word,
L"end",
L"case",
L"else",

10
shells/fish/patches/patch-proc.h
View File

@@ -1,15 +1,15 @@
$NetBSD: patch-proc.h,v 1.1 2012/12/12 13:21:42 wiz Exp $
$NetBSD: patch-proc.h,v 1.2 2015/03/06 21:03:20 ryoon Exp $
Fix missing include
--- proc.h.orig 2009-03-08 14:46:47.000000000 +0000
--- proc.h.orig 2015-02-16 19:07:12.000000000 +0000
+++ proc.h
@@ -16,6 +16,8 @@
#include <unistd.h>
@@ -17,6 +17,8 @@
#include <sys/time.h>
#include <list>
+#include <termios.h>
+
#include "util.h"
#include "io.h"
#include "common.h"

24
shells/fish/patches/patch-screen.c
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-screen.c,v 1.1 2012/12/12 13:21:42 wiz Exp $
Fix compilation on NetBSD, where init_tabs is not suitable for assignment.
--- screen.c.orig 2009-03-08 14:46:47.000000000 +0000
+++ screen.c
@@ -92,13 +93,14 @@ static int try_sequence( char *seq, wcha
*/
static int next_tab_stop( int in )
{
+ int itabs = init_tabs;
/*
Assume tab stops every 8 characters if undefined
*/
- if( init_tabs <= 0 )
- init_tabs = 8;
+ if( itabs <= 0 )
+ itabs = 8;
- return ( (in/init_tabs)+1 )*init_tabs;
+ return ( (in/itabs)+1 )*itabs;
}
/**

53
shells/fish/patches/patch-screen.cpp Normal file
View File

@@ -0,0 +1,53 @@
$NetBSD: patch-screen.cpp,v 1.2 2015/03/18 15:03:43 joerg Exp $
--- screen.cpp.orig 2015-02-16 19:07:12.000000000 +0000
+++ screen.cpp
@@ -112,10 +112,11 @@ static size_t try_sequence(const char *s
*/
static size_t next_tab_stop(size_t in)
{
+ int itabs = init_tabs;
/*
Assume tab stops every 8 characters if undefined
*/
- size_t tab_width = (init_tabs > 0 ? (size_t)init_tabs : 8);
+ size_t tab_width = (itabs > 0 ? (size_t)itabs : 8);
return ((in/tab_width)+1)*tab_width;
}
@@ -151,7 +152,7 @@ size_t escape_code_length(const wchar_t
Detect these terminfo color escapes with parameter
value 0..7, all of which don't move the cursor
*/
- char * const esc[] =
+ const char * const esc[] =
{
set_a_foreground,
set_a_background,
@@ -183,7 +184,7 @@ size_t escape_code_length(const wchar_t
Detect these semi-common terminfo escapes without any
parameter values, all of which don't move the cursor
*/
- char * const esc2[] =
+ const char * const esc2[] =
{
enter_bold_mode,
exit_attribute_mode,
@@ -604,7 +605,7 @@ static void s_move(screen_t *s, data_buf
int i;
int x_steps, y_steps;
- char *str;
+ const char *str;
/*
debug( 0, L"move from %d %d to %d %d",
s->screen_cursor[0], s->screen_cursor[1],
@@ -707,7 +708,7 @@ static void s_write_char(screen_t *s, da
Send the specified string through tputs and append the output to
the specified buffer.
*/
-static void s_write_mbs(data_buffer_t *b, char *s)
+static void s_write_mbs(data_buffer_t *b, const char *s)
{
scoped_buffer_t scoped_buffer(b);
writembs(s);