zsh: Upgrade to 5.4.2

pkgsrc changes:
 - Use PRINT_PLIST_AWK to aid future upgrades.
 - Support the "static" option on Darwin and SunOS.

Upstream changes from 5.3.1 to 5.4:

The 'exec' and 'command' precommand modifiers, and options to them, are
now parsed after parameter expansion.  Previously, both the modifier and
any options to it were parsed between alias expansion and parameter
expansion (see zshexpn(1)), so they could neither be quoted nor be the
result of parameter expansion.  Examples: 's=command; $s -V ls' and
'\command -V ls' now work as expected.

Functions executed by ZLE widgets no longer have their standard input
closed, but redirected from /dev/null instead. That still guards
against user defined widgets inadvertently reading from the tty device.

There is an option WARN_NESTED_VAR, a companion to the existing
WARN_CREATE_GLOBAL that causes a warning if a function updates a
variable from an enclosing scope without using typeset -g.  It can be
turned on for an individual function with "functions -W".

zmodload now has an option -s to be silent on a failure to find a module
but still print other errors.

4 files changed, 40 insertions, 13 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index d46d8552afc..c725f4bc1a6 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2017/05/12 08:38:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.81 2017/10/13 09:35:19 jperkin Exp $
 
-DISTNAME=	zsh-5.3.1
+DISTNAME=	zsh-5.4.2
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=	.tar.xz
@@ -46,6 +46,7 @@ PLIST_VARS+=	xattr
 .if exists(/usr/include/sys/xattr.h)
 PLIST.xattr=	yes
 .endif
+PRINT_PLIST_AWK+=	{if ($$0 ~ /attr.so/) {$$0 = "$${PLIST.xattr}" $$0;}}
 
 MAKE_JOBS_SAFE=		no
 INSTALL_TARGET=		install install.info
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index f205e9e003e..98c65950933 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2017/05/11 13:49:06 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.37 2017/10/13 09:35:19 jperkin Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -36,6 +36,10 @@ ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zprof.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zpty.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zselect.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zutil.so
+share/doc/zsh/BUGS
+share/doc/zsh/FAQ
+share/doc/zsh/FEATURES
+share/doc/zsh/NEWS
 man/man1/zsh.1
 man/man1/zshall.1
 man/man1/zshbuiltins.1
@@ -53,10 +57,6 @@ man/man1/zshroadmap.1
 man/man1/zshtcpsys.1
 man/man1/zshzftpsys.1
 man/man1/zshzle.1
-share/doc/zsh/BUGS
-share/doc/zsh/FAQ
-share/doc/zsh/FEATURES
-share/doc/zsh/NEWS
 share/zsh/${PKGVERSION}/functions/VCS_INFO_adjust
 share/zsh/${PKGVERSION}/functions/VCS_INFO_bydir_detect
 share/zsh/${PKGVERSION}/functions/VCS_INFO_check_com
@@ -95,6 +95,7 @@ share/zsh/${PKGVERSION}/functions/VCS_INFO_quilt
 share/zsh/${PKGVERSION}/functions/VCS_INFO_realpath
 share/zsh/${PKGVERSION}/functions/VCS_INFO_reposub
 share/zsh/${PKGVERSION}/functions/VCS_INFO_set
+share/zsh/${PKGVERSION}/functions/VCS_INFO_set-patch-format
 share/zsh/${PKGVERSION}/functions/_SUSEconfig
 share/zsh/${PKGVERSION}/functions/_a2ps
 share/zsh/${PKGVERSION}/functions/_a2utils
@@ -137,6 +138,7 @@ share/zsh/${PKGVERSION}/functions/_auto-apt
 share/zsh/${PKGVERSION}/functions/_autocd
 share/zsh/${PKGVERSION}/functions/_awk
 share/zsh/${PKGVERSION}/functions/_axi-cache
