Update to zsh 5.3, mostly removing upstreamed patches. A regex test in D07 fails, but upstream believes[1] this is due to OpenBSD's locale support (or lack thereof). Been running for about a day.
1: http://zsh.org/mla/workers/2016/msg02607.html - Matthew Martin Index: Makefile =================================================================== RCS file: /cvs/ports/shells/zsh/Makefile,v retrieving revision 1.82 diff -u -p -r1.82 Makefile --- Makefile 9 Apr 2016 20:14:49 -0000 1.82 +++ Makefile 13 Dec 2016 02:40:43 -0000 @@ -2,10 +2,9 @@ COMMENT= Z shell, Bourne shell-compatible -V= 5.2 +V= 5.3 DISTNAME= zsh-$V CATEGORIES= shells -REVISION= 3 MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org> Index: distinfo =================================================================== RCS file: /cvs/ports/shells/zsh/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo 17 Dec 2015 18:31:21 -0000 1.22 +++ distinfo 13 Dec 2016 02:40:43 -0000 @@ -1,2 +1,2 @@ -SHA256 (zsh-5.2.tar.gz) = +pJMU0xmM8IZ3P/c19qTmdq/tjNH+Izm3c1btEEhWTc= -SIZE (zsh-5.2.tar.gz) = 4245682 +SHA256 (zsh-5.3.tar.gz) = HaJz+pYEGzle6fYo0U8q/wj5pi6YQjqZAhji6gN7mm0= +SIZE (zsh-5.3.tar.gz) = 4403492 Index: patches/patch-Completion_Unix_Command__elfdump =================================================================== RCS file: patches/patch-Completion_Unix_Command__elfdump diff -N patches/patch-Completion_Unix_Command__elfdump --- patches/patch-Completion_Unix_Command__elfdump 21 Dec 2015 19:13:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-Completion_Unix_Command__elfdump,v 1.1 2015/12/21 19:13:17 jasper Exp $ - -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001 -From: Matthew Martin <phy1...@gmail.com> -Date: Fri, 11 Dec 2015 11:51:09 +0100 -Subject: [PATCH] 37383: add completion type for object files - ---- Completion/Unix/Command/_elfdump.orig Sun May 3 19:57:18 2015 -+++ Completion/Unix/Command/_elfdump Mon Dec 21 09:54:57 2015 -@@ -2,10 +2,6 @@ - - local -a args - --_elf_file() { -- [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]] --} -- - args=( - '-c[dump section header information]' - '-d[dump .dynamic section]' -@@ -38,7 +34,7 @@ case $OSTYPE in - '-l[show long section names without truncation]' - '-O[specify osabi to apply]:osabi' - '-P[use alternative section header]' -- "*:elf file:_files -g '*(-.e:_elf_file:)'" -+ "*:elf file:_object_files" - ) - ;; - freebsd*) args+=( '-a[dump all information]' ) ;; Index: patches/patch-Completion_Unix_Command__nm =================================================================== RCS file: patches/patch-Completion_Unix_Command__nm diff -N patches/patch-Completion_Unix_Command__nm --- patches/patch-Completion_Unix_Command__nm 21 Dec 2015 19:13:17 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-Completion_Unix_Command__nm,v 1.3 2015/12/21 19:13:17 jasper Exp $ - -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001 -From: Matthew Martin <phy1...@gmail.com> -Date: Fri, 11 Dec 2015 11:51:09 +0100 -Subject: [PATCH] 37383: add completion type for object files - ---- Completion/Unix/Command/_nm.orig Sat Oct 24 19:06:08 2015 -+++ Completion/Unix/Command/_nm Mon Dec 21 10:04:02 2015 -@@ -2,11 +2,7 @@ - - local args files variant - --_nm_object_file() { -- [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]] --} -- --files="*:object file:_files -g '*(-.e,_nm_object_file,)'" -+files="*:object file:_object_files" - args=( - '(-A -o --print-file-name)'{-A,-o,--print-file-name}'[print name of input file on each line]' - '(--demangle)-C[decode symbol names]' Index: patches/patch-Completion_Unix_Command__objdump =================================================================== RCS file: patches/patch-Completion_Unix_Command__objdump diff -N patches/patch-Completion_Unix_Command__objdump --- patches/patch-Completion_Unix_Command__objdump 21 Dec 2015 19:13:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-Completion_Unix_Command__objdump,v 1.1 2015/12/21 19:13:17 jasper Exp $ - -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001 -From: Matthew Martin <phy1...@gmail.com> -Date: Fri, 11 Dec 2015 11:51:09 +0100 -Subject: [PATCH] 37383: add completion type for object files - ---- Completion/Unix/Command/_objdump.orig Sat Oct 24 19:06:08 2015 -+++ Completion/Unix/Command/_objdump Mon Dec 21 09:54:57 2015 -@@ -1,8 +1,3 @@ - #compdef objdump - --# borrowed from _nm_object_file --_objdump_object_file() { -- [[ -x $REPLY || $REPLY = *.([ao]|so|elf) ]] --} -- --_arguments -- '*:object file:_files -g "*(-.e,_objdump_object_file,)"' -+_arguments -- '*:object file:_object_files' Index: patches/patch-Completion_Unix_Command__readelf =================================================================== RCS file: patches/patch-Completion_Unix_Command__readelf diff -N patches/patch-Completion_Unix_Command__readelf --- patches/patch-Completion_Unix_Command__readelf 21 Dec 2015 19:13:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-Completion_Unix_Command__readelf,v 1.1 2015/12/21 19:13:17 jasper Exp $ - -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001 -From: Matthew Martin <phy1...@gmail.com> -Date: Fri, 11 Dec 2015 11:51:09 +0100 -Subject: [PATCH] 37383: add completion type for object files - ---- Completion/Unix/Command/_readelf.orig Sun May 3 19:57:18 2015 -+++ Completion/Unix/Command/_readelf Mon Dec 21 09:54:57 2015 -@@ -2,10 +2,6 @@ - - local variant args sections - --_elf_file() { -- [[ -x $REPLY || $REPLY = (core*|*.([ao]|so|elf)) ]] --} -- - sections=( .bss .data .dynamic .dynsym .got .interp .shstrtab .symtab .text ) - _pick_variant -r variant elftoolchain=elftoolchain elfutils=elfutils binutils --version - -@@ -29,7 +25,7 @@ args=( - '(-W --wide)'{-W,--wide}'[allow output width to exceed 80 characters]' - '(- *)'{-H,--help}'[display help information]' - '(- *)'{-v,--version}'[display version information]' -- "*:elf file:_files -g '*(-.e:_elf_file:)'" -+ "*:elf file:_object_files" - ) - - case $variant in Index: patches/patch-Completion_Unix_Type__object_files =================================================================== RCS file: patches/patch-Completion_Unix_Type__object_files diff -N patches/patch-Completion_Unix_Type__object_files --- patches/patch-Completion_Unix_Type__object_files 21 Dec 2015 19:13:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-Completion_Unix_Type__object_files,v 1.1 2015/12/21 19:13:17 jasper Exp $ - -From 3272bdce987a3e5d5448688529ccb8290e148a67 Mon Sep 17 00:00:00 2001 -From: Matthew Martin <phy1...@gmail.com> -Date: Fri, 11 Dec 2015 11:51:09 +0100 -Subject: [PATCH] 37383: add completion type for object files - ---- Completion/Unix/Type/_object_files.orig Mon Dec 21 09:54:57 2015 -+++ Completion/Unix/Type/_object_files Mon Dec 21 09:54:57 2015 -@@ -0,0 +1,11 @@ -+#autoload -+ -+local expl -+ -+_description files expl 'object file' -+ -+__object_file() { -+ [[ -x $REPLY || $REPLY = *.([ao]|so|elf)(.<->)## || $REPLY = (core*|*.core) ]] -+} -+ -+_files -g '*(-.e,__object_file,)' Index: patches/patch-Doc_zsh_texi =================================================================== RCS file: /cvs/ports/shells/zsh/patches/patch-Doc_zsh_texi,v retrieving revision 1.9 diff -u -p -r1.9 patch-Doc_zsh_texi --- patches/patch-Doc_zsh_texi 6 Nov 2015 14:17:03 -0000 1.9 +++ patches/patch-Doc_zsh_texi 13 Dec 2016 02:40:43 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.9 2015/11/06 14:17:03 pea Exp $ ---- Doc/zsh.texi.orig Fri Aug 21 15:27:04 2015 -+++ Doc/zsh.texi Sat Aug 22 10:03:17 2015 -@@ -6,6 +6,10 @@ +--- Doc/zsh.texi.orig Fri Dec 2 13:55:17 2016 ++++ Doc/zsh.texi Fri Dec 2 15:24:31 2016 +@@ -5,6 +5,10 @@ @end iftex @setfilename zsh.info @settitle zsh Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v retrieving revision 1.44 diff -u -p -r1.44 PLIST --- pkg/PLIST 4 Apr 2016 22:57:45 -0000 1.44 +++ pkg/PLIST 13 Dec 2016 02:40:43 -0000 @@ -90,9 +90,11 @@ share/zsh/${V}/functions/VCS_INFO_get_da share/zsh/${V}/functions/VCS_INFO_get_data_svk share/zsh/${V}/functions/VCS_INFO_get_data_svn share/zsh/${V}/functions/VCS_INFO_get_data_tla +share/zsh/${V}/functions/VCS_INFO_hexdump share/zsh/${V}/functions/VCS_INFO_hook share/zsh/${V}/functions/VCS_INFO_maxexports share/zsh/${V}/functions/VCS_INFO_nvcsformats +share/zsh/${V}/functions/VCS_INFO_patch2subject share/zsh/${V}/functions/VCS_INFO_quilt share/zsh/${V}/functions/VCS_INFO_realpath share/zsh/${V}/functions/VCS_INFO_reposub @@ -101,10 +103,12 @@ share/zsh/${V}/functions/_SUSEconfig share/zsh/${V}/functions/_a2ps share/zsh/${V}/functions/_a2utils share/zsh/${V}/functions/_aap +share/zsh/${V}/functions/_absolute_command_paths share/zsh/${V}/functions/_acpi share/zsh/${V}/functions/_acpitool share/zsh/${V}/functions/_acroread share/zsh/${V}/functions/_adb +share/zsh/${V}/functions/_add-zle-hook-widget share/zsh/${V}/functions/_add-zsh-hook share/zsh/${V}/functions/_alias share/zsh/${V}/functions/_aliases @@ -138,10 +142,12 @@ share/zsh/${V}/functions/_autocd share/zsh/${V}/functions/_awk share/zsh/${V}/functions/_axi-cache share/zsh/${V}/functions/_bash_completions +share/zsh/${V}/functions/_baudrates share/zsh/${V}/functions/_baz share/zsh/${V}/functions/_be_name share/zsh/${V}/functions/_beadm share/zsh/${V}/functions/_beep +share/zsh/${V}/functions/_bibtex share/zsh/${V}/functions/_bind_addresses share/zsh/${V}/functions/_bindkey share/zsh/${V}/functions/_bison @@ -195,6 +201,7 @@ share/zsh/${V}/functions/_complete_debug share/zsh/${V}/functions/_complete_help share/zsh/${V}/functions/_complete_help_generic share/zsh/${V}/functions/_complete_tag +share/zsh/${V}/functions/_completers share/zsh/${V}/functions/_compress share/zsh/${V}/functions/_condition share/zsh/${V}/functions/_configure @@ -206,10 +213,13 @@ share/zsh/${V}/functions/_cowsay share/zsh/${V}/functions/_cp share/zsh/${V}/functions/_cpio share/zsh/${V}/functions/_cplay +share/zsh/${V}/functions/_cpupower share/zsh/${V}/functions/_cryptsetup +share/zsh/${V}/functions/_cscope share/zsh/${V}/functions/_cssh share/zsh/${V}/functions/_csup share/zsh/${V}/functions/_ctags_tags +share/zsh/${V}/functions/_cu share/zsh/${V}/functions/_curl share/zsh/${V}/functions/_cut share/zsh/${V}/functions/_cvs @@ -232,6 +242,7 @@ share/zsh/${V}/functions/_dcut share/zsh/${V}/functions/_dd share/zsh/${V}/functions/_deb_architectures share/zsh/${V}/functions/_deb_packages +share/zsh/${V}/functions/_debbugs_bugnumber share/zsh/${V}/functions/_debchange share/zsh/${V}/functions/_debcheckout share/zsh/${V}/functions/_debdiff @@ -251,6 +262,7 @@ share/zsh/${V}/functions/_dict_words share/zsh/${V}/functions/_diff share/zsh/${V}/functions/_diff_options share/zsh/${V}/functions/_diffstat +share/zsh/${V}/functions/_dig share/zsh/${V}/functions/_dir_list share/zsh/${V}/functions/_directories share/zsh/${V}/functions/_directory_stack @@ -260,8 +272,10 @@ share/zsh/${V}/functions/_dispatch share/zsh/${V}/functions/_django share/zsh/${V}/functions/_dladm share/zsh/${V}/functions/_dlocate +share/zsh/${V}/functions/_dmesg share/zsh/${V}/functions/_dmidecode share/zsh/${V}/functions/_dnf +share/zsh/${V}/functions/_doas share/zsh/${V}/functions/_domains share/zsh/${V}/functions/_dpatch-edit-patch share/zsh/${V}/functions/_dpkg @@ -293,6 +307,7 @@ share/zsh/${V}/functions/_equal share/zsh/${V}/functions/_espeak share/zsh/${V}/functions/_etags share/zsh/${V}/functions/_ethtool +share/zsh/${V}/functions/_evince share/zsh/${V}/functions/_expand share/zsh/${V}/functions/_expand_alias share/zsh/${V}/functions/_expand_word @@ -327,6 +342,7 @@ share/zsh/${V}/functions/_fuse_arguments share/zsh/${V}/functions/_fuse_values share/zsh/${V}/functions/_fuser share/zsh/${V}/functions/_fusermount +share/zsh/${V}/functions/_fw_update share/zsh/${V}/functions/_gcc share/zsh/${V}/functions/_gcore share/zsh/${V}/functions/_gdb @@ -349,6 +365,7 @@ 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/_gpasswd share/zsh/${V}/functions/_gpg share/zsh/${V}/functions/_gphoto2 share/zsh/${V}/functions/_gprof @@ -361,6 +378,8 @@ share/zsh/${V}/functions/_groff share/zsh/${V}/functions/_groups share/zsh/${V}/functions/_growisofs share/zsh/${V}/functions/_gs +share/zsh/${V}/functions/_gsettings +share/zsh/${V}/functions/_gstat share/zsh/${V}/functions/_guard share/zsh/${V}/functions/_guilt share/zsh/${V}/functions/_gv @@ -374,8 +393,10 @@ share/zsh/${V}/functions/_history share/zsh/${V}/functions/_history_complete_word share/zsh/${V}/functions/_history_modifiers share/zsh/${V}/functions/_hosts +share/zsh/${V}/functions/_htop share/zsh/${V}/functions/_hwinfo share/zsh/${V}/functions/_iconv +share/zsh/${V}/functions/_iconvconfig share/zsh/${V}/functions/_id share/zsh/${V}/functions/_ifconfig share/zsh/${V}/functions/_iftop @@ -387,6 +408,7 @@ 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/_iostat share/zsh/${V}/functions/_ip share/zsh/${V}/functions/_ipadm share/zsh/${V}/functions/_ipset @@ -405,17 +427,20 @@ share/zsh/${V}/functions/_jobs_builtin share/zsh/${V}/functions/_jobs_fg share/zsh/${V}/functions/_joe share/zsh/${V}/functions/_join +share/zsh/${V}/functions/_jot share/zsh/${V}/functions/_kfmclient share/zsh/${V}/functions/_kill share/zsh/${V}/functions/_killall share/zsh/${V}/functions/_kld share/zsh/${V}/functions/_knock +share/zsh/${V}/functions/_kpartx share/zsh/${V}/functions/_kvno share/zsh/${V}/functions/_last share/zsh/${V}/functions/_ld_debug share/zsh/${V}/functions/_ldd share/zsh/${V}/functions/_less share/zsh/${V}/functions/_lha +share/zsh/${V}/functions/_libvirt share/zsh/${V}/functions/_lighttpd share/zsh/${V}/functions/_limit share/zsh/${V}/functions/_limits @@ -426,6 +451,8 @@ share/zsh/${V}/functions/_list_files share/zsh/${V}/functions/_lldb share/zsh/${V}/functions/_ln share/zsh/${V}/functions/_loadkeys +share/zsh/${V}/functions/_locale +share/zsh/${V}/functions/_localedef share/zsh/${V}/functions/_locales share/zsh/${V}/functions/_locate share/zsh/${V}/functions/_logical_volumes @@ -440,6 +467,7 @@ share/zsh/${V}/functions/_lsof share/zsh/${V}/functions/_lspv share/zsh/${V}/functions/_lsusb share/zsh/${V}/functions/_lsvg +share/zsh/${V}/functions/_ltrace share/zsh/${V}/functions/_lynx share/zsh/${V}/functions/_lzop share/zsh/${V}/functions/_mac_applications @@ -520,6 +548,7 @@ share/zsh/${V}/functions/_od share/zsh/${V}/functions/_okular share/zsh/${V}/functions/_oldlist share/zsh/${V}/functions/_open +share/zsh/${V}/functions/_openstack share/zsh/${V}/functions/_options share/zsh/${V}/functions/_options_set share/zsh/${V}/functions/_options_unset @@ -548,6 +577,8 @@ share/zsh/${V}/functions/_pgrep share/zsh/${V}/functions/_php share/zsh/${V}/functions/_physical_volumes share/zsh/${V}/functions/_pick_variant +share/zsh/${V}/functions/_picocom +share/zsh/${V}/functions/_pidof share/zsh/${V}/functions/_pids share/zsh/${V}/functions/_pine share/zsh/${V}/functions/_ping @@ -598,6 +629,7 @@ share/zsh/${V}/functions/_raggle share/zsh/${V}/functions/_rake share/zsh/${V}/functions/_ranlib share/zsh/${V}/functions/_rar +share/zsh/${V}/functions/_rcctl share/zsh/${V}/functions/_rcs share/zsh/${V}/functions/_rdesktop share/zsh/${V}/functions/_read @@ -634,6 +666,7 @@ share/zsh/${V}/functions/_schedtool share/zsh/${V}/functions/_schroot share/zsh/${V}/functions/_scl share/zsh/${V}/functions/_screen +share/zsh/${V}/functions/_script share/zsh/${V}/functions/_sed share/zsh/${V}/functions/_sep_parts share/zsh/${V}/functions/_sequence @@ -683,7 +716,9 @@ share/zsh/${V}/functions/_svcprop share/zsh/${V}/functions/_svcs share/zsh/${V}/functions/_svcs_fmri share/zsh/${V}/functions/_svn-buildpackage +share/zsh/${V}/functions/_sys_calls share/zsh/${V}/functions/_sysctl +share/zsh/${V}/functions/_sysrc share/zsh/${V}/functions/_sysstat share/zsh/${V}/functions/_systat share/zsh/${V}/functions/_system_profiler @@ -711,14 +746,18 @@ share/zsh/${V}/functions/_tmux share/zsh/${V}/functions/_todo.sh share/zsh/${V}/functions/_toilet share/zsh/${V}/functions/_toolchain-source +share/zsh/${V}/functions/_top share/zsh/${V}/functions/_topgit share/zsh/${V}/functions/_totd +share/zsh/${V}/functions/_touch share/zsh/${V}/functions/_tpb share/zsh/${V}/functions/_tpconfig +share/zsh/${V}/functions/_tput share/zsh/${V}/functions/_tr share/zsh/${V}/functions/_tracepath share/zsh/${V}/functions/_trap share/zsh/${V}/functions/_tree +share/zsh/${V}/functions/_truss share/zsh/${V}/functions/_ttyctl share/zsh/${V}/functions/_ttys share/zsh/${V}/functions/_tune2fs @@ -776,6 +815,7 @@ share/zsh/${V}/functions/_wget share/zsh/${V}/functions/_whereis share/zsh/${V}/functions/_which share/zsh/${V}/functions/_whois +share/zsh/${V}/functions/_widgets share/zsh/${V}/functions/_wiggle share/zsh/${V}/functions/_wpa_cli share/zsh/${V}/functions/_x_arguments @@ -853,6 +893,7 @@ share/zsh/${V}/functions/_zsocket share/zsh/${V}/functions/_zstyle share/zsh/${V}/functions/_ztodo share/zsh/${V}/functions/_zypper +share/zsh/${V}/functions/add-zle-hook-widget share/zsh/${V}/functions/add-zsh-hook share/zsh/${V}/functions/after share/zsh/${V}/functions/age @@ -954,6 +995,7 @@ share/zsh/${V}/functions/run-help-svk share/zsh/${V}/functions/run-help-svn share/zsh/${V}/functions/select-bracketed share/zsh/${V}/functions/select-quoted +share/zsh/${V}/functions/select-word-match share/zsh/${V}/functions/select-word-style share/zsh/${V}/functions/send-invisible share/zsh/${V}/functions/smart-insert-last-word @@ -992,6 +1034,7 @@ share/zsh/${V}/functions/vcs_info_hookde share/zsh/${V}/functions/vcs_info_lastmsg share/zsh/${V}/functions/vcs_info_printsys share/zsh/${V}/functions/vcs_info_setsys +share/zsh/${V}/functions/vi-pipe share/zsh/${V}/functions/which-command share/zsh/${V}/functions/xtermctl share/zsh/${V}/functions/zargs @@ -1031,6 +1074,7 @@ share/zsh/${V}/functions/zftype share/zsh/${V}/functions/zfuget share/zsh/${V}/functions/zfuput share/zsh/${V}/functions/zkbd +share/zsh/${V}/functions/zmathfunc share/zsh/${V}/functions/zmathfuncdef share/zsh/${V}/functions/zmv share/zsh/${V}/functions/zrecompile
