Update to 5.1

pkgsrc changes:
  removed patch:
    patch-Completion_Unix_Command__du
    patch-Completion_Unix_Command__sort
    patch-Src_builtin.c
    patch-Test_B03print.ztst

  quote from zsh-5.1/ChangeLog:
    * 36120: Completion/Unix/Command/_sort: Fix syntax error
    * 35467: Completion/Unix/Command/_du: complete files for non-GNU du
    * 35412: Src/builtin.c, Test/B03print.ztst: fix for - flag
    when formating strings with printf that was broken in 34841

  separate a patch ( $ mv patches/patch-ac files/patch-ac )

zsh-5.1/NEWS:
Changes from 5.0.8 to 5.1
-------------------------

The builtins declare, export, local, readonly and typeset
now have corresponding reserved words.  When used in
this form, the builtin syntax is extended so that assignments
following the reserved word are treated similarly to
assignments that appear at the start of the command line.
For example,
  local scalar=`echo one word` array=(several words)
creates a local "scalar" containing the text "one word"
and an array "array" containing the words "several"
"words".

- The print builtin has new options -x and -X to expand tabs.

- Several new command completions and numerous updates to others.

- Options to "fc" to segregate internal and shared history.

- All emulations including "sh" use multibyte by default; several
  repairs to multibyte handling.

- ZLE supports "bracketed paste" mode to avoid interpreting pasted
  newlines as accept-line.  Pastes can be highlighted for visibility
  and to make it more obvious whether accept-line has occurred.

- Improved (though still not perfect) POSIX compatibility for getopts
  builtin when POSIX_BUILTINS is set.

- New setopt APPEND_CREATE for POSIX-compatible NO_CLOBBER behavior.

- Completion of date values now displays in a calendar format when
  the complist module is available.  Controllable by zstyle.

- New parameter UNDO_LIMIT_NO for more control over ZLE undo repeat.

- Several repairs/improvements to the contributed narrow-to-region
  ZLE function.

- Many changes to child-process and signal handling to eliminate race
  conditions and avoid deadlocks on descriptor and memory management.

- New builtin sysopen in zsh/system module for detailed control of
  file descriptor modes.

zsh-5.1/README:
Incompatibilites between 5.0.8 and 5.1
--------------------------------------

