Update to 4.3.15.

Add a diff to fix pgrep completion (from Antti Harri, thanks)

ok ajacoutot@

shells/zsh/Makefile

@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.63 2011/09/27 13:30:24 pea Exp $
+# $OpenBSD: Makefile,v 1.64 2011/12/21 15:01:56 pea Exp $
 
 COMMENT=	Z shell, Bourne shell-compatible
 
-V=		4.3.12
+V=		4.3.15
 DISTNAME=	zsh-$V
 CATEGORIES=	shells
 
-REVISION=	0
-
 MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 
 HOMEPAGE=	http://www.zsh.org/

shells/zsh/distinfo

@@ -1,5 +1,5 @@
-MD5 (zsh-4.3.12.tar.gz) = Rq576XV3m5sOok6LMEeaiw==
-RMD160 (zsh-4.3.12.tar.gz) = DYrGWreGEkOAxfAlkIwN54VI3/s=
-SHA1 (zsh-4.3.12.tar.gz) = cselKQX4IUM9hfvJM0XTEVsVaB0=
-SHA256 (zsh-4.3.12.tar.gz) = de4Ddci+cCXw6MwNFxmGbRzoNB74GSdkvamk6xVqkC0=
-SIZE (zsh-4.3.12.tar.gz) = 3705639
+MD5 (zsh-4.3.15.tar.gz) = suLQpDGTW0CO2OpIIm+ZYg==
+RMD160 (zsh-4.3.15.tar.gz) = kn1nD7BHumSLzIUY1eKf6VZa2KM=
+SHA1 (zsh-4.3.15.tar.gz) = 5IXxvFI3db2nqYN8hRObteHwlpk=
+SHA256 (zsh-4.3.15.tar.gz) = ATYZuMW2EQNDjS0+fB2hIW6QpyRS1Tq72Y3vJtUoFDA=
+SIZE (zsh-4.3.15.tar.gz) = 3742473

shells/zsh/patches/patch-Completion_Unix_Command__pgrep

@@ -0,0 +1,42 @@
+$OpenBSD: patch-Completion_Unix_Command__pgrep,v 1.1 2011/12/21 15:01:56 pea Exp $
+--- Completion/Unix/Command/_pgrep.orig	Thu Dec 15 11:46:32 2011
++++ Completion/Unix/Command/_pgrep	Thu Dec 15 11:48:21 2011
+@@ -45,7 +45,7 @@ case $state in
+ 
+     local -a used sid
+     used=(${(s:,:)IPREFIX})
+-    sid=(${(uon)$(ps -A o sid=)})
++    sid=(${(uon)$(ps -ax -o pid)})
+ 
+     _wanted sid expl 'session id' compadd -S ',' -q -F used $sid
+     ;;
+@@ -55,7 +55,7 @@ case $state in
+ 
+     local -a used ppid
+     used=(${(s:,:)IPREFIX})
+-    ppid=(${(uon)$(ps -A o ppid=)})
++    ppid=(${(uon)$(ps -ax -o ppid)})
+ 
+     _wanted ppid expl 'parent process id' compadd -S ',' -q -F used $ppid
+     ;;
+@@ -65,7 +65,7 @@ case $state in
+ 
+     local -a used pgid
+     used=(${(s:,:)IPREFIX})
+-    pgid=(${(uon)$(ps -A o pgid=)})
++    pgid=(${(uon)$(ps -ax -o pgid)})
+ 
+     _wanted pgid expl 'process group id' compadd -S ',' -q -F used $pgid
+     ;;
+@@ -78,9 +78,9 @@ case $state in
+     fi
+     if (( ${+opt_args[-f]} ))
+     then
+-      _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps -A o cmd=)"}}
++      _wanted pname expl $ispat'process command line' compadd ${(u)${(f)"$(ps -ax -o command)"}}
+     else
+-      _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -A co cmd=)"}}
++      _wanted pname expl $ispat'process name' compadd ${(u)${(f)"$(ps -ax -co command)"}}
+     fi
+     ;;
+   

