Hi, Little diff to update zsh to it's latest version (4.3.12). Tested on @amd64 and @sparc64. Regards,
-- Pierre-Emmanuel André <pea at raveland.org> GPG key: 0x7AE329DC
Index: Makefile =================================================================== RCS file: /cvs/ports/shells/zsh/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- Makefile 4 Mar 2011 10:08:59 -0000 1.61 +++ Makefile 6 Jun 2011 12:47:00 -0000 @@ -2,11 +2,9 @@ COMMENT= Z shell, Bourne shell-compatible -V= 4.3.11 +V= 4.3.12 DISTNAME= zsh-$V CATEGORIES= shells - -REVISION= 2 MAINTAINER= Pierre-Emmanuel Andre <[email protected]> Index: distinfo =================================================================== RCS file: /cvs/ports/shells/zsh/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo 27 Dec 2010 14:04:32 -0000 1.13 +++ distinfo 6 Jun 2011 12:47:00 -0000 @@ -1,5 +1,5 @@ -MD5 (zsh-4.3.11.tar.gz) = En4qO5EA1vL922oyzUrKQA== -RMD160 (zsh-4.3.11.tar.gz) = /ymfQcpTFXeRiI6lqwBjFaFwPDc= -SHA1 (zsh-4.3.11.tar.gz) = Br8gejMPXnPd/N8u1KzLa5oqLRo= -SHA256 (zsh-4.3.11.tar.gz) = YqWlBBOs4/98wBHBXVHRRrabk3UuurCVkl34pPNgV8g= -SIZE (zsh-4.3.11.tar.gz) = 3645054 +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 Index: patches/patch-Src_subst_c =================================================================== RCS file: patches/patch-Src_subst_c diff -N patches/patch-Src_subst_c --- patches/patch-Src_subst_c 4 Mar 2011 10:08:59 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-Src_subst_c,v 1.1 2011/03/04 10:08:59 pea Exp $ - -Fix for ${foo:0:} crash - ---- Src/subst.c.orig Thu Dec 16 10:26:50 2010 -+++ Src/subst.c Thu Mar 3 15:14:28 2011 -@@ -2814,12 +2814,14 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, - zerr("invalid length: %s", check_offset); - return NULL; - } -- length = mathevali(check_offset); -- if (errflag) -- return NULL; -- if (length < (zlong)0) { -- zerr("invalid length: %s", check_offset); -- return NULL; -+ if (check_offset) { -+ length = mathevali(check_offset); -+ if (errflag) -+ return NULL; -+ if (length < (zlong)0) { -+ zerr("invalid length: %s", check_offset); -+ return NULL; -+ } - } - } - if (horrible_offset_hack) { Index: patches/patch-Src_text_c =================================================================== RCS file: patches/patch-Src_text_c diff -N patches/patch-Src_text_c --- patches/patch-Src_text_c 17 Jan 2011 16:19:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-Src_text_c,v 1.1 2011/01/17 16:19:43 pea Exp $ - -Fix patterns crashes: http://www.zsh.org/mla/workers/2011/msg00027.html - ---- Src/text.c.orig Tue Sep 14 16:46:26 2010 -+++ Src/text.c Mon Jan 17 16:58:41 2011 -@@ -785,8 +785,7 @@ gettext2(Estate state) - taddstr(" "); - taddstr(ecgetstr(state, EC_NODUP, NULL)); - if (ctype == COND_STREQ || -- ctype == COND_STRNEQ || -- ctype == COND_REGEX) -+ ctype == COND_STRNEQ) - state->pc++; - } else { - /* Unary test: `-f foo' etc. */ Index: patches/patch-Test_C02cond_ztst =================================================================== RCS file: patches/patch-Test_C02cond_ztst diff -N patches/patch-Test_C02cond_ztst --- patches/patch-Test_C02cond_ztst 17 Jan 2011 16:19:43 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -$OpenBSD: patch-Test_C02cond_ztst,v 1.1 2011/01/17 16:19:43 pea Exp $ - -Fix patterns crashes: http://www.zsh.org/mla/workers/2011/msg00027.html - ---- Test/C02cond.ztst.orig Mon Oct 11 10:35:39 2010 -+++ Test/C02cond.ztst Mon Jan 17 16:58:41 2011 -@@ -306,6 +306,21 @@ F:Failures in these cases do not indicate a problem in - 2:Error message for unknown infix condition - ?(eval):1: unknown condition: -fail - -+ crashme() { -+ if [[ $1 =~ ^http:* ]] -+ then -+ url=${1#*=} -+ fi -+ } -+ which crashme -+0:Regression test for examining code with regular expression match -+>crashme () { -+> if [[ $1 =~ ^http:* ]] -+> then -+> url=${1#*=} -+> fi -+>} -+ - %clean - # This works around a bug in rm -f in some versions of Cygwin - chmod 644 unmodish Index: patches/patch-Test_D04parameter_ztst =================================================================== RCS file: patches/patch-Test_D04parameter_ztst diff -N patches/patch-Test_D04parameter_ztst --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Test_D04parameter_ztst 6 Jun 2011 12:47:00 -0000 @@ -0,0 +1,34 @@ +$OpenBSD$ +--- 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.31 diff -u -p -r1.31 PLIST --- pkg/PLIST 3 Feb 2011 08:56:14 -0000 1.31 +++ pkg/PLIST 6 Jun 2011 12:47:00 -0000 @@ -24,6 +24,8 @@ share/zsh/ share/zsh/${V}/ share/zsh/${V}/functions/ +share/zsh/${V}/functions/VCS_INFO_detect_fossil +share/zsh/${V}/functions/VCS_INFO_get_data_fossil share/zsh/${V}/functions/VCS_INFO_hook share/zsh/${V}/functions/VCS_INFO_quilt share/zsh/${V}/functions/_a2ps @@ -56,6 +58,7 @@ share/zsh/${V}/functions/_arp share/zsh/${V}/functions/_arping share/zsh/${V}/functions/_arrays share/zsh/${V}/functions/_assign +share/zsh/${V}/functions/_at share/zsh/${V}/functions/_attr share/zsh/${V}/functions/_auto-apt share/zsh/${V}/functions/_autocd @@ -241,6 +244,7 @@ share/zsh/${V}/functions/_gnome-gv share/zsh/${V}/functions/_gnu_generic share/zsh/${V}/functions/_gnupod share/zsh/${V}/functions/_gnutls +share/zsh/${V}/functions/_go share/zsh/${V}/functions/_gpg share/zsh/${V}/functions/_gphoto2 share/zsh/${V}/functions/_gprof @@ -273,6 +277,7 @@ share/zsh/${V}/functions/_imagemagick share/zsh/${V}/functions/_in_vared share/zsh/${V}/functions/_inetadm share/zsh/${V}/functions/_init_d +share/zsh/${V}/functions/_initctl share/zsh/${V}/functions/_invoke-rc.d share/zsh/${V}/functions/_ionice share/zsh/${V}/functions/_ip @@ -335,6 +340,7 @@ share/zsh/${V}/functions/_make-kpkg share/zsh/${V}/functions/_man share/zsh/${V}/functions/_match share/zsh/${V}/functions/_math +share/zsh/${V}/functions/_matlab share/zsh/${V}/functions/_md5sum share/zsh/${V}/functions/_mdadm share/zsh/${V}/functions/_members @@ -381,8 +387,11 @@ share/zsh/${V}/functions/_nice share/zsh/${V}/functions/_nmap share/zsh/${V}/functions/_normal share/zsh/${V}/functions/_nothing +share/zsh/${V}/functions/_notmuch +share/zsh/${V}/functions/_npm share/zsh/${V}/functions/_nslookup share/zsh/${V}/functions/_object_classes +share/zsh/${V}/functions/_okular share/zsh/${V}/functions/_oldlist share/zsh/${V}/functions/_open share/zsh/${V}/functions/_options @@ -400,6 +409,7 @@ share/zsh/${V}/functions/_pax share/zsh/${V}/functions/_pbm share/zsh/${V}/functions/_pbuilder share/zsh/${V}/functions/_pdf +share/zsh/${V}/functions/_pdftk share/zsh/${V}/functions/_perforce share/zsh/${V}/functions/_perl share/zsh/${V}/functions/_perl_basepods @@ -407,6 +417,7 @@ share/zsh/${V}/functions/_perl_modules share/zsh/${V}/functions/_perldoc share/zsh/${V}/functions/_pfctl share/zsh/${V}/functions/_pfexec +share/zsh/${V}/functions/_pgrep share/zsh/${V}/functions/_php share/zsh/${V}/functions/_physical_volumes share/zsh/${V}/functions/_pick_variant @@ -499,6 +510,7 @@ share/zsh/${V}/functions/_sisu share/zsh/${V}/functions/_slrn share/zsh/${V}/functions/_smit share/zsh/${V}/functions/_socket +share/zsh/${V}/functions/_sockstat share/zsh/${V}/functions/_softwareupdate share/zsh/${V}/functions/_sort share/zsh/${V}/functions/_source @@ -567,6 +579,7 @@ share/zsh/${V}/functions/_uname share/zsh/${V}/functions/_unexpand share/zsh/${V}/functions/_unhash share/zsh/${V}/functions/_uniq +share/zsh/${V}/functions/_unison share/zsh/${V}/functions/_units share/zsh/${V}/functions/_unsetopt share/zsh/${V}/functions/_update-alternatives @@ -606,6 +619,7 @@ share/zsh/${V}/functions/_whereis share/zsh/${V}/functions/_which share/zsh/${V}/functions/_whois share/zsh/${V}/functions/_wiggle +share/zsh/${V}/functions/_wpa_cli share/zsh/${V}/functions/_x_arguments share/zsh/${V}/functions/_x_borderwidth share/zsh/${V}/functions/_x_color @@ -633,6 +647,7 @@ share/zsh/${V}/functions/_xloadimage share/zsh/${V}/functions/_xmlsoft share/zsh/${V}/functions/_xmms2 share/zsh/${V}/functions/_xmodmap +share/zsh/${V}/functions/_xournal share/zsh/${V}/functions/_xpdf share/zsh/${V}/functions/_xrandr share/zsh/${V}/functions/_xscreensaver @@ -647,6 +662,7 @@ share/zsh/${V}/functions/_yast share/zsh/${V}/functions/_yodl share/zsh/${V}/functions/_yp share/zsh/${V}/functions/_yum +share/zsh/${V}/functions/_zargs share/zsh/${V}/functions/_zattr share/zsh/${V}/functions/_zcalc_line share/zsh/${V}/functions/_zcat @@ -759,6 +775,7 @@ share/zsh/${V}/functions/run-help-sudo share/zsh/${V}/functions/run-help-svk share/zsh/${V}/functions/run-help-svn share/zsh/${V}/functions/select-word-style +share/zsh/${V}/functions/send-invisible share/zsh/${V}/functions/smart-insert-last-word share/zsh/${V}/functions/split-shell-arguments share/zsh/${V}/functions/sticky-note @@ -770,6 +787,8 @@ share/zsh/${V}/functions/up-case-word-ma share/zsh/${V}/functions/up-line-or-beginning-search share/zsh/${V}/functions/url-quote-magic share/zsh/${V}/functions/vcs_info +share/zsh/${V}/functions/vcs_info_hookadd +share/zsh/${V}/functions/vcs_info_hookdel share/zsh/${V}/functions/vcs_info_lastmsg share/zsh/${V}/functions/vcs_info_printsys share/zsh/${V}/functions/vcs_info_setsys @@ -785,6 +804,7 @@ share/zsh/${V}/functions/zmv share/zsh/${V}/functions/zrecompile share/zsh/${V}/functions/zsh-mime-handler share/zsh/${V}/functions/zsh-mime-setup +share/zsh/${V}/functions/zsh_directory_name_cdr share/zsh/${V}/functions/zstyle+ share/zsh/${V}/functions/ztodo share/zsh/${V}/scripts/
