Update to 5.0.5
* Fix build on Debian GNU/kFreeBSD 7.3 * Update MASTER_SITES Changelog: This is version 5.0.5 of the shell. This is a stable release. There are minor new features as well as bug fixes since 5.0.2. 5.0.3 and 5.0.4 were short-lived releases with most of the features of 5.0.5 that were replaced owing to significant bugs. Incompatibilities between 5.0.2 and 5.0.5 ----------------------------------------- The "zshaddhistory" hook mechanism documented in the zshmisc manual page has been upgraded so that a hook returning status 2 causes a history line to be saved on the internal history list but not written to the history file. Previously any non-zero status return would cause the line not to be saved on the history at all. It is recommended to use status 1 for this (indeed most shell users would naturally do so).
This commit is contained in:
parent
73397b69f1
commit
5ddc6b149e
7 changed files with 135 additions and 53 deletions
|
@ -1,10 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.64 2013/08/01 06:08:33 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.65 2014/01/08 16:30:01 ryoon Exp $
|
||||
|
||||
.include "../../shells/zsh/Makefile.common"
|
||||
|
||||
PKGREVISION= 2
|
||||
|
||||
ZSH_VERSION= 5.0.2
|
||||
ZSH_VERSION= 5.0.5
|
||||
ZSH_MAINTAINER= uebayasi@NetBSD.org
|
||||
|
||||
CONFIGURE_ARGS+= --disable-gdbm
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
# $NetBSD: Makefile.common,v 1.71 2013/05/10 01:17:33 riastradh Exp $
|
||||
# $NetBSD: Makefile.common,v 1.72 2014/01/08 16:30:01 ryoon Exp $
|
||||
# used by shells/zsh/Makefile
|
||||
# used by shells/zsh-current/Makefile
|
||||
|
||||
DISTNAME= zsh-${ZSH_VERSION}
|
||||
CATEGORIES= shells
|
||||
MASTER_SITES= ftp://mirrors.dotsrc.org/zsh/ \
|
||||
ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/ \
|
||||
http://www.math.technion.ac.il/pub/zsh/ \
|
||||
ftp://ftp.zsh.org/zsh/
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MAINTAINER= ${ZSH_MAINTAINER}
|
||||
|
@ -99,7 +96,7 @@ PLIST.terminfo= yes
|
|||
.endif
|
||||
|
||||
### curses
|
||||
.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*)
|
||||
.if empty(MACHINE_PLATFORM:MNetBSD-[0-9]*) && empty(MACHINE_PLATFORM:MGNUkFreeBSD-[0-9]*)
|
||||
CHECK_BUILTIN.curses= yes
|
||||
.include "../../mk/curses.builtin.mk"
|
||||
.if !empty(USE_BUILTIN.curses:M[Yy][Ee][Ss]) || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
|
||||
|
|
122
shells/zsh/PLIST
122
shells/zsh/PLIST
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.28 2013/01/03 15:37:23 ryoon Exp $
|
||||
@comment $NetBSD: PLIST,v 1.29 2014/01/08 16:30:01 ryoon Exp $
|
||||
bin/zsh
|
||||
bin/${PKGNAME}
|
||||
info/zsh.info
|
||||
|
@ -383,7 +383,6 @@ share/zsh/${PKGVERSION}/functions/_lha
|
|||
share/zsh/${PKGVERSION}/functions/_lighttpd
|
||||
share/zsh/${PKGVERSION}/functions/_limit
|
||||
share/zsh/${PKGVERSION}/functions/_limits
|
||||
share/zsh/${PKGVERSION}/functions/_linda
|
||||
share/zsh/${PKGVERSION}/functions/_links
|
||||
share/zsh/${PKGVERSION}/functions/_lintian
|
||||
share/zsh/${PKGVERSION}/functions/_list
|
||||
|
@ -959,5 +958,124 @@ ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zsh-newuser-install
|
|||
share/zsh/${PKGVERSION}/functions/zsh_directory_name_cdr
|
||||
share/zsh/${PKGVERSION}/functions/zstyle+
|
||||
share/zsh/${PKGVERSION}/functions/ztodo
|
||||
share/zsh/${PKGVERSION}/functions/_cat
|
||||
share/zsh/${PKGVERSION}/functions/_comp_locale
|
||||
share/zsh/${PKGVERSION}/functions/_dcut
|
||||
share/zsh/${PKGVERSION}/functions/_df
|
||||
share/zsh/${PKGVERSION}/functions/_etags
|
||||
share/zsh/${PKGVERSION}/functions/_math_params
|
||||
share/zsh/${PKGVERSION}/functions/_module_math_func
|
||||
share/zsh/${PKGVERSION}/functions/_postscript
|
||||
share/zsh/${PKGVERSION}/functions/_prove
|
||||
share/zsh/${PKGVERSION}/functions/_run-help
|
||||
share/zsh/${PKGVERSION}/functions/_user_math_func
|
||||
share/zsh/${PKGVERSION}/help/alias
|
||||
share/zsh/${PKGVERSION}/help/autoload
|
||||
share/zsh/${PKGVERSION}/help/bg
|
||||
share/zsh/${PKGVERSION}/help/bindkey
|
||||
share/zsh/${PKGVERSION}/help/break
|
||||
share/zsh/${PKGVERSION}/help/builtin
|
||||
share/zsh/${PKGVERSION}/help/bye
|
||||
share/zsh/${PKGVERSION}/help/cap
|
||||
share/zsh/${PKGVERSION}/help/cd
|
||||
share/zsh/${PKGVERSION}/help/chdir
|
||||
share/zsh/${PKGVERSION}/help/clone
|
||||
share/zsh/${PKGVERSION}/help/colon
|
||||
share/zsh/${PKGVERSION}/help/command
|
||||
share/zsh/${PKGVERSION}/help/comparguments
|
||||
share/zsh/${PKGVERSION}/help/compcall
|
||||
share/zsh/${PKGVERSION}/help/compctl
|
||||
share/zsh/${PKGVERSION}/help/compdescribe
|
||||
share/zsh/${PKGVERSION}/help/compfiles
|
||||
share/zsh/${PKGVERSION}/help/compgroups
|
||||
share/zsh/${PKGVERSION}/help/compquote
|
||||
share/zsh/${PKGVERSION}/help/comptags
|
||||
share/zsh/${PKGVERSION}/help/comptry
|
||||
share/zsh/${PKGVERSION}/help/compvalues
|
||||
share/zsh/${PKGVERSION}/help/continue
|
||||
share/zsh/${PKGVERSION}/help/declare
|
||||
share/zsh/${PKGVERSION}/help/dirs
|
||||
share/zsh/${PKGVERSION}/help/disable
|
||||
share/zsh/${PKGVERSION}/help/disown
|
||||
share/zsh/${PKGVERSION}/help/dot
|
||||
share/zsh/${PKGVERSION}/help/echo
|
||||
share/zsh/${PKGVERSION}/help/echotc
|
||||
share/zsh/${PKGVERSION}/help/echoti
|
||||
share/zsh/${PKGVERSION}/help/emulate
|
||||
share/zsh/${PKGVERSION}/help/enable
|
||||
share/zsh/${PKGVERSION}/help/eval
|
||||
share/zsh/${PKGVERSION}/help/exec
|
||||
share/zsh/${PKGVERSION}/help/exit
|
||||
share/zsh/${PKGVERSION}/help/export
|
||||
share/zsh/${PKGVERSION}/help/false
|
||||
share/zsh/${PKGVERSION}/help/fc
|
||||
share/zsh/${PKGVERSION}/help/fg
|
||||
share/zsh/${PKGVERSION}/help/float
|
||||
share/zsh/${PKGVERSION}/help/functions
|
||||
share/zsh/${PKGVERSION}/help/getcap
|
||||
share/zsh/${PKGVERSION}/help/getln
|
||||
share/zsh/${PKGVERSION}/help/getopts
|
||||
share/zsh/${PKGVERSION}/help/hash
|
||||
share/zsh/${PKGVERSION}/help/history
|
||||
share/zsh/${PKGVERSION}/help/integer
|
||||
share/zsh/${PKGVERSION}/help/jobs
|
||||
share/zsh/${PKGVERSION}/help/kill
|
||||
share/zsh/${PKGVERSION}/help/let
|
||||
share/zsh/${PKGVERSION}/help/limit
|
||||
share/zsh/${PKGVERSION}/help/local
|
||||
share/zsh/${PKGVERSION}/help/log
|
||||
share/zsh/${PKGVERSION}/help/logout
|
||||
share/zsh/${PKGVERSION}/help/noglob
|
||||
share/zsh/${PKGVERSION}/help/popd
|
||||
share/zsh/${PKGVERSION}/help/print
|
||||
share/zsh/${PKGVERSION}/help/printf
|
||||
share/zsh/${PKGVERSION}/help/pushd
|
||||
share/zsh/${PKGVERSION}/help/pushln
|
||||
share/zsh/${PKGVERSION}/help/pwd
|
||||
share/zsh/${PKGVERSION}/help/r
|
||||
share/zsh/${PKGVERSION}/help/read
|
||||
share/zsh/${PKGVERSION}/help/readonly
|
||||
share/zsh/${PKGVERSION}/help/rehash
|
||||
share/zsh/${PKGVERSION}/help/return
|
||||
share/zsh/${PKGVERSION}/help/sched
|
||||
share/zsh/${PKGVERSION}/help/set
|
||||
share/zsh/${PKGVERSION}/help/setcap
|
||||
share/zsh/${PKGVERSION}/help/setopt
|
||||
share/zsh/${PKGVERSION}/help/shift
|
||||
share/zsh/${PKGVERSION}/help/source
|
||||
share/zsh/${PKGVERSION}/help/stat
|
||||
share/zsh/${PKGVERSION}/help/suspend
|
||||
share/zsh/${PKGVERSION}/help/test
|
||||
share/zsh/${PKGVERSION}/help/times
|
||||
share/zsh/${PKGVERSION}/help/trap
|
||||
share/zsh/${PKGVERSION}/help/true
|
||||
share/zsh/${PKGVERSION}/help/ttyctl
|
||||
share/zsh/${PKGVERSION}/help/type
|
||||
share/zsh/${PKGVERSION}/help/typeset
|
||||
share/zsh/${PKGVERSION}/help/ulimit
|
||||
share/zsh/${PKGVERSION}/help/umask
|
||||
share/zsh/${PKGVERSION}/help/unalias
|
||||
share/zsh/${PKGVERSION}/help/unfunction
|
||||
share/zsh/${PKGVERSION}/help/unhash
|
||||
share/zsh/${PKGVERSION}/help/unlimit
|
||||
share/zsh/${PKGVERSION}/help/unset
|
||||
share/zsh/${PKGVERSION}/help/unsetopt
|
||||
share/zsh/${PKGVERSION}/help/vared
|
||||
share/zsh/${PKGVERSION}/help/wait
|
||||
share/zsh/${PKGVERSION}/help/whence
|
||||
share/zsh/${PKGVERSION}/help/where
|
||||
share/zsh/${PKGVERSION}/help/which
|
||||
share/zsh/${PKGVERSION}/help/zcompile
|
||||
share/zsh/${PKGVERSION}/help/zformat
|
||||
share/zsh/${PKGVERSION}/help/zftp
|
||||
share/zsh/${PKGVERSION}/help/zle
|
||||
share/zsh/${PKGVERSION}/help/zmodload
|
||||
share/zsh/${PKGVERSION}/help/zparseopts
|
||||
share/zsh/${PKGVERSION}/help/zprof
|
||||
share/zsh/${PKGVERSION}/help/zpty
|
||||
share/zsh/${PKGVERSION}/help/zregexparse
|
||||
share/zsh/${PKGVERSION}/help/zsocket
|
||||
share/zsh/${PKGVERSION}/help/zstyle
|
||||
share/zsh/${PKGVERSION}/help/ztcp
|
||||
${PLIST.dynamic}share/zsh/${PKGVERSION}/scripts/newuser
|
||||
@pkgdir share/zsh/site-functions
|
||||
|
|
|
@ -1,10 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.45 2013/10/31 13:08:37 jperkin Exp $
|
||||
$NetBSD: distinfo,v 1.46 2014/01/08 16:30:01 ryoon Exp $
|
||||
|
||||
SHA1 (zsh-5.0.2.tar.bz2) = 9f55ecaaae7cdc1495f91237ba2ec087777a4ad9
|
||||
RMD160 (zsh-5.0.2.tar.bz2) = eea2328a28e9f022ab9f49583622a9c3bd6114a7
|
||||
Size (zsh-5.0.2.tar.bz2) = 3025767 bytes
|
||||
SHA1 (patch-Completion_X_Command___mplayer) = 27a4c1a28e6daedc8dfc69f1c3def4d2e1c68aaf
|
||||
SHA1 (patch-Doc_zsh.texi) = 1f4f8a227c4322c216c8cc21d22c783d43784532
|
||||
SHA1 (zsh-5.0.5.tar.bz2) = 75426146bce45ee176d9d50b32f1ced78418ae16
|
||||
RMD160 (zsh-5.0.5.tar.bz2) = 4299f33ba0de2542f7567ae4f16a4de16ba560a0
|
||||
Size (zsh-5.0.5.tar.bz2) = 3104375 bytes
|
||||
SHA1 (patch-ac) = f83e5f38c262c779f32e0368815ce02308bc3fff
|
||||
SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
|
||||
SHA1 (patch-configure.ac) = a8bcb291482fb1eead071439597662f07020e554
|
||||
SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-Completion_X_Command___mplayer,v 1.1 2013/08/01 06:08:33 wiz Exp $
|
||||
|
||||
--- Completion/X/Command/_mplayer.orig 2012-01-29 18:27:45.000000000 +0000
|
||||
+++ Completion/X/Command/_mplayer
|
||||
@@ -115,7 +115,7 @@ case "$state" in
|
||||
_tags files urls
|
||||
while _tags; do
|
||||
_requested files expl 'video file' _files -g \
|
||||
- "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|vob|wav|webm|wma|wmv)(-.)" && ret=0
|
||||
+ "*.(#i)(asf|asx|avi|flac|flv|m1v|m2p|m2v|m4v|mjpg|mka|mkv|mov|mp3|mp4|mpe|mpeg|mpg|ogg|ogm|qt|rm|ts|vob|wav|webm|wma|wmv)(-.)" && ret=0
|
||||
if _requested urls; then
|
||||
while _next_label urls expl URL; do
|
||||
_urls "$expl[@]" && ret=0
|
|
@ -1,16 +0,0 @@
|
|||
$NetBSD: patch-Doc_zsh.texi,v 1.1 2013/10/31 13:08:37 jperkin Exp $
|
||||
|
||||
Fix build with texinfo 5.x
|
||||
|
||||
--- Doc/zsh.texi.orig 2012-12-21 19:33:06.000000000 +0000
|
||||
+++ Doc/zsh.texi
|
||||
@@ -22643,8 +22643,7 @@ Finally, the @t{_path_files} function u
|
||||
described above.
|
||||
|
||||
@findex _pick_variant
|
||||
-@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c}
|
||||
-@var{command} ] [ @t{-r} @var{name} ]
|
||||
+@item @t{_pick_variant} [ @t{-b} @var{builtin-label} ] [ @t{-c} @var{command} ] [ @t{-r} @var{name} ]
|
||||
@itemx @var{label}@t{=}@var{pattern} ... @var{label} [ @var{args} ... ]
|
||||
This function is used to resolve situations where a single command name
|
||||
requires more than one type of handling, either because it
|
|
@ -1,15 +1,15 @@
|
|||
$NetBSD: patch-configure.ac,v 1.3 2013/05/10 01:17:33 riastradh Exp $
|
||||
$NetBSD: patch-configure.ac,v 1.4 2014/01/08 16:30:01 ryoon Exp $
|
||||
|
||||
Use a compile test, not a run test, for whether various rlimit values
|
||||
are equivalent. A compile test is sufficient because zsh uses these
|
||||
values in switch cases, so they must be compile-time, if not
|
||||
preprocessor-time, constants.
|
||||
|
||||
--- configure.ac.orig 2012-09-09 18:26:47.000000000 +0000
|
||||
--- configure.ac.orig 2013-11-27 19:00:20.000000000 +0000
|
||||
+++ configure.ac
|
||||
@@ -1812,85 +1812,9 @@ zsh_LIMIT_PRESENT(RLIMIT_MSGQUEUE)
|
||||
zsh_LIMIT_PRESENT(RLIMIT_NICE)
|
||||
zsh_LIMIT_PRESENT(RLIMIT_RTPRIO)
|
||||
@@ -1837,85 +1837,9 @@ zsh_LIMIT_PRESENT(RLIMIT_NPTS)
|
||||
zsh_LIMIT_PRESENT(RLIMIT_SWAP)
|
||||
zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
|
||||
|
||||
-AH_TEMPLATE([RLIMIT_VMEM_IS_RSS],
|
||||
-[Define to 1 if RLIMIT_VMEM and RLIMIT_RSS both exist and are equal.])
|
||||
|
|
Loading…
Reference in a new issue