+share/zsh/${PKGVERSION}/functions/_basename
 share/zsh/${PKGVERSION}/functions/_bash_completions
 share/zsh/${PKGVERSION}/functions/_baudrates
 share/zsh/${PKGVERSION}/functions/_baz
@@ -149,6 +151,7 @@ share/zsh/${PKGVERSION}/functions/_bindkey
 share/zsh/${PKGVERSION}/functions/_bison
 share/zsh/${PKGVERSION}/functions/_bittorrent
 share/zsh/${PKGVERSION}/functions/_bogofilter
+share/zsh/${PKGVERSION}/functions/_bpf_filters
 share/zsh/${PKGVERSION}/functions/_bpython
 share/zsh/${PKGVERSION}/functions/_brace_parameter
 share/zsh/${PKGVERSION}/functions/_brctl
@@ -183,6 +186,7 @@ share/zsh/${PKGVERSION}/functions/_chown
 share/zsh/${PKGVERSION}/functions/_chrt
 share/zsh/${PKGVERSION}/functions/_chsh
 share/zsh/${PKGVERSION}/functions/_clay
+share/zsh/${PKGVERSION}/functions/_cmdambivalent
 share/zsh/${PKGVERSION}/functions/_cmdstring
 share/zsh/${PKGVERSION}/functions/_cmp
 share/zsh/${PKGVERSION}/functions/_combination
@@ -237,6 +241,7 @@ share/zsh/${PKGVERSION}/functions/_dcop
 share/zsh/${PKGVERSION}/functions/_dcut
 share/zsh/${PKGVERSION}/functions/_dd
 share/zsh/${PKGVERSION}/functions/_deb_architectures
+share/zsh/${PKGVERSION}/functions/_deb_codenames
 share/zsh/${PKGVERSION}/functions/_deb_packages
 share/zsh/${PKGVERSION}/functions/_debbugs_bugnumber
 share/zsh/${PKGVERSION}/functions/_debchange
@@ -298,6 +303,7 @@ share/zsh/${PKGVERSION}/functions/_email_addresses
 share/zsh/${PKGVERSION}/functions/_emulate
 share/zsh/${PKGVERSION}/functions/_enable
 share/zsh/${PKGVERSION}/functions/_enscript
+share/zsh/${PKGVERSION}/functions/_entr
 share/zsh/${PKGVERSION}/functions/_env
 share/zsh/${PKGVERSION}/functions/_equal
 share/zsh/${PKGVERSION}/functions/_espeak
@@ -329,6 +335,7 @@ share/zsh/${PKGVERSION}/functions/_flex
 share/zsh/${PKGVERSION}/functions/_floppy
 share/zsh/${PKGVERSION}/functions/_flowadm
 share/zsh/${PKGVERSION}/functions/_fmadm
+share/zsh/${PKGVERSION}/functions/_fmt
 share/zsh/${PKGVERSION}/functions/_fortune
 share/zsh/${PKGVERSION}/functions/_freebsd-update
 share/zsh/${PKGVERSION}/functions/_fsh
@@ -456,6 +463,7 @@ share/zsh/${PKGVERSION}/functions/_look
 share/zsh/${PKGVERSION}/functions/_losetup
 share/zsh/${PKGVERSION}/functions/_lp
 share/zsh/${PKGVERSION}/functions/_ls
+share/zsh/${PKGVERSION}/functions/_lsblk
 share/zsh/${PKGVERSION}/functions/_lscfg
 share/zsh/${PKGVERSION}/functions/_lsdev
 share/zsh/${PKGVERSION}/functions/_lslv
@@ -526,6 +534,7 @@ share/zsh/${PKGVERSION}/functions/_netstat
 share/zsh/${PKGVERSION}/functions/_newsgroups
 share/zsh/${PKGVERSION}/functions/_next_label
 share/zsh/${PKGVERSION}/functions/_next_tags
