Hi,
Little diff to update zsh to it's latest version. It
also includes a diff from Antti Harri to fix pgrep completion.
Tested on @amd64.
Comments, OK ?
Regards,
--
Pierre-Emmanuel André <pea at raveland.org>
GPG key: 0x7AE329DC
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/zsh/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile 27 Sep 2011 13:30:24 -0000 1.63
+++ Makefile 15 Dec 2011 14:28:07 -0000
@@ -2,11 +2,9 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 4.3.12
+V= 4.3.14
DISTNAME= zsh-$V
CATEGORIES= shells
-
-REVISION= 0
MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/shells/zsh/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 22 Jun 2011 11:41:35 -0000 1.14
+++ distinfo 15 Dec 2011 14:28:07 -0000
@@ -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.14.tar.gz) = goac9FQc5RTKeXsadfIdBg==
+RMD160 (zsh-4.3.14.tar.gz) = EcJ2oQjwWZiQCwDDy4le3ApiQ9s=
+SHA1 (zsh-4.3.14.tar.gz) = /9KewP41O79ZHcP4Xz1LNt/opQ8=
+SHA256 (zsh-4.3.14.tar.gz) = dF5vTyHZZOA2Gfw2H7EKWMqSL/xtckh00pMOs/nXkGA=
+SIZE (zsh-4.3.14.tar.gz) = 3738473
Index: patches/patch-Completion_Unix_Command__pgrep
===================================================================
RCS file: patches/patch-Completion_Unix_Command__pgrep
diff -N patches/patch-Completion_Unix_Command__pgrep
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Completion_Unix_Command__pgrep 15 Dec 2011 14:28:07
-0000
@@ -0,0 +1,42 @@
+$OpenBSD$
+--- 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
+ ;;
+
Index: patches/patch-Completion_compinit
===================================================================
RCS file: patches/patch-Completion_compinit
diff -N patches/patch-Completion_compinit
--- patches/patch-Completion_compinit 27 Sep 2011 13:30:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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;
Index: patches/patch-Test_A04redirect_ztst
===================================================================
RCS file: patches/patch-Test_A04redirect_ztst
diff -N patches/patch-Test_A04redirect_ztst
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Test_A04redirect_ztst 15 Dec 2011 14:28:07 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- Test/A04redirect.ztst.orig Thu Dec 8 16:22:29 2011
++++ Test/A04redirect.ztst Thu Dec 8 16:23:42 2011
+@@ -152,10 +152,11 @@
+ >hello
+ >goodbye
+
+- (exec 3<&-
++ ({ exec 3<&- } 2>/dev/null
++ exec 3<&-
+ read foo <&-)
+ 1:'<&-' redirection
+-*?\(eval\):1: failed to close file descriptor 3:*
++*?\(eval\):*: failed to close file descriptor 3:*
+
+ print foo >&-
+ 0:'>&-' redirection
Index: patches/patch-Test_D04parameter_ztst
===================================================================
RCS file: patches/patch-Test_D04parameter_ztst
diff -N patches/patch-Test_D04parameter_ztst
--- patches/patch-Test_D04parameter_ztst 22 Jun 2011 11:41:35 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
retrieving revision 1.33
diff -u -p -r1.33 PLIST
--- pkg/PLIST 27 Sep 2011 13:30:24 -0000 1.33
+++ pkg/PLIST 15 Dec 2011 14:28:07 -0000
@@ -2,7 +2,7 @@
@pkgpath shells/zsh,-main
@shell bin/zsh
%%SHARED%%
-@bin bin/zsh-${V}
+@bin bin/${FULLPKGNAME}
@info info/zsh.info
@man man/man1/zsh.1
@man man/man1/zshall.1
@@ -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-cont
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
