update to zsh-5.0.5

ok pea@ (MAINTAINER)
This commit is contained in:
jasper 2014-04-17 12:12:20 +00:00
parent ec54915047
commit 7944034985
9 changed files with 226 additions and 133 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.69 2013/10/02 19:49:11 gsoares Exp $
# $OpenBSD: Makefile,v 1.70 2014/04/17 12:12:20 jasper Exp $
COMMENT= Z shell, Bourne shell-compatible
V= 5.0.2
V= 5.0.5
DISTNAME= zsh-$V
CATEGORIES= shells

View File

@ -1,2 +1,2 @@
SHA256 (zsh-5.0.2.tar.gz) = rcDHiBUyQZeXcTt8UDvMVnTIj5OhkeJvcAtCwRoagW4=
SIZE (zsh-5.0.2.tar.gz) = 3823234
SHA256 (zsh-5.0.5.tar.gz) = s1zxnkpro5/QPGNyuKh2CkkcwuLkq6PRUCP/KRwolLQ=
SIZE (zsh-5.0.5.tar.gz) = 3919129

View File

@ -1,78 +1,10 @@
$OpenBSD: patch-Completion_Unix_Command__tmux,v 1.2 2009/12/16 15:03:28 pea Exp $
--- Completion/Unix/Command/_tmux.orig Thu Dec 10 17:25:18 2009
+++ Completion/Unix/Command/_tmux Thu Dec 10 17:27:19 2009
@@ -0,0 +1,1491 @@
+#compdef tmux
+
+# tmux <http://tmux.sf.net> completion for zsh <http://zsh.sf.net>.
+#
+# Configuration:
+#
+# - On some OSs, the directory for tmux's server sockets may not be
+# the default (which is /tmp/tmux-<uid>/), but say
+# /var/run/tmux/tmux-<uid>, in which case the completion for
+# 'tmux -L <tab>' will not be able to find the sockets in the default
+# location (debian does this, for instance); tell _tmux the right place
+# to look:
+# % zstyle ':completion:*:*:tmux:*:sockets' socketdir "/var/run/tmux/tmux-${UID}"
+#
+# - tmux knows a *lot* of sub-commands, hence 'tmux <tab>' returns a lot
+# of possible completions. _tmux knows about all commands and their aliases.
+# By default, both are offered. If you do not care about the aliases, do this:
+# % zstyle ':completion:*:*:tmux:*:subcommands' mode 'commands'
+#
+# The same can be done to only return aliases by setting the above style
+# to 'aliases'. The default value is 'both' (but actually every value
+# different from 'commands' and 'aliases' will have the same effect).
+#
+# 'lsw' is an alias for 'list-windows' for example; note that not all
+# commands have aliases. So probably, either the default 'both' or
+# 'commands' makes most sense for this style.
+#
+# - For finer grained control over what is suggested as possible completions,
+# the 'ignored-patterns' style may be used; suppose you think that only
+# '*-window' or '*-windows' are worth being completed. You would get that
+# behaviour like this:
+# % zstyle ':completion:*:*:tmux:*:subcommands' ignored-patterns '^*-window(|s)'
+#
+# Some tmux commands currently do not work if called from a shell prompt,
+# so it would make sense to ignore them per default (at the time of writing,
+# those commands are choose-{session,client,window}, confirm-before and
+# find-window. This would ignore them:
+# % zstyle ':completion:*:*:tmux:*:subcommands' ignored-patterns \
+# 'choose-*' 'confirm-before' 'find-window'
+#
+# The configuration for subcommand completions may be done in
+# this context: ':completion:*:*:tmux-<sub-command>:*:*'
+
+# Global variables; setup the first time _tmux is called.
+# For $_tmux_commands[] generation, see the very end of this file.
+typeset -ga _tmux_commands _tmux_aliases
+typeset -gA _tmux_aliasmap
+
+_tmux_aliasmap=(
+ # clients and sessions
+ attach attach-session
+ detach detach-client
+ has has-session
+ lsc list-clients
+ lscm list-commands
+ ls list-sessions
+ new new-session
+ refresh refresh-client
+ rename rename-session
+ showmsgs show-messages
+ source source-file
+ start start-server
+ suspendc suspend-client
+ switchc switch-client
+
+ # windows and panes
+ breakp break-pane
+ capturep capture-pane
+ displayp display-panes
+ downp down-pane
+ findw find-window
$OpenBSD: patch-Completion_Unix_Command__tmux,v 1.3 2014/04/17 12:12:20 jasper Exp $
--- Completion/Unix/Command/_tmux.orig Wed Nov 27 20:00:19 2013
+++ Completion/Unix/Command/_tmux Mon Apr 14 18:10:09 2014
@@ -69,6 +69,1497 @@ _tmux_aliasmap=(
displayp display-panes
downp down-pane
findw find-window
+ killp kill-pane
+ killw kill-window
+ last last-window
@ -1493,3 +1425,77 @@ $OpenBSD: patch-Completion_Unix_Command__tmux,v 1.2 2009/12/16 15:03:28 pea Exp
+unset desc f rev tmux_describe
+
+_tmux
+#compdef tmux
+
+# tmux <http://tmux.sf.net> completion for zsh <http://zsh.sf.net>.
+#
+# Configuration:
+#
+# - On some OSs, the directory for tmux's server sockets may not be
+# the default (which is /tmp/tmux-<uid>/), but say
+# /var/run/tmux/tmux-<uid>, in which case the completion for
+# 'tmux -L <tab>' will not be able to find the sockets in the default
+# location (debian does this, for instance); tell _tmux the right place
+# to look:
+# % zstyle ':completion:*:*:tmux:*:sockets' socketdir "/var/run/tmux/tmux-${UID}"
+#
+# - tmux knows a *lot* of sub-commands, hence 'tmux <tab>' returns a lot
+# of possible completions. _tmux knows about all commands and their aliases.
+# By default, both are offered. If you do not care about the aliases, do this:
+# % zstyle ':completion:*:*:tmux:*:subcommands' mode 'commands'
+#
+# The same can be done to only return aliases by setting the above style
+# to 'aliases'. The default value is 'both' (but actually every value
+# different from 'commands' and 'aliases' will have the same effect).
+#
+# 'lsw' is an alias for 'list-windows' for example; note that not all
+# commands have aliases. So probably, either the default 'both' or
+# 'commands' makes most sense for this style.
+#
+# - For finer grained control over what is suggested as possible completions,
+# the 'ignored-patterns' style may be used; suppose you think that only
+# '*-window' or '*-windows' are worth being completed. You would get that
+# behaviour like this:
+# % zstyle ':completion:*:*:tmux:*:subcommands' ignored-patterns '^*-window(|s)'
+#
+# Some tmux commands currently do not work if called from a shell prompt,
+# so it would make sense to ignore them per default (at the time of writing,
+# those commands are choose-{session,client,window}, confirm-before and
+# find-window. This would ignore them:
+# % zstyle ':completion:*:*:tmux:*:subcommands' ignored-patterns \
+# 'choose-*' 'confirm-before' 'find-window'
+#
+# The configuration for subcommand completions may be done in
+# this context: ':completion:*:*:tmux-<sub-command>:*:*'
+
+# Global variables; setup the first time _tmux is called.
+# For $_tmux_commands[] generation, see the very end of this file.
+typeset -ga _tmux_commands _tmux_aliases
+typeset -gA _tmux_aliasmap
+
+_tmux_aliasmap=(
+ # clients and sessions
+ attach attach-session
+ detach detach-client
+ has has-session
+ lsc list-clients
+ lscm list-commands
+ ls list-sessions
+ new new-session
+ refresh refresh-client
+ rename rename-session
+ showmsgs show-messages
+ source source-file
+ start start-server
+ suspendc suspend-client
+ switchc switch-client
+
+ # windows and panes
+ breakp break-pane
+ capturep capture-pane
+ displayp display-panes
+ downp down-pane
+ findw find-window
joinp join-pane
killp kill-pane
killw kill-window

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Completion_Unix_Type__diff_options,v 1.1 2006/10/19 13:44:51 naddy Exp $
--- Completion/Unix/Type/_diff_options.orig Thu Sep 30 04:28:18 2004
+++ Completion/Unix/Type/_diff_options Wed Oct 11 14:23:55 2006
@@ -120,9 +120,35 @@ else
$OpenBSD: patch-Completion_Unix_Type__diff_options,v 1.2 2014/04/17 12:12:20 jasper Exp $
--- Completion/Unix/Type/_diff_options.orig Wed Nov 27 20:00:19 2013
+++ Completion/Unix/Type/_diff_options Mon Apr 14 18:10:09 2014
@@ -119,9 +119,35 @@ else
'-S+[set first file in comparison]:start with file:_files'
)
;;

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-Doc_Makefile_in,v 1.5 2008/11/04 10:00:59 pea Exp $
--- Doc/Makefile.in.orig Thu Oct 30 12:56:08 2008
+++ Doc/Makefile.in Mon Nov 3 22:44:41 2008
@@ -275,11 +275,11 @@ Zsh/manmodmenu.yo: $(MODDOCSRC)
# ========== DEPENDENCIES FOR INSTALLING ==========
# install just installs the manual pages
-install: install.man
+install: install.man install.info
.PHONY: install
# uninstall just unistalls the manual pages
-uninstall: uninstall.man
+uninstall: uninstall.man uninstall.info
.PHONY: uninstall
# install man pages, creating install directory if necessary

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
--- Doc/zsh.texi.orig Mon Jun 1 10:00:26 2009
+++ Doc/zsh.texi Wed Aug 25 08:44:01 2010
$OpenBSD: patch-Doc_zsh_texi,v 1.7 2014/04/17 12:12:20 jasper Exp $
--- Doc/zsh.texi.orig Sun Jan 5 19:22:46 2014
+++ Doc/zsh.texi Mon Apr 14 18:10:09 2014
@@ -7,6 +7,10 @@
@end iftex
@setfilename zsh.info
@ -12,7 +12,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@c %**end of header
@ifinfo
@@ -3740,7 +3744,7 @@ you may see in your prompt (see
@@ -3924,7 +3928,7 @@ you may see in your prompt (see
A history expansion begins with the first character of the @t{histchars}
parameter, which is `@t{!}' by default, and may occur anywhere on the
command line; history expansions do not nest. The `@t{!}' can be escaped
@ -21,7 +21,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
to suppress its special meaning. Double quotes will @emph{not} work for
this. Following this history character is an optional event designator
(@ref{Event Designators}) and then an optional word
@@ -9346,7 +9350,7 @@ For example,
@@ -10233,7 +10237,7 @@ For example,
@example
unsetopt localtraps
trap - INT
@ -30,7 +30,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@end example
@noindent
@@ -18601,7 +18605,7 @@ zstyle ':completion:*:default' list-colors $@{(s.:.)LS
@@ -20012,7 +20016,7 @@ zstyle ':completion:*:default' list-colors $@{(s.:.)LS
@noindent
The default colors are the same as for the GNU @t{ls} command and can be
@ -39,7 +39,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@kindex list-dirs-first, completion style
@item @t{list-dirs-first}
@@ -18734,7 +18738,7 @@ generates no matches, case-insensitive completion:
@@ -20145,7 +20149,7 @@ generates no matches, case-insensitive completion:
@noindent
@example
@ -48,7 +48,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@end example
@noindent
@@ -18758,7 +18762,7 @@ case-insensitive completion with @t{_complete}:
@@ -20169,7 +20173,7 @@ case-insensitive completion with @t{_complete}:
@example
zstyle ':completion:*' completer _complete _prefix
zstyle ':completion:*:complete:*' matcher-list \
@ -57,7 +57,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@end example
@noindent
@@ -22175,7 +22179,7 @@ generates at least one match. E.g.:
@@ -23701,7 +23705,7 @@ generates at least one match. E.g.:
@noindent
@example
@ -66,7 +66,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@end example
@noindent
@@ -22387,7 +22391,7 @@ use is
@@ -23913,7 +23917,7 @@ use is
@noindent
@example
@ -75,7 +75,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.6 2010/09/06 18:53:51 nicm Exp $
@end example
@noindent
@@ -22475,7 +22479,7 @@ performed on the first word in the range. For example
@@ -24001,7 +24005,7 @@ performed on the first word in the range. For example
@noindent
@example

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2004/07/12 19:46:52 lebel Exp $
--- Makefile.in.orig Mon Sep 10 06:48:44 2001
+++ Makefile.in Sun Nov 18 12:17:48 2001
@@ -63,8 +63,8 @@ install-strip:
$(MAKE) install STRIPFLAGS="-s"
# install/uninstall most things
-install: install.bin install.modules install.fns install.man
-uninstall: uninstall.bin uninstall.modules uninstall.fns uninstall.man
+install: install.bin install.modules install.fns install.man install.info
+uninstall: uninstall.bin uninstall.modules uninstall.fns uninstall.man uninstall.info
# install/uninstall just the binary
install.bin uninstall.bin:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/09/06 18:53:51 nicm Exp $
--- configure.ac.orig Mon Aug 30 09:36:42 2010
+++ configure.ac Mon Aug 30 09:37:03 2010
@@ -701,7 +701,7 @@ AH_TEMPLATE([ZSH_NO_XOPEN],
$OpenBSD: patch-configure_ac,v 1.2 2014/04/17 12:12:20 jasper Exp $
--- configure.ac.orig Wed Nov 27 20:00:20 2013
+++ configure.ac Mon Apr 14 18:10:09 2014
@@ -756,7 +756,7 @@ AH_TEMPLATE([ZSH_NO_XOPEN],
AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
zsh_cv_no_xopen,
[[case "$host_os" in

View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.37 2013/10/02 19:49:14 gsoares Exp $
@comment $OpenBSD: PLIST,v 1.38 2014/04/17 12:12:20 jasper Exp $
@pkgpath shells/zsh,-main
@shell bin/zsh
%%SHARED%%
@bin bin/zsh-${V}
@info info/zsh.info
@bin bin/${FULLPKGNAME}
@man man/man1/zsh.1
@man man/man1/zshall.1
@man man/man1/zshbuiltins.1
@ -122,6 +121,7 @@ share/zsh/${V}/functions/_calendar
share/zsh/${V}/functions/_call_function
share/zsh/${V}/functions/_call_program
share/zsh/${V}/functions/_canonical_paths
share/zsh/${V}/functions/_cat
share/zsh/${V}/functions/_ccal
share/zsh/${V}/functions/_cd
share/zsh/${V}/functions/_cdbs-edit-patch
@ -139,6 +139,7 @@ share/zsh/${V}/functions/_combination
share/zsh/${V}/functions/_comm
share/zsh/${V}/functions/_command
share/zsh/${V}/functions/_command_names
share/zsh/${V}/functions/_comp_locale
share/zsh/${V}/functions/_compdef
share/zsh/${V}/functions/_complete
share/zsh/${V}/functions/_complete_debug
@ -175,6 +176,7 @@ share/zsh/${V}/functions/_dbus
share/zsh/${V}/functions/_dchroot
share/zsh/${V}/functions/_dchroot-dsa
share/zsh/${V}/functions/_dcop
share/zsh/${V}/functions/_dcut
share/zsh/${V}/functions/_dd
share/zsh/${V}/functions/_deb_packages
share/zsh/${V}/functions/_debchange
@ -187,6 +189,7 @@ share/zsh/${V}/functions/_delimiters
share/zsh/${V}/functions/_describe
share/zsh/${V}/functions/_description
share/zsh/${V}/functions/_devtodo
share/zsh/${V}/functions/_df
share/zsh/${V}/functions/_dhclient
share/zsh/${V}/functions/_dhcpinfo
share/zsh/${V}/functions/_dict
@ -231,6 +234,7 @@ share/zsh/${V}/functions/_enscript
share/zsh/${V}/functions/_env
share/zsh/${V}/functions/_equal
share/zsh/${V}/functions/_espeak
share/zsh/${V}/functions/_etags
share/zsh/${V}/functions/_ethtool
share/zsh/${V}/functions/_expand
share/zsh/${V}/functions/_expand_alias
@ -351,7 +355,6 @@ share/zsh/${V}/functions/_lha
share/zsh/${V}/functions/_lighttpd
share/zsh/${V}/functions/_limit
share/zsh/${V}/functions/_limits
share/zsh/${V}/functions/_linda
share/zsh/${V}/functions/_links
share/zsh/${V}/functions/_lintian
share/zsh/${V}/functions/_list
@ -385,6 +388,7 @@ share/zsh/${V}/functions/_make-kpkg
share/zsh/${V}/functions/_man
share/zsh/${V}/functions/_match
share/zsh/${V}/functions/_math
share/zsh/${V}/functions/_math_params
share/zsh/${V}/functions/_matlab
share/zsh/${V}/functions/_md5sum
share/zsh/${V}/functions/_mdadm
@ -403,6 +407,7 @@ share/zsh/${V}/functions/_mkshortcut
share/zsh/${V}/functions/_mkzsh
share/zsh/${V}/functions/_module
share/zsh/${V}/functions/_module-assistant
share/zsh/${V}/functions/_module_math_func
share/zsh/${V}/functions/_modutils
share/zsh/${V}/functions/_mondo
share/zsh/${V}/functions/_monotone
@ -489,6 +494,7 @@ share/zsh/${V}/functions/_portmaster
share/zsh/${V}/functions/_ports
share/zsh/${V}/functions/_portsnap
share/zsh/${V}/functions/_postfix
share/zsh/${V}/functions/_postscript
share/zsh/${V}/functions/_powerd
share/zsh/${V}/functions/_prcs
share/zsh/${V}/functions/_precommand
@ -498,6 +504,7 @@ share/zsh/${V}/functions/_printenv
share/zsh/${V}/functions/_printers
share/zsh/${V}/functions/_procstat
share/zsh/${V}/functions/_prompt
share/zsh/${V}/functions/_prove
share/zsh/${V}/functions/_prstat
share/zsh/${V}/functions/_ps
share/zsh/${V}/functions/_ps1234
@ -540,6 +547,7 @@ share/zsh/${V}/functions/_rrdtool
share/zsh/${V}/functions/_rsync
share/zsh/${V}/functions/_rubber
share/zsh/${V}/functions/_ruby
share/zsh/${V}/functions/_run-help
share/zsh/${V}/functions/_sablotron
share/zsh/${V}/functions/_samba
share/zsh/${V}/functions/_savecore
@ -650,6 +658,7 @@ share/zsh/${V}/functions/_uscan
share/zsh/${V}/functions/_user_admin
share/zsh/${V}/functions/_user_at_host
share/zsh/${V}/functions/_user_expand
share/zsh/${V}/functions/_user_math_func
share/zsh/${V}/functions/_users
share/zsh/${V}/functions/_users_on
share/zsh/${V}/functions/_uzbl
@ -927,6 +936,115 @@ share/zsh/${V}/functions/zsh-newuser-install
share/zsh/${V}/functions/zsh_directory_name_cdr
share/zsh/${V}/functions/zstyle+
share/zsh/${V}/functions/ztodo
share/zsh/${V}/help/
share/zsh/${V}/help/alias
share/zsh/${V}/help/autoload
share/zsh/${V}/help/bg
share/zsh/${V}/help/bindkey
share/zsh/${V}/help/break
share/zsh/${V}/help/builtin
share/zsh/${V}/help/bye
share/zsh/${V}/help/cap
share/zsh/${V}/help/cd
share/zsh/${V}/help/chdir
share/zsh/${V}/help/clone
share/zsh/${V}/help/colon
share/zsh/${V}/help/command
share/zsh/${V}/help/comparguments
share/zsh/${V}/help/compcall
share/zsh/${V}/help/compctl
share/zsh/${V}/help/compdescribe
share/zsh/${V}/help/compfiles
share/zsh/${V}/help/compgroups
share/zsh/${V}/help/compquote
share/zsh/${V}/help/comptags
share/zsh/${V}/help/comptry
share/zsh/${V}/help/compvalues
share/zsh/${V}/help/continue
share/zsh/${V}/help/declare
share/zsh/${V}/help/dirs
share/zsh/${V}/help/disable
share/zsh/${V}/help/disown
share/zsh/${V}/help/dot
share/zsh/${V}/help/echo
share/zsh/${V}/help/echotc
share/zsh/${V}/help/echoti
share/zsh/${V}/help/emulate
share/zsh/${V}/help/enable
share/zsh/${V}/help/eval
share/zsh/${V}/help/exec
share/zsh/${V}/help/exit
share/zsh/${V}/help/export
share/zsh/${V}/help/false
share/zsh/${V}/help/fc
share/zsh/${V}/help/fg
share/zsh/${V}/help/float
share/zsh/${V}/help/functions
share/zsh/${V}/help/getcap
share/zsh/${V}/help/getln
share/zsh/${V}/help/getopts
share/zsh/${V}/help/hash
share/zsh/${V}/help/history
share/zsh/${V}/help/integer
share/zsh/${V}/help/jobs
share/zsh/${V}/help/kill
share/zsh/${V}/help/let
share/zsh/${V}/help/limit
share/zsh/${V}/help/local
share/zsh/${V}/help/log
share/zsh/${V}/help/logout
share/zsh/${V}/help/noglob
share/zsh/${V}/help/popd
share/zsh/${V}/help/print
share/zsh/${V}/help/printf
share/zsh/${V}/help/pushd
share/zsh/${V}/help/pushln
share/zsh/${V}/help/pwd
share/zsh/${V}/help/r
share/zsh/${V}/help/read
share/zsh/${V}/help/readonly
share/zsh/${V}/help/rehash
share/zsh/${V}/help/return
share/zsh/${V}/help/sched
share/zsh/${V}/help/set
share/zsh/${V}/help/setcap
share/zsh/${V}/help/setopt
share/zsh/${V}/help/shift
share/zsh/${V}/help/source
share/zsh/${V}/help/stat
share/zsh/${V}/help/suspend
share/zsh/${V}/help/test
share/zsh/${V}/help/times
share/zsh/${V}/help/trap
share/zsh/${V}/help/true
share/zsh/${V}/help/ttyctl
share/zsh/${V}/help/type
share/zsh/${V}/help/typeset
share/zsh/${V}/help/ulimit
share/zsh/${V}/help/umask
share/zsh/${V}/help/unalias
share/zsh/${V}/help/unfunction
share/zsh/${V}/help/unhash
share/zsh/${V}/help/unlimit
share/zsh/${V}/help/unset
share/zsh/${V}/help/unsetopt
share/zsh/${V}/help/vared
share/zsh/${V}/help/wait
share/zsh/${V}/help/whence
share/zsh/${V}/help/where
share/zsh/${V}/help/which
share/zsh/${V}/help/zcompile
share/zsh/${V}/help/zformat
share/zsh/${V}/help/zftp
share/zsh/${V}/help/zle
share/zsh/${V}/help/zmodload
share/zsh/${V}/help/zparseopts
share/zsh/${V}/help/zprof
share/zsh/${V}/help/zpty
share/zsh/${V}/help/zregexparse
share/zsh/${V}/help/zsocket
share/zsh/${V}/help/zstyle
share/zsh/${V}/help/ztcp
share/zsh/${V}/scripts/
share/zsh/${V}/scripts/newuser
share/zsh/site-functions/