shells/zsh/patches/patch-Completion_compinit

@@ -1,12 +0,0 @@
-$OpenBSD: patch-Completion_compinit,v 1.1 2011/09/27 13:30:24 pea Exp $
---- Completion/compinit.orig	Tue Sep 27 14:47:45 2011
-+++ Completion/compinit	Tue Sep 27 14:48:34 2011
-@@ -161,7 +161,7 @@ _comp_options=(
- # and don't get confused by user's ZERR trap handlers.
- 
- typeset -g _comp_setup='local -A _comp_caller_options;
--             _comp_caller_options=(${(kv)options});
-+             _comp_caller_options=(${(kv)options[@]});
-              setopt localoptions localtraps ${_comp_options[@]};
-              local IFS=$'\'\ \\t\\r\\n\\0\''
-              exec </dev/null;

shells/zsh/patches/patch-Test_D04parameter_ztst

@@ -1,34 +0,0 @@
-$OpenBSD: patch-Test_D04parameter_ztst,v 1.1 2011/06/22 11:41:35 pea Exp $
---- Test/D04parameter.ztst.orig	Mon May 23 14:43:54 2011
-+++ Test/D04parameter.ztst	Mon Jun  6 14:19:24 2011
-@@ -300,23 +300,16 @@
- 
-   foo='\u65\123'
-   print -r ${(g:o:)foo}
--  foo='\u65\0123'
-+  foo='\u65\0123^X\C-x'
-   print -r ${(g::)foo}
--  foo='\u65^X'
--  print -r ${(V)${(g:c:)foo}}
--  foo='\u65\C-x\M-a'
--  print -r ${(V)${(g:e:)foo}}
--  foo='\u65\123\C-x'
--  print -r ${(V)${(g:eo:)foo}}
--  foo=('\u65' '\0123' '^X\M-a')
--  print -r ${(V)${(g:e:)foo}}
-+  foo='^X'
-+  bar='\C-\130'
-+  [[ ${(g:c:)foo} == ${(g:oe:)bar} ]]
-+  echo $?
- 0:${(g)...}
- >eS
-->eS
-->e^X
-->e^X\M-a
-->eS^X
-->e S ^X\M-a
-+>eS^X\C-x
-+>0
- 
-   foo='I'\''m nearly out of my mind with tedium'
-   bar=foo

shells/zsh/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.33 2011/09/27 13:30:24 pea Exp $
+@comment $OpenBSD: PLIST,v 1.34 2011/12/21 15:01:56 pea Exp $
 @pkgpath shells/zsh,-main
 @shell bin/zsh
 %%SHARED%%
@@ -34,6 +34,7 @@ share/zsh/${V}/functions/_aap
 share/zsh/${V}/functions/_acpi
 share/zsh/${V}/functions/_acpitool
 share/zsh/${V}/functions/_acroread
+share/zsh/${V}/functions/_adb
 share/zsh/${V}/functions/_alias
 share/zsh/${V}/functions/_aliases
 share/zsh/${V}/functions/_all_labels
@@ -119,6 +120,7 @@ share/zsh/${V}/functions/_cowsay
 share/zsh/${V}/functions/_cp
 share/zsh/${V}/functions/_cpio
 share/zsh/${V}/functions/_cplay
+share/zsh/${V}/functions/_cryptsetup
 share/zsh/${V}/functions/_cssh
 share/zsh/${V}/functions/_csup
 share/zsh/${V}/functions/_ctags_tags
@@ -312,6 +314,7 @@ share/zsh/${V}/functions/_links
 share/zsh/${V}/functions/_lintian
 share/zsh/${V}/functions/_list
 share/zsh/${V}/functions/_list_files
+share/zsh/${V}/functions/_ln
 share/zsh/${V}/functions/_loadkeys
 share/zsh/${V}/functions/_locales
 share/zsh/${V}/functions/_locate
@@ -384,7 +387,9 @@ share/zsh/${V}/functions/_newsgroups
 share/zsh/${V}/functions/_next_label
 share/zsh/${V}/functions/_next_tags
 share/zsh/${V}/functions/_nice
+share/zsh/${V}/functions/_nm
 share/zsh/${V}/functions/_nmap
+share/zsh/${V}/functions/_nmcli
 share/zsh/${V}/functions/_normal
 share/zsh/${V}/functions/_nothing
 share/zsh/${V}/functions/_notmuch
@@ -418,6 +423,7 @@ share/zsh/${V}/functions/_perldoc
 share/zsh/${V}/functions/_pfctl
 share/zsh/${V}/functions/_pfexec
 share/zsh/${V}/functions/_pgrep
+@comment share/zsh/${V}/functions/_pgrep.orig
 share/zsh/${V}/functions/_php
 share/zsh/${V}/functions/_physical_volumes
 share/zsh/${V}/functions/_pick_variant
@@ -491,6 +497,7 @@ share/zsh/${V}/functions/_samba
 share/zsh/${V}/functions/_savecore
 share/zsh/${V}/functions/_sccs
 share/zsh/${V}/functions/_sched
+share/zsh/${V}/functions/_schedtool
 share/zsh/${V}/functions/_schroot
 share/zsh/${V}/functions/_screen
 share/zsh/${V}/functions/_sed
@@ -538,6 +545,7 @@ share/zsh/${V}/functions/_svcs
 share/zsh/${V}/functions/_svcs_fmri
 share/zsh/${V}/functions/_svn-buildpackage
 share/zsh/${V}/functions/_sysctl
+share/zsh/${V}/functions/_systemctl
 share/zsh/${V}/functions/_tags
 share/zsh/${V}/functions/_tar
 share/zsh/${V}/functions/_tar_archive
@@ -568,8 +576,10 @@ share/zsh/${V}/functions/_tpb
 share/zsh/${V}/functions/_tpconfig
 share/zsh/${V}/functions/_tracepath
 share/zsh/${V}/functions/_trap
+share/zsh/${V}/functions/_tree
 share/zsh/${V}/functions/_ttyctl
 share/zsh/${V}/functions/_tune2fs
+share/zsh/${V}/functions/_twidge
 share/zsh/${V}/functions/_twisted
 share/zsh/${V}/functions/_typeset
 share/zsh/${V}/functions/_ulimit
@@ -710,7 +720,6 @@ share/zsh/${V}/functions/colors
 share/zsh/${V}/functions/compaudit
 share/zsh/${V}/functions/compdump
 share/zsh/${V}/functions/compinit
-@comment share/zsh/${V}/functions/compinit.orig
 share/zsh/${V}/functions/compinstall
 share/zsh/${V}/functions/copy-earlier-word
 share/zsh/${V}/functions/cycle-completion-positions
@@ -738,6 +747,7 @@ share/zsh/${V}/functions/match-word-context
 share/zsh/${V}/functions/match-words-by-style
 share/zsh/${V}/functions/mere
 share/zsh/${V}/functions/modify-current-argument
+share/zsh/${V}/functions/move-line-in-buffer
 share/zsh/${V}/functions/narrow-to-region
 share/zsh/${V}/functions/narrow-to-region-invisible
 share/zsh/${V}/functions/nslookup
@@ -803,6 +813,7 @@ share/zsh/${V}/functions/zkbd
 share/zsh/${V}/functions/zmathfuncdef
 share/zsh/${V}/functions/zmv
 share/zsh/${V}/functions/zrecompile
+share/zsh/${V}/functions/zsh-mime-contexts
 share/zsh/${V}/functions/zsh-mime-handler
 share/zsh/${V}/functions/zsh-mime-setup
 share/zsh/${V}/functions/zsh_directory_name_cdr