+share/zsh/${PKGVERSION}/functions/_ngrep
 share/zsh/${PKGVERSION}/functions/_nice
 share/zsh/${PKGVERSION}/functions/_nkf
 share/zsh/${PKGVERSION}/functions/_nl
@@ -553,6 +562,7 @@ share/zsh/${PKGVERSION}/functions/_other_accounts
 share/zsh/${PKGVERSION}/functions/_pack
 share/zsh/${PKGVERSION}/functions/_parameter
 share/zsh/${PKGVERSION}/functions/_parameters
+share/zsh/${PKGVERSION}/functions/_paste
 share/zsh/${PKGVERSION}/functions/_patch
 share/zsh/${PKGVERSION}/functions/_patchutils
 share/zsh/${PKGVERSION}/functions/_path_commands
@@ -645,6 +655,7 @@ share/zsh/${PKGVERSION}/functions/_retrieve_mac_apps
 share/zsh/${PKGVERSION}/functions/_ri
 share/zsh/${PKGVERSION}/functions/_rlogin
 share/zsh/${PKGVERSION}/functions/_rm
+share/zsh/${PKGVERSION}/functions/_route
 share/zsh/${PKGVERSION}/functions/_rpm
 share/zsh/${PKGVERSION}/functions/_rpmbuild
 share/zsh/${PKGVERSION}/functions/_rrdtool
@@ -712,6 +723,8 @@ share/zsh/${PKGVERSION}/functions/_svcprop
 share/zsh/${PKGVERSION}/functions/_svcs
 share/zsh/${PKGVERSION}/functions/_svcs_fmri
 share/zsh/${PKGVERSION}/functions/_svn-buildpackage
+share/zsh/${PKGVERSION}/functions/_swaks
+share/zsh/${PKGVERSION}/functions/_swift
 share/zsh/${PKGVERSION}/functions/_sys_calls
 share/zsh/${PKGVERSION}/functions/_sysctl
 share/zsh/${PKGVERSION}/functions/_sysrc
@@ -762,6 +775,7 @@ share/zsh/${PKGVERSION}/functions/_twisted
 share/zsh/${PKGVERSION}/functions/_typeset
 share/zsh/${PKGVERSION}/functions/_ulimit
 share/zsh/${PKGVERSION}/functions/_uml
+share/zsh/${PKGVERSION}/functions/_umountable
 share/zsh/${PKGVERSION}/functions/_unace
 share/zsh/${PKGVERSION}/functions/_uname
 share/zsh/${PKGVERSION}/functions/_unexpand
@@ -797,6 +811,7 @@ share/zsh/${PKGVERSION}/functions/_vorbis
 share/zsh/${PKGVERSION}/functions/_vorbiscomment
 share/zsh/${PKGVERSION}/functions/_vserver
 share/zsh/${PKGVERSION}/functions/_vux
+share/zsh/${PKGVERSION}/functions/_w
 share/zsh/${PKGVERSION}/functions/_w3m
 share/zsh/${PKGVERSION}/functions/_wait
 share/zsh/${PKGVERSION}/functions/_wajig
@@ -810,6 +825,7 @@ share/zsh/${PKGVERSION}/functions/_webbrowser
 share/zsh/${PKGVERSION}/functions/_wget
 share/zsh/${PKGVERSION}/functions/_whereis
 share/zsh/${PKGVERSION}/functions/_which
+share/zsh/${PKGVERSION}/functions/_who
 share/zsh/${PKGVERSION}/functions/_whois
 share/zsh/${PKGVERSION}/functions/_widgets
 share/zsh/${PKGVERSION}/functions/_wiggle
@@ -960,6 +976,7 @@ share/zsh/${PKGVERSION}/functions/prompt_adam2_setup
 share/zsh/${PKGVERSION}/functions/prompt_bart_setup
 share/zsh/${PKGVERSION}/functions/prompt_bigfade_setup
 share/zsh/${PKGVERSION}/functions/prompt_clint_setup