The default behaviour when text is pasted into an X Windows terminal has
changed significantly (unless you are using a very old terminal emulator
that doesn't support this mode).  Now, the new "bracketed paste mode"
treats all the pasted text as literal characters.  This means, in
particular, that a newline is simply inserted as a visible newline; you
need to hit Return on the keyboard to execute the pasted text in one go.
See the description of zle_bracketed_paste in the zshparams manual for
more.  "unset zle_bracketed_paste" restores the previous behaviour.

As noted in NEWS, the builtins declare, export, float, integer, local,
readonly and typeset now have corresponding reserved words that provide
true assignment semantics instead of an approximation by means of normal
command line arguments.  It is hoped that this additional consistency
provides a more natural interface.  However, compatbility with older
versions of zsh can be obtained by turning off the reserved word
interface, exposing the builtin interface:

  disable -r declare export float integer local readonly typeset

This is also necessary in the unusual eventuality that the builtins are
to be overridden by shell functions, since reserved words take
precedence over functions.

9 files changed, 31 insertions, 88 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 4c8e29ee1df..d4fcdec01ae 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2015/09/02 10:54:29 szptvlfn Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	5.0.8
-PKGREVISION=	2
+ZSH_VERSION=	5.1
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 CONFIGURE_ARGS+=	--disable-gdbm
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 2415b4ff6de..3d88147411e 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.75 2015/06/04 15:08:14 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.76 2015/09/02 10:54:29 szptvlfn Exp $
 # used by shells/zsh/Makefile
-# used by shells/zsh-current/Makefile
 
 DISTNAME=	zsh-${ZSH_VERSION}
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zsh/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	${ZSH_MAINTAINER}
 HOMEPAGE=	http://zsh.sourceforge.net/
@@ -127,6 +126,13 @@ PLIST.dynamic=	yes
 
 .undef MANZ
 
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "Interix"
+do-patch:
+	# $ sha1 files/patch-ac
+	# SHA1 (files/patch-ac) = 602d7f8c1db02a7a15d920a55da6ac7ac80ee70e
+	${PATCH} -d ${WRKSRC} -i ${FILESDIR}/patch-ac
+.endif
+
 pre-install:
 	cd ${WRKSRC}/Completion; ${FIND} . -name \*.orig -exec ${RM} \{\} \;
 
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index 4dcc7a5600a..080696db5b0 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/06/13 12:57:28 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2015/09/02 10:54:29 szptvlfn Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -136,6 +136,7 @@ share/zsh/${PKGVERSION}/functions/_bash_completions
 share/zsh/${PKGVERSION}/functions/_baz
 share/zsh/${PKGVERSION}/functions/_be_name
 share/zsh/${PKGVERSION}/functions/_beadm
+share/zsh/${PKGVERSION}/functions/_beep
 share/zsh/${PKGVERSION}/functions/_bind_addresses
 share/zsh/${PKGVERSION}/functions/_bindkey
 share/zsh/${PKGVERSION}/functions/_bison
@@ -182,6 +183,7 @@ share/zsh/${PKGVERSION}/functions/_comm
 share/zsh/${PKGVERSION}/functions/_command
 share/zsh/${PKGVERSION}/functions/_command_names
 share/zsh/${PKGVERSION}/functions/_comp_locale
+share/zsh/${PKGVERSION}/functions/_compadd
 share/zsh/${PKGVERSION}/functions/_compdef
 share/zsh/${PKGVERSION}/functions/_complete
 share/zsh/${PKGVERSION}/functions/_complete_debug
@@ -214,6 +216,8 @@ share/zsh/${PKGVERSION}/functions/_cygstart
 share/zsh/${PKGVERSION}/functions/_dak
 share/zsh/${PKGVERSION}/functions/_darcs
 share/zsh/${PKGVERSION}/functions/_date
+share/zsh/${PKGVERSION}/functions/_date_formats
+share/zsh/${PKGVERSION}/functions/_dates
 share/zsh/${PKGVERSION}/functions/_dbus
 share/zsh/${PKGVERSION}/functions/_dchroot
 share/zsh/${PKGVERSION}/functions/_dchroot-dsa
@@ -223,6 +227,7 @@ share/zsh/${PKGVERSION}/functions/_dd
 share/zsh/${PKGVERSION}/functions/_deb_architectures
 share/zsh/${PKGVERSION}/functions/_deb_packages
 share/zsh/${PKGVERSION}/functions/_debchange
+share/zsh/${PKGVERSION}/functions/_debcheckout
 share/zsh/${PKGVERSION}/functions/_debdiff
 share/zsh/${PKGVERSION}/functions/_debfoster
 share/zsh/${PKGVERSION}/functions/_debsign
@@ -250,6 +255,7 @@ share/zsh/${PKGVERSION}/functions/_django
 share/zsh/${PKGVERSION}/functions/_dladm
 share/zsh/${PKGVERSION}/functions/_dlocate
 share/zsh/${PKGVERSION}/functions/_dmidecode
+share/zsh/${PKGVERSION}/functions/_dnf
 share/zsh/${PKGVERSION}/functions/_domains
 share/zsh/${PKGVERSION}/functions/_dpatch-edit-patch
 share/zsh/${PKGVERSION}/functions/_dpkg
@@ -513,6 +519,7 @@ share/zsh/${PKGVERSION}/functions/_pack
 share/zsh/${PKGVERSION}/functions/_parameter
 share/zsh/${PKGVERSION}/functions/_parameters
 share/zsh/${PKGVERSION}/functions/_patch
+share/zsh/${PKGVERSION}/functions/_patchutils
 share/zsh/${PKGVERSION}/functions/_path_commands
 share/zsh/${PKGVERSION}/functions/_path_files
 share/zsh/${PKGVERSION}/functions/_pax
@@ -649,6 +656,7 @@ share/zsh/${PKGVERSION}/functions/_stat
 share/zsh/${PKGVERSION}/functions/_stgit
 share/zsh/${PKGVERSION}/functions/_store_cache
 share/zsh/${PKGVERSION}/functions/_strace
+share/zsh/${PKGVERSION}/functions/_strftime
 share/zsh/${PKGVERSION}/functions/_strip
 share/zsh/${PKGVERSION}/functions/_stty
 share/zsh/${PKGVERSION}/functions/_su
@@ -666,6 +674,7 @@ share/zsh/${PKGVERSION}/functions/_svcs_fmri
 share/zsh/${PKGVERSION}/functions/_svn-buildpackage
 share/zsh/${PKGVERSION}/functions/_sysctl
 share/zsh/${PKGVERSION}/functions/_sysstat
+share/zsh/${PKGVERSION}/functions/_systat
 share/zsh/${PKGVERSION}/functions/_system_profiler
 share/zsh/${PKGVERSION}/functions/_systemd
 share/zsh/${PKGVERSION}/functions/_tags
@@ -699,6 +708,7 @@ share/zsh/${PKGVERSION}/functions/_tracepath
 share/zsh/${PKGVERSION}/functions/_trap
 share/zsh/${PKGVERSION}/functions/_tree
 share/zsh/${PKGVERSION}/functions/_ttyctl
+share/zsh/${PKGVERSION}/functions/_ttys
 share/zsh/${PKGVERSION}/functions/_tune2fs
 share/zsh/${PKGVERSION}/functions/_twidge
 share/zsh/${PKGVERSION}/functions/_twisted
@@ -733,6 +743,7 @@ share/zsh/${PKGVERSION}/functions/_vars
 share/zsh/${PKGVERSION}/functions/_vcsh
 share/zsh/${PKGVERSION}/functions/_vim
 share/zsh/${PKGVERSION}/functions/_vim-addons
+share/zsh/${PKGVERSION}/functions/_vmstat
 share/zsh/${PKGVERSION}/functions/_vnc
 share/zsh/${PKGVERSION}/functions/_volume_groups
 share/zsh/${PKGVERSION}/functions/_vorbis
@@ -745,6 +756,8 @@ share/zsh/${PKGVERSION}/functions/_wajig
 share/zsh/${PKGVERSION}/functions/_wakeup_capable_devices
 share/zsh/${PKGVERSION}/functions/_wanna-build
 share/zsh/${PKGVERSION}/functions/_wanted
+share/zsh/${PKGVERSION}/functions/_watch
+share/zsh/${PKGVERSION}/functions/_watch-snoop
 share/zsh/${PKGVERSION}/functions/_wc
 share/zsh/${PKGVERSION}/functions/_webbrowser
 share/zsh/${PKGVERSION}/functions/_wget
@@ -834,6 +847,7 @@ share/zsh/${PKGVERSION}/functions/backward-kill-word-match
 share/zsh/${PKGVERSION}/functions/backward-word-match
 share/zsh/${PKGVERSION}/functions/bashcompinit
 share/zsh/${PKGVERSION}/functions/before
+share/zsh/${PKGVERSION}/functions/bracketed-paste-magic
 share/zsh/${PKGVERSION}/functions/calendar
 share/zsh/${PKGVERSION}/functions/calendar_add
 share/zsh/${PKGVERSION}/functions/calendar_edit
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index dd7cfe500c0..7793ccb9140 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.53 2015/07/26 22:04:13 snj Exp $
+$NetBSD: distinfo,v 1.54 2015/09/02 10:54:29 szptvlfn Exp $
 
-SHA1 (zsh-5.0.8.tar.bz2) = e15e00bd4b80e96e87301bf682d86fdf56929989
-RMD160 (zsh-5.0.8.tar.bz2) = 2c831d5dee22d79b6e2fd6ad7b8392c1d201f017
-Size (zsh-5.0.8.tar.bz2) = 3250542 bytes
-SHA1 (patch-Completion_Unix_Command__du) = 267c6adc4941c9487b7a4a524472e65fef39dda6
-SHA1 (patch-Completion_Unix_Command__sort) = 34ec91557c1a8b78042ab333f73a18111dd64d18
-SHA1 (patch-Src_builtin.c) = 500ad7e79c38ba35055e39c3879e8d72f2f4a59d
-SHA1 (patch-Test_B03print.ztst) = 5e534fbacf1648faa6deeaae8af57f37498a98c4
-SHA1 (patch-ac) = 75c1b9e56858289adf9f1d9c58d2319bb6df7abc
+SHA1 (zsh-5.1.tar.xz) = 5461213760341a9010a90cd7a3c48e27804879b0
+RMD160 (zsh-5.1.tar.xz) = 3d66abaad114be7d90969f8f1bd4a90b3b3d0f22
+Size (zsh-5.1.tar.xz) = 2785404 bytes
 SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
 SHA1 (patch-configure.ac) = e34bbae6385442b51a7263b22681898203d0c013
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/files/patch-ac
index 717e80dc48f..d7010caa1df 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/files/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.31 2015/03/19 12:34:37 jperkin Exp $
+$NetBSD: patch-ac,v 1.1 2015/09/02 10:54:29 szptvlfn Exp $
 
 First chunk:
 Don't use _POSIX_C_SOURCE on SunOS with c99.
diff --git a/shells/zsh/patches/patch-Completion_Unix_Command__du b/shells/zsh/patches/patch-Completion_Unix_Command__du
deleted file mode 100644
index 0b6134150a2..00000000000
--- a/shells/zsh/patches/patch-Completion_Unix_Command__du
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Completion_Unix_Command__du,v 1.1 2015/07/26 22:04:13 snj Exp $
-
-Unbreak filename completion on non-GNU du binaries like NetBSD's.
-Upstreadm commit 806f73a0b3d3959d5af12ce97e0258b4d4fe7d76
-
---- Completion/Unix/Command/_du.orig	2015-07-26 14:39:36.000000000 -0700
-+++ Completion/Unix/Command/_du	2015-07-26 14:39:17.000000000 -0700
-@@ -74,5 +74,5 @@ else
-   do
-     [[ $OSTYPE = $~pattern ]] && args+=( $arg )
-   done
--  _arguments -s -A "-*" $args
-+  _arguments -s -A "-*" $args '*:file:_files'
- fi
diff --git a/shells/zsh/patches/patch-Completion_Unix_Command__sort b/shells/zsh/patches/patch-Completion_Unix_Command__sort
deleted file mode 100644
index f8132692d2d..00000000000
--- a/shells/zsh/patches/patch-Completion_Unix_Command__sort
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Completion_Unix_Command__sort,v 1.1 2015/07/26 22:04:13 snj Exp $
-
-Add missing ].  Fixes NetBSD and DragonFly completion of the sort
-command.  Without this, you get:
-"_arguments:comparguments:312: invalid option definition: (-s)-S[don't
-use stable sort"
-
---- Completion/Unix/Command/_sort.orig	2015-07-26 14:58:06.000000000 -0700
-+++ Completion/Unix/Command/_sort	2015-07-26 14:58:16.000000000 -0700
-@@ -55,7 +55,7 @@ case $variant in
-   netbsd*|dragonfly*)
-     args+=(
-       "${ordering}-l[sort by string length of field]"
--      "(-s)-S[don't use stable sort"
-+      "(-s)-S[don't use stable sort]"
-     )
-   ;|
-   openbsd*)
diff --git a/shells/zsh/patches/patch-Src_builtin.c b/shells/zsh/patches/patch-Src_builtin.c
deleted file mode 100644
index b175c89f2fc..00000000000
--- a/shells/zsh/patches/patch-Src_builtin.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Src_builtin.c,v 1.1 2015/06/13 12:57:28 ryoon Exp $
-
-https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/
-
---- Src/builtin.c.orig	2015-05-31 15:39:40.000000000 +0000
-+++ Src/builtin.c
-@@ -4461,7 +4461,7 @@ bin_print(char *name, char **args, Optio
- 			lleft -= chars;
- 			ptr += chars;
- 		    }
--		    if (width > 0 && flags[2]) width = -width;
-+		    if (width > 0 && flags[3]) width = -width;
- 		    if (width > 0 && lchars < width)
- 		    	count += fprintf(fout, "%*c", width - lchars, ' ');
- 		    count += fwrite(b, 1, lbytes, fout);
diff --git a/shells/zsh/patches/patch-Test_B03print.ztst b/shells/zsh/patches/patch-Test_B03print.ztst
deleted file mode 100644
index f8afd4d8e02..00000000000
--- a/shells/zsh/patches/patch-Test_B03print.ztst
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Test_B03print.ztst,v 1.1 2015/06/13 12:57:28 ryoon Exp $
-
-https://sourceforge.net/p/zsh/code/ci/ac26fafa03c30e8c79e4bd70bdbb68d025643ee7/
-
---- Test/B03print.ztst.orig	2014-12-13 23:55:54.000000000 +0000
-+++ Test/B03print.ztst
-@@ -169,11 +169,15 @@
- 0:%n count zeroed on format reuse
- >1
- 
--# this may fill spec string with '%0+- #*.*lld\0' - 13 characters
-- printf '%1$0+- #-08.5dx\n' 123
-+# this may fill spec string with '%0'+- #*.*lld\0' - 14 characters
-+ printf '%1$0'"'+- #-08.5dx\n" 123
- 0:maximal length format specification
- >+00123  x
- 
-+ printf "x:%-20s:y\n" fubar
-+0:left-justification of string
-+>x:fubar               :y
-+
-  printf '%*smorning\n' -5 good
- 0:negative width specified
- >good morning