+share/zsh/${PKGVERSION}/functions/prompt_default_setup
 share/zsh/${PKGVERSION}/functions/prompt_elite2_setup
 share/zsh/${PKGVERSION}/functions/prompt_elite_setup
 share/zsh/${PKGVERSION}/functions/prompt_fade_setup
@@ -968,6 +985,7 @@ share/zsh/${PKGVERSION}/functions/prompt_off_setup
 share/zsh/${PKGVERSION}/functions/prompt_oliver_setup
 share/zsh/${PKGVERSION}/functions/prompt_pws_setup
 share/zsh/${PKGVERSION}/functions/prompt_redhat_setup
+share/zsh/${PKGVERSION}/functions/prompt_restore_setup
 share/zsh/${PKGVERSION}/functions/prompt_special_chars
 share/zsh/${PKGVERSION}/functions/prompt_suse_setup
 share/zsh/${PKGVERSION}/functions/prompt_walters_setup
@@ -1191,3 +1209,4 @@ 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
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 274a608adb0..832d7ebe6c0 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59 2017/05/11 13:49:06 jperkin Exp $
+$NetBSD: distinfo,v 1.60 2017/10/13 09:35:19 jperkin Exp $
 
-SHA1 (zsh-5.3.1.tar.xz) = ec2a98c080f213c1c6c465c0c64662b5eae6818f
-RMD160 (zsh-5.3.1.tar.xz) = 6599472c943d6ea5b8137dd49df80cb02a121e2c
-SHA512 (zsh-5.3.1.tar.xz) = 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
-Size (zsh-5.3.1.tar.xz) = 2928832 bytes
+SHA1 (zsh-5.4.2.tar.xz) = f6f8e699b956c8881444e597b1fc5af41fef456b
+RMD160 (zsh-5.4.2.tar.xz) = 9cc8888760c06757332daa6dfbba4c5235474b5d
+SHA512 (zsh-5.4.2.tar.xz) = 7825e4101905b6bfbd14f00b2f94f512ced5b9820a4f7b24409d266ad2c3c25144edf6aa2629317394055c51312ba57bb01e20c26e2ced1aeb0be0ff1a4d3fbb
+Size (zsh-5.4.2.tar.xz) = 2983492 bytes
 SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
 SHA1 (patch-configure.ac) = 87ae3604e09948cd7b360f08031ef9c3f91f0aae
diff --git a/shells/zsh/options.mk b/shells/zsh/options.mk
index 06d9781939e..fb9ebe54272 100644
--- a/shells/zsh/options.mk
+++ b/shells/zsh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/05/11 13:54:27 jperkin Exp $
+# $NetBSD: options.mk,v 1.2 2017/10/13 09:35:19 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.zsh
 PKG_SUPPORTED_OPTIONS=		static
@@ -8,7 +8,14 @@ PKG_SUPPORTED_OPTIONS=		static
 PLIST_VARS+=		dynamic
 .if !empty(PKG_OPTIONS:Mstatic)
 CONFIGURE_ARGS+=	--disable-dynamic
+.  if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS"
 LDFLAGS+=		-static
+.  endif
 .else
 PLIST.dynamic=		yes
 .endif
+PRINT_PLIST_AWK+=	{if ($$0 ~ /\.so$$/) {$$0 = "$${PLIST.dynamic}" $$0;}}
+PRINT_PLIST_AWK+=	{if ($$0 ~ /functions\/tcp/) {$$0 = "$${PLIST.dynamic}" $$0;}}
+PRINT_PLIST_AWK+=	{if ($$0 ~ /functions\/zf/) {$$0 = "$${PLIST.dynamic}" $$0;}}
+PRINT_PLIST_AWK+=	{if ($$0 ~ /functions\/zsh-newuser/) {$$0 = "$${PLIST.dynamic}" $$0;}}
+PRINT_PLIST_AWK+=	{if ($$0 ~ /scripts\/newuser/) {$$0 = "$${PLIST.dynamic}" $$0;}}