On Thu, Jul 02, 2015 at 10:32:24AM +0200, Theo Buehler wrote:
> On Thu, Jul 02, 2015 at 08:27:01AM +0100, Stuart Henderson wrote:
> > On 2015/07/02 08:16, Theo Buehler wrote:
> > > I'm unsure what the patch for zsh.texi is supposed to achieve. It
> > > didn't apply cleanly, I hope I got this right...
> >
> > I'll leave the main part of this to someone who uses zsh, but respond to
> > this part:
> >
> > texi body patches are usually to work-around things missing from our old
> > version of texinfo. There's also the addition of @direntry to add the
> > menu entry.
>
> Thanks for the explanation, I think I got it.
>
> > This is questionable though...
> >
> > -fn() @{ setopt localtraps; trap @value{dsq} INT; sleep 3; @}
> > +zstyle ':completion:*' group-name @t{'}@t{'}
> >
> > ...could it be from a past mis-merge?
> >
>
> Good catch.
>
> Indeed, this seems to be a mis-merge from the unification of the
> zsh/stable and zsh/snapshots ports from ancient times. I fixed that one
> and made a few more conversions from @value{dsq} to @t{'}@t{'} and
> similar things. I verified by hand that the generated output matches
> the one with the pdf version of the manual from the official site.
>
> Updated patch below.
Anyone?
I can add that I tested this patch also on macppc over the past two
weeks. Same odd behaviour of `make test', otherwise this seems to be
working fine, as far as I can tell.
>
>
> Index: shells/zsh//Makefile
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/Makefile,v
> retrieving revision 1.74
> diff -u -p -r1.74 Makefile
> --- shells/zsh//Makefile 28 Apr 2015 06:30:13 -0000 1.74
> +++ shells/zsh//Makefile 2 Jul 2015 08:24:45 -0000
> @@ -2,9 +2,9 @@
>
> COMMENT= Z shell, Bourne shell-compatible
>
> -V= 5.0.7
> +V= 5.0.8
> DISTNAME= zsh-$V
> -REVISION= 0
> +REVISION=
> CATEGORIES= shells
>
> MAINTAINER= Pierre-Emmanuel Andre <[email protected]>
> Index: shells/zsh//distinfo
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- shells/zsh//distinfo 22 Apr 2015 11:52:40 -0000 1.20
> +++ shells/zsh//distinfo 2 Jul 2015 08:24:45 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (zsh-5.0.7.tar.gz) = Q/CkwXnvebuMkVNXVoX39F8oo2FcjPljRfUD1bnnuRk=
> -SIZE (zsh-5.0.7.tar.gz) = 4004964
> +SHA256 (zsh-5.0.8.tar.gz) = 9XJx7PUD30A9tRWRZibeXWWNn54sO21NplBUQlHsCAs=
> +SIZE (zsh-5.0.8.tar.gz) = 4119858
> Index: shells/zsh//patches/patch-Completion_BSD_Command__bsd_pkg
> ===================================================================
> RCS file:
> /cvs/ports/shells/zsh/patches/patch-Completion_BSD_Command__bsd_pkg,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Completion_BSD_Command__bsd_pkg
> --- shells/zsh//patches/patch-Completion_BSD_Command__bsd_pkg 29 Jan 2006
> 20:41:02 -0000 1.2
> +++ shells/zsh//patches/patch-Completion_BSD_Command__bsd_pkg 2 Jul 2015
> 08:24:45 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.2 2006/01/29 20:41:02
> sturm Exp $
> ---- Completion/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
> -+++ Completion/BSD/Command/_bsd_pkg Mon Jan 23 21:30:02 2006
> +--- Completion/BSD/Command/_bsd_pkg.orig Sun Dec 14 00:55:54 2014
> ++++ Completion/BSD/Command/_bsd_pkg Thu Jul 2 06:13:22 2015
> @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
>
> case $OSTYPE in
> @@ -33,141 +33,7 @@ $OpenBSD: patch-Completion_BSD_Command__
> }
>
> (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> -@@ -48,11 +52,11 @@ _bsd_pkg() {
> - pkg_add)
> - flags=(
> - '-f[force installation]'
> -- '-I[don'\''t execute installation scripts]'
> -+ '-I[don''t execute installation scripts]'
> - '-M[run in master mode]'
> -- '-n[don'\''t really install packages]'
> -+ '-n[don''t really install packages]'
> - '-p[specify prefix]:prefix directory:_files -/'
> -- '-R[don'\''t record]'
> -+ '-R[don''t record]'
> - '-S[run in slave mode]'
> - '-t[specify mktemp template]:mktemp template:_files -/'
> - '-v[be verbose]'
> -@@ -67,9 +71,9 @@ _bsd_pkg() {
> - ;;
> - netbsd*)
> - flags=(
> -- $flags[@]
> -- '-u[update]'
> -- '-V[show version and exit]'
> -+ $flags[@]
> -+ '-u[update]'
> -+ '-V[show version and exit]'
> - )
> - ;;
> - esac
> -@@ -83,37 +87,37 @@ _bsd_pkg() {
> - case "$OSTYPE" in
> - freebsd*)
> - flags=(
> -- '-f[specify plist file]:plist file:_files'
> -- '(-b)-c[specify comment file]:comment file:_files'
> -- '(-b)-d[specify descr file]:descr file:_files'
> -- '-Y[assume YES for any questions asked]'
> -- '-N[assume NO for any questions asked]'
> -- '(-b)-O[packing list only mode]'
> -- '-v[be verbose]'
> -- '-h[force tar to follow symlinks]'
> -- '(-b)-i[specify pre-install script]:pre-install script:_files'
> -- '(-b)-I[specify post-install script]:post-install script:_files'
> -- '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> -- '(-b)-p[specify prefix]:prefix directory:_files -/'
> -- '(-b)-k[specify deinstall script]:deinstall script:_files'
> -- '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> -- '(-b)-r[specify req script]:req script:_files'
> -- '(-b)-s[specify source directory]:source directory:_files -/'
> -- '(-b)-t[specify mktemp template]:mktemp template:_files'
> -- '(-b)-X[specify exclude file]:exclude file for tar:_files'
> -- '(-b)-D[specify message file]:message file:_files'
> -- '(-b)-m[specify mtree file]:mtree file:_files'
> -- '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports} -/'
> -- '-j[use bzip2]'
> -- '-z[use gzip]'
> -- '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
> pkgname]:pkgname:_bsd_pkg_pkgs'
> -- '*:package file name:_files'
> -+ '-f[specify plist file]:plist file:_files'
> -+ '(-b)-c[specify comment file]:comment file:_files'
> -+ '(-b)-d[specify descr file]:descr file:_files'
> -+ '-Y[assume YES for any questions asked]'
> -+ '-N[assume NO for any questions asked]'
> -+ '(-b)-O[packing list only mode]'
> -+ '-v[be verbose]'
> -+ '-h[force tar to follow symlinks]'
> -+ '(-b)-i[specify pre-install script]:pre-install script:_files'
> -+ '(-b)-I[specify post-install script]:post-install script:_files'
> -+ '(-b)-P[specify initial dependencies]:dependencies:_bsd_pkg_pkgs'
> -+ '(-b)-p[specify prefix]:prefix directory:_files -/'
> -+ '(-b)-k[specify deinstall script]:deinstall script:_files'
> -+ '(-b)-K[specify post-deinstall script]:post-deinstall script:_files'
> -+ '(-b)-r[specify req script]:req script:_files'
> -+ '(-b)-s[specify source directory]:source directory:_files -/'
> -+ '(-b)-t[specify mktemp template]:mktemp template:_files'
> -+ '(-b)-X[specify exclude file]:exclude file for tar:_files'
> -+ '(-b)-D[specify message file]:message file:_files'
> -+ '(-b)-m[specify mtree file]:mtree file:_files'
> -+ '(-b)-o[specify origin]:origin:_files -W ${PORTSDIR\:-/usr/ports}
> -/'
> -+ '-j[use bzip2]'
> -+ '-z[use gzip]'
> -+ '(-c -d -O -i -I -P -p -k -K -r -s -t -X -D -m -o)-b[specify
> pkgname]:pkgname:_bsd_pkg_pkgs'
> -+ '*:package file name:_files'
> - )
> - ;;
> - netbsd*)
> - # NetBSD users, improve me!
> - flags=(
> -- '*:package name:_bsd_pkg_pkgs'
> -+ '*:package name:_bsd_pkg_pkgs'
> - )
> - ;;
> - esac
> -@@ -124,10 +128,10 @@ _bsd_pkg() {
> -
> - pkg_delete)
> - flags=(
> -- '-D[don'\''t execute deinstallation scripts]'
> -+ '-D[don''t execute deinstallation scripts]'
> - '-d[remove empty directories]'
> - '-f[force deinstallation]'
> -- '-n[don'\''t really deinstall packages]'
> -+ '-n[don''t really deinstall packages]'
> - '-p[specify prefix]:prefix directory:_files -/'
> - '-v[be verbose]'
> - )
> -@@ -136,35 +140,43 @@ _bsd_pkg() {
> - freebsd*)
> - flags=(
> - $flags[@]
> -- '(:)-a[delete all installed packages]'
> -+ '(:)-a[delete all installed packages]'
> - '-G[do not expand glob patterns]'
> -- '-i[be interactive]'
> -+ '-i[be interactive]'
> - '-r[delete recursively]'
> - '-x[use regular expression]'
> - )
> - ;;
> - netbsd*)
> - flags=(
> -- $flags[@]
> -- '(:)-a[delete all installed packages]'
> -- '-F[specify each package by an installed file]'
> -- '-i[be interactive]'
> -- '-O[only delete the package'\''s entries]'
> -+ $flags[@]
> -+ '(:)-a[delete all installed packages]'
> -+ '-F[specify each package by an installed file]'
> -+ '-i[be interactive]'
> -+ '-O[only delete the package''s entries]'
> - '-R[delete upward recursively]'
> - '-r[delete recursively]'
> -- '-V[show version and exit]'
> -+ '-V[show version and exit]'
> - )
> +@@ -157,14 +161,22 @@ _bsd_pkg() {
> ;;
> esac
>
> @@ -194,41 +60,16 @@ $OpenBSD: patch-Completion_BSD_Command__
> '-c[show comment fields]'
> '-D[show install-message files]'
> '-d[show long descriptions]'
> -@@ -188,30 +200,41 @@ _bsd_pkg() {
> +@@ -188,7 +200,7 @@ _bsd_pkg() {
> flags=(
> $flags[@]
> '-G[do not expand glob patterns]'
> - '-g[show files that'\''s modified]'
> -- '-o[show origin]'
> -- '-s[show total size occupied by each package]'
> -- '-t[specify mktemp template]:mktemp template:_files -/'
> -- '*-W[show which package the file belongs to]:file:_files'
> -- '-x[use regular expression]'
> -+ '-g[show files that are modified]'
> -+ '-o[show origin]'
> -+ '-s[show total size occupied by each package]'
> -+ '-t[specify mktemp template]:mktemp template:_files -/'
> -+ '*-W[show which package the file belongs to]:file:_files'
> -+ '-x[use regular expression]'
> - )
> - ;;
> - netbsd*)
> - flags=(
> -- $flags[@]
> -- '-B[show build information]'
> -- '-b[show RCS Id strings]'
> -- '-F[specify each package by an installed file]'
> -- '-S[show total size occupied by each package and its dependents]'
> -- '-s[show total size occupied by each package]'
> -- '-V[show version and exit]'
> -+ $flags[@]
> -+ '-B[show build information]'
> -+ '-b[show RCS Id strings]'
> -+ '-F[specify each package by an installed file]'
> -+ '-S[show total size occupied by each package and its dependents]'
> -+ '-s[show total size occupied by each package]'
> -+ '-V[show version and exit]'
> - )
> ++ '-g[show files that are modified]'
> + '-o[show origin]'
> + '-s[show total size occupied by each package]'
> + '-t[specify mktemp template]:mktemp template:_files -/'
> +@@ -209,9 +221,20 @@ _bsd_pkg() {
> ;;
> esac
>
> Index: shells/zsh//patches/patch-Completion_Base_Utility__call_program
> ===================================================================
> RCS file: shells/zsh//patches/patch-Completion_Base_Utility__call_program
> diff -N shells/zsh//patches/patch-Completion_Base_Utility__call_program
> --- shells/zsh//patches/patch-Completion_Base_Utility__call_program 28 Apr
> 2015 06:30:13 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-Completion_Base_Utility__call_program,v 1.1 2015/04/28
> 06:30:13 jasper Exp $
> -
> -be conservative about redirecting _call_program stderr, the caller may have
> -already done so
> -http://sourceforge.net/p/zsh/code/ci/22c4ea424ce2e8febce04d324c5ec9898f5d534b/
> -
> ---- Completion/Base/Utility/_call_program.orig Sat Apr 25 20:20:25 2015
> -+++ Completion/Base/Utility/_call_program Sat Apr 25 20:20:38 2015
> -@@ -2,8 +2,8 @@
> -
> - local tmp err_fd=-1
> -
> --if (( ${debug_fd:--1} > 2 ))
> --then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is log file
> -+if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]]
> -+then exec {err_fd}>&2 # debug_fd is saved stderr, 2 is trace or
> redirect
> - else exec {err_fd}>/dev/null
> - fi
> -
> Index: shells/zsh//patches/patch-Completion_Unix_Command__find
> ===================================================================
> RCS file: shells/zsh//patches/patch-Completion_Unix_Command__find
> diff -N shells/zsh//patches/patch-Completion_Unix_Command__find
> --- shells/zsh//patches/patch-Completion_Unix_Command__find 2 Oct 2013
> 19:49:12 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,110 +0,0 @@
> -$OpenBSD: patch-Completion_Unix_Command__find,v 1.3 2013/10/02 19:49:12
> gsoares Exp $
> ---- Completion/Unix/Command/_find.orig Sun Aug 11 04:52:54 2013
> -+++ Completion/Unix/Command/_find Sun Aug 11 04:53:00 2013
> -@@ -1,82 +1,39 @@
> --#compdef find
> -+#compdef find (OpenBSD)
> -+# Sebastian Stark <[email protected]>
> -
> - _arguments \
> -- '(- *)-help' '(-)--help' \
> -- '(- *)-version' '(-)--version' \
> -- '(-L -P)-H[only follow symlinks when resolving command-line arguments]' \
> -- '(-H -P)-L[follow symlinks]' \
> -- '(-H -L)-P[never follow symlinks]' \
> -- '-D[print diagnostics]:deb option:(help tree search stat rates opt exec)'
> \
> -- '-O+[enable query optimisation]:level:(1 2 3)' \
> -- '*-daystart' \
> -- '*-d' '*-depth' \
> -- '*-follow' \
> -- '(-noignore_readdir_race)-ignore_readdir_race' \
> -- '*-maxdepth:maximum search depth' \
> -- '*-mindepth:minimum search depth' \
> -- '*-mount' \
> -- '(-ignore_readdir_race)-noignore_readdir_race' \
> -- '*-noleaf' \
> -- '-regextype:regexp syntax:(emacs posix-awk posix-basic posix-egrep
> posix-extended)' \
> -- '*-warn' \
> -- '*-nowarn' \
> -- '*-xdev' \
> -- '*-amin:access time (minutes):' \
> -- '*-cmin:inode change time (minutes):' \
> -- '*-mmin:modification time (minutes):' \
> -- '*-atime:access time (days):' \
> -- '*-ctime:inode change time (days):' \
> -- '*-mtime:modification time (days):' \
> -+ '*-amin:access time (minutes)' \
> - '*-anewer:file to compare (access time):_files' \
> -+ '*-atime:access time (days)' \
> -+ '*-cmin:inode change time (minutes)' \
> - '*-cnewer:file to compare (inode change time):_files' \
> -- '*-newer:file to compare (modification time):_files' \
> -- '*-used:access after inode change (days):' \
> -+ '*-ctime:inode change time (minutes)' \
> - '*-empty' \
> -- '*-executable' \
> -- '*-false' \
> -- '*-fstype:file system type:_file_systems' \
> -- '*-gid:numeric group ID:' \
> -+ '*-exec:program: _command_names -e:*\;::program arguments: _normal' \
> -+ '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
> -+ '*-flags:special file flag:(arch opaque nodump sappnd schg uappnd uchg)' \
> -+ '*-follow' \
> -+ '*-fstype:filesystem type:(local rdonly union xfs umap procfs portal null
> nfs msdos mfs kernfs ffs fdesc ext2fs cd9660 ados)' \
> - '*-group:group:_groups' \
> -- '*-uid:numeric user ID:' \
> -- '*-user:user:_users' \
> -- '*-lname:link pattern to search:' \
> -- '*-ilname:link pattern to search (case insensitive):' \
> -- '*-name:name pattern to search:' \
> - '*-iname:name pattern to search (case insensitive):' \
> -- '*-path:path pattern to search:' \
> -- '*-ipath:path pattern to search (case insensitive):' \
> -- '*-regex:regular expression to search:' \
> -- '*-iregex:regular expression to search (case insensitive):' \
> -- '*-wholename:full path pattern to search:' \
> -- '*-iwholename:full path pattern to search (case insensitive):' \
> -- '*-inum:inode number:' \
> -+ '*-inum:inode number' \
> - '*-links:number of links:' \
> -+ '*-ls' \
> -+ '*-maxdepth:maximum search depth:' \
> -+ '*-mindepth:minimum search depth:' \
> -+ '*-mmin:modification time (minutes):' \
> -+ '*-mtime:modification time (days):' \
> -+ '*-name:name pattern to search:' \
> -+ '*-newer:file to compare (modification time):_files' \
> - '*-nouser' \
> - '*-nogroup' \
> -- '*-perm:file permission bits:' \
> -- '*-readable' \
> -- '*-writable' \
> -- '*-size:file size:' \
> -- '*-samefile:same inode as:_files' \
> -- '*-true' \
> -- '*-type:file type:((b\:block\ special\ file c\:character\ special\ file
> d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
> -- '*-xtype:file type:((b\:block\ special\ file c\:character\ special\ file
> d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
> -- '*-delete' \
> -- '*-exec:program: _command_names -e:*\;::program arguments: _normal' \
> -- '*-execdir:program: _command_names -e:*\;::program arguments: _normal' \
> - '*-ok:program: _command_names -e:*\;::program arguments: _normal' \
> -- '*-okdir:program: _command_names -e:*\;::program arguments: _normal' \
> -- '*-fls:output file:_files' \
> -- '*-fprint:output file:_files' \
> -- '*-fprint0:output file:_files' \
> -- '*-fprintf:output file:_files:output format:' \
> -+ '*-path:path pattern to search:' \
> -+ '*-perm:file permission bits:' \
> - '*-print' \
> - '*-print0' \
> -- '*-printf:output format:' \
> - '*-prune' \
> -- '*-quit' \
> -- '*-ls' \
> -- '*-and' '*-a' \
> -- '*-or' '*-o' \
> -- '*-not' \
> -+ '*-size:file size:' \
> -+ '*-type:file type:((b\:block\ special\ file c\:character\ special\ file
> d\:directory p\:named\ pipe f\:normal\ file l\:symbolic\ link s\:socket))' \
> -+ '*-user:user:_users' \
> - '*:directory:_files -/'
> Index: shells/zsh//patches/patch-Completion_Unix_Command__tmux
> ===================================================================
> RCS file: shells/zsh//patches/patch-Completion_Unix_Command__tmux
> diff -N shells/zsh//patches/patch-Completion_Unix_Command__tmux
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ shells/zsh//patches/patch-Completion_Unix_Command__tmux 2 Jul 2015
> 08:24:45 -0000
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +--- Completion/Unix/Command/_tmux.orig Wed Dec 3 15:00:57 2014
> ++++ Completion/Unix/Command/_tmux Wed Dec 3 15:10:25 2014
> +@@ -1497,12 +1497,11 @@ function _tmux() {
> +
> + args=(
> + '-2[force using 256 colours]'
> +- '-8[force using 88 colours]'
> + '-c[execute a shell command]:command name:_command_names'
> ++ '-C[start in control mode]'
> + '-f[specify configuration file]:tmux config file:_files -g "*(-.)"'
> + '-l[behave like a login shell]'
> + '-L[specify socket name]:socket name:__tmux-socket-name'
> +- '-q[do not send informational messages]'
> + '-S[specify socket path]:server socket:_path_files -g "*(=,/)"'
> + '-u[force using UTF-8]'
> + '-v[request verbose logging]'
> Index: shells/zsh//patches/patch-Completion_Unix_Type__diff_options
> ===================================================================
> RCS file:
> /cvs/ports/shells/zsh/patches/patch-Completion_Unix_Type__diff_options,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Completion_Unix_Type__diff_options
> --- shells/zsh//patches/patch-Completion_Unix_Type__diff_options 17 Apr
> 2014 12:12:20 -0000 1.2
> +++ shells/zsh//patches/patch-Completion_Unix_Type__diff_options 2 Jul
> 2015 08:24:45 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Completion_Unix_Type__diff_options,v 1.2 2014/04/17 12:12:20
> jasper Exp $
> ---- Completion/Unix/Type/_diff_options.orig Wed Nov 27 20:00:19 2013
> -+++ Completion/Unix/Type/_diff_options Mon Apr 14 18:10:09 2014
> -@@ -119,9 +119,35 @@ else
> +--- Completion/Unix/Type/_diff_options.orig Sun May 3 19:57:18 2015
> ++++ Completion/Unix/Type/_diff_options Thu Jul 2 03:57:35 2015
> +@@ -122,9 +122,35 @@ else
> '-S+[set first file in comparison]:start with file:_files'
> )
> ;;
> Index: shells/zsh//patches/patch-Doc_zsh_texi
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/patches/patch-Doc_zsh_texi,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-Doc_zsh_texi
> --- shells/zsh//patches/patch-Doc_zsh_texi 22 Apr 2015 11:52:40 -0000
> 1.8
> +++ shells/zsh//patches/patch-Doc_zsh_texi 2 Jul 2015 08:24:45 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/04/22 11:52:40 jca Exp $
> ---- Doc/zsh.texi.orig Tue Oct 7 20:09:19 2014
> -+++ Doc/zsh.texi Sat Mar 28 11:55:00 2015
> -@@ -7,6 +7,10 @@
> +--- Doc/zsh.texi.orig Sun May 31 19:47:49 2015
> ++++ Doc/zsh.texi Thu Jul 2 10:13:43 2015
> +@@ -6,6 +6,10 @@
> @end iftex
> @setfilename zsh.info
> @settitle zsh
> @@ -12,7 +12,24 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> @c %**end of header
>
> @ifinfo
> -@@ -4074,7 +4078,7 @@ you may see in your prompt (see
> +@@ -1863,14 +1867,14 @@ string by using the `@t{\'}' escape.
> +
> + @noindent
> + @pindex RC_QUOTES, use of
> +-All characters enclosed between a pair of single quotes (@t{@value{dsq}})
> that
> ++All characters enclosed between a pair of single quotes (@t{'}@t{'}) that
> + is not preceded by a `@t{$}' are quoted. A single quote cannot appear
> + within single quotes unless the option @t{RC_QUOTES} is set, in which case
> + a pair of single quotes are turned into a single quote. For example,
> +
> + @noindent
> + @example
> +-print @value{dsq}@value{dsq}
> ++print @t{'}@t{'}@t{'}@t{'}
> + @end example
> +
> + @noindent
> +@@ -4144,7 +4148,7 @@ you may see in your prompt (see
> A history expansion begins with the first character of the @t{histchars}
> parameter, which is `@t{!}' by default, and may occur anywhere on the
> command line; history expansions do not nest. The `@t{!}' can be escaped
> @@ -21,16 +38,43 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> to suppress its special meaning. Double quotes will @emph{not} work for
> this. Following this history character is an optional event designator
> (@ref{Event Designators}) and then an optional word
> -@@ -10526,7 +10530,7 @@ For example,
> +@@ -10385,7 +10389,7 @@ This is only available at the command line in
> interact
> + @cindex rc, quoting style
> + @cindex quoting style, rc
> + @item @t{RC_QUOTES}
> +-Allow the character sequence `@t{@value{dsq}}' to signify a single quote
> ++Allow the character sequence `@t{'}@t{'}' to signify a single quote
> + within singly quoted strings. Note this does not apply in quoted strings
> + using the format @t{$'}@var{...}@t{'}, where a backslashed single quote can
> + be used.
> +@@ -10820,7 +10824,7 @@ For example,
> @example
> unsetopt localtraps
> trap - INT
> -fn() @{ setopt localtraps; trap @value{dsq} INT; sleep 3; @}
> ++fn() @{ setopt localtraps; trap @t{'}@t{'} INT; sleep 3; @}
> + @end example
> +
> + @noindent
> +@@ -16784,7 +16788,7 @@ An interrupt character will not be inserted.
> + @item @t{quote-line} (@t{ESC-'}) (unbound) (unbound)
> + Quote the current line; that is, put a `@t{'}' character at the
> + beginning and the end, and convert all `@t{'}' characters
> +-to `@t{'\@value{dsq}}'.
> ++to `@t{'\\}@t{'}@t{'}'.
> +
> + @tindex quote-region
> + @item @t{quote-region} (@t{ESC-"}) (unbound) (unbound)
> +@@ -20780,7 +20784,7 @@ different types of matches displayed separately, one
> c
> +
> + @noindent
> + @example
> +-zstyle ':completion:*' group-name @value{dsq}
> +zstyle ':completion:*' group-name @t{'}@t{'}
> @end example
>
> @noindent
> -@@ -20418,7 +20422,7 @@ zstyle ':completion:*:default' list-colors
> $@{(s.:.)LS
> +@@ -21062,7 +21066,7 @@ zstyle ':completion:*:default' list-colors \
>
> @noindent
> The default colors are the same as for the GNU @t{ls} command and can be
> @@ -39,7 +83,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
>
> @kindex list-dirs-first, completion style
> @item @t{list-dirs-first}
> -@@ -20551,7 +20555,7 @@ generates no matches, case-insensitive completion:
> +@@ -21195,7 +21199,7 @@ generates no matches, case-insensitive completion:
>
> @noindent
> @example
> @@ -48,16 +92,34 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> @end example
>
> @noindent
> -@@ -20577,7 +20581,7 @@ case-insensitive completion only with @t{_complete}:
> +@@ -21207,7 +21211,7 @@ without repetition:
> + @noindent
> + @example
> + zstyle ':completion:*' matcher-list \
> +- @value{dsq} '+m:@{a-z@}=@{A-Z@}' '+m:@{A-Z@}=@{a-z@}'
> ++ @t{'}@t{'} '+m:@{a-z@}=@{A-Z@}' '+m:@{A-Z@}=@{a-z@}'
> + @end example
> +
> + @noindent
> +@@ -21222,7 +21226,7 @@ case-insensitive completion only with @t{_complete}:
> @example
> zstyle ':completion:*' completer _complete _prefix
> - zstyle ':completion:*:complete:*' matcher-list \
> + zstyle ':completion:*:complete:*:*:*' matcher-list \
> - @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
> + @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
> @end example
>
> @noindent
> -@@ -24141,7 +24145,7 @@ generates at least one match. E.g.:
> +@@ -21238,7 +21242,7 @@ partial-word completion:
> + zstyle ':completion:*' completer \
> + _complete _correct _complete:foo
> + zstyle ':completion:*:complete:*:*:*' matcher-list \
> +- @value{dsq} 'm:@{a-zA-Z@}=@{A-Za-z@}'
> ++ @t{'}@t{'} 'm:@{a-zA-Z@}=@{A-Za-z@}'
> + zstyle ':completion:*:foo:*:*:*' matcher-list \
> + 'm:@{a-zA-Z@}=@{A-Za-z@} r:|[-_./]=* r:|=*'
> + @end example
> +@@ -24804,7 +24808,7 @@ generates at least one match. E.g.:
>
> @noindent
> @example
> @@ -66,7 +128,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> @end example
>
> @noindent
> -@@ -24353,7 +24357,7 @@ use is
> +@@ -25016,7 +25020,7 @@ use is
>
> @noindent
> @example
> @@ -75,7 +137,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> @end example
>
> @noindent
> -@@ -24441,7 +24445,7 @@ performed on the first word in the range. For
> example
> +@@ -25104,7 +25108,7 @@ performed on the first word in the range. For
> example
>
> @noindent
> @example
> @@ -84,3 +146,98 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.8 2015/
> @end example
>
> @noindent
> +@@ -26900,7 +26904,7 @@ The @t{-s} option is a zsh extension to @t{chown}
> func
> + paranoid behaviour, intended to avoid security problems involving
> + a @t{chown} being tricked into affecting files other than the ones
> + intended. It will refuse to follow symbolic links, so that (for example)
> +-@value{dsbq}@t{chown luser /tmp/foo/passwd}@value{dsq} can't accidentally
> chown @t{/etc/passwd}
> ++@t{`}@t{`}@t{chown luser /tmp/foo/passwd}@t{'}@t{'} can't accidentally
> chown @t{/etc/passwd}
> + if @t{/tmp/foo} happens to be a link to @t{/etc}. It will also check
> + where it is after leaving directories, so that a recursive chown of
> + a deep directory tree can't end up recursively chowning @t{/usr} as
> +@@ -27002,7 +27006,7 @@ The @t{-s} option is a zsh extension to @t{rm}
> functio
> + paranoid behaviour, intended to avoid common security problems involving
> + a root-run @t{rm} being tricked into removing files other than the ones
> + intended. It will refuse to follow symbolic links, so that (for example)
> +-@value{dsbq}@t{rm /tmp/foo/passwd}@value{dsq} can't accidentally remove
> @t{/etc/passwd}
> ++@t{`}@t{`}@t{rm /tmp/foo/passwd}@t{'}@t{'} can't accidentally remove
> @t{/etc/passwd}
> + if @t{/tmp/foo} happens to be a link to @t{/etc}. It will also check
> + where it is after leaving directories, so that a recursive removal of
> + a deep directory tree can't end up recursively removing @t{/usr} as
> +@@ -27941,7 +27945,7 @@ The number of disk blocks used by the file.
> + @item @t{link}
> + If the file is a link and the @t{-L} option is in
> + effect, this contains the name of the file linked to, otherwise
> +-it is empty. Note that if this element is selected (@value{dsbq}@t{zstat
> +link}@value{dsq})
> ++it is empty. Note that if this element is selected (@t{`}@t{`}@t{zstat
> +link}@t{'}@t{'})
> + then the @t{-L} option is automatically used.
> +
> + @end table
> +@@ -29752,7 +29756,7 @@ to have the effect of
> + @noindent
> + @example
> + foo=(-a)
> +-bar=(-a @value{dsq} -b xyz)
> ++bar=(-a @t{'}@t{'} -b xyz)
> + @end example
> +
> + @end table
> +@@ -34919,7 +34923,7 @@ simplified interface in @t{select-word-style}:
> + @noindent
> + @example
> + zstyle ':zle:*' word-style standard
> +-zstyle ':zle:*' word-chars @value{dsq}
> ++zstyle ':zle:*' word-chars @t{'}@t{'}
> + @end example
> +
> + @noindent
> +@@ -34946,7 +34950,7 @@ zstyle ':zle:*' word-context \
> + "*/*" file "[[:space:]]" whitespace
> + zstyle ':zle:transpose-words:whitespace' word-style shell
> + zstyle ':zle:transpose-words:filename' word-style normal
> +-zstyle ':zle:transpose-words:filename' word-chars @value{dsq}
> ++zstyle ':zle:transpose-words:filename' word-chars @t{'}@t{'}
> + @end example
> +
> + @noindent
> +@@ -35577,7 +35581,7 @@ Here is a trivial example of a widget using this
> featu
> + @example
> + local state
> + narrow-to-region -p $'Editing restricted region\n' \
> +- -P @value{dsq} -S state
> ++ -P @t{'}@t{'} -S state
> + zle recursive-edit
> + narrow-to-region -R state
> + @end example
> +@@ -35598,7 +35602,7 @@ see the @t{toggle} style below.
> + @noindent
> + With the function based completion system (which is needed for this), you
> + should be able to type @t{TAB} at almost any point to advance the cursor
> +-to the next @value{dsbq}interesting@value{dsq} character position (usually
> the end of the
> ++to the next @t{`}@t{`}interesting@t{'}@t{'} character position (usually the
> end of the
> + current word, but sometimes somewhere in the middle of the word). And of
> + course as soon as the entire line is what you want, you can accept with
> + return, without needing to move the cursor to the end first.
> +@@ -35809,8 +35813,8 @@ from another widget, it behaves like
> @t{insert-last-wo
> + words in comments are ignored when @t{INTERACTIVE_COMMENTS} is set.
> +
> + @noindent
> +-Otherwise, the rightmost @value{dsbq}interesting@value{dsq} word from the
> previous command is
> +-found and inserted. The default definition of
> @value{dsbq}interesting@value{dsq} is that the
> ++Otherwise, the rightmost @t{`}@t{`}interesting@t{'}@t{'} word from the
> previous command is
> ++found and inserted. The default definition of
> @t{`}@t{`}interesting@t{'}@t{'} is that the
> + word contains at least one alphabetic character, slash, or backslash.
> + This definition may be overridden by use of the @t{match} style. The
> + context used to look up the style is the widget name, so usually the
> +@@ -36237,9 +36241,9 @@ is as follows.
> + # "always" block
> + if catch MyExcept; then
> + print "Caught exception MyExcept"
> +- elif catch @value{dsq}; then
> ++ elif catch @t{'}@t{'}; then
> + print "Caught a shell error. Propagating..."
> +- throw @value{dsq}
> ++ throw @t{'}@t{'}
> + fi
> + # Other exceptions are not handled but may be caught further
> + # up the call stack.
> Index: shells/zsh//patches/patch-Src_Modules_langinfo_c
> ===================================================================
> RCS file: shells/zsh//patches/patch-Src_Modules_langinfo_c
> diff -N shells/zsh//patches/patch-Src_Modules_langinfo_c
> --- shells/zsh//patches/patch-Src_Modules_langinfo_c 22 Apr 2015 12:00:47
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,17 +0,0 @@
> -$OpenBSD: patch-Src_Modules_langinfo_c,v 1.2 2015/04/22 12:00:47 jca Exp $
> -
> -Fixed upstream:
> -
> http://sourceforge.net/p/zsh/code/ci/b4aa9cdc7641c6c923c1bda1c73111d80be79ba1/
> -
> ---- Src/Modules/langinfo.c.orig Sat Mar 28 11:55:39 2015
> -+++ Src/Modules/langinfo.c Sat Mar 28 11:56:37 2015
> -@@ -395,7 +395,8 @@ liitem(const char *name)
> - static HashNode
> - getlanginfo(UNUSED(HashTable ht), const char *name)
> - {
> -- int len, *elem;
> -+ nl_item *elem;
> -+ int len;
> - char *listr, *nameu;
> - Param pm = NULL;
> -
> Index: shells/zsh//pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/shells/zsh/pkg/PLIST,v
> retrieving revision 1.40
> diff -u -p -r1.40 PLIST
> --- shells/zsh//pkg/PLIST 22 Apr 2015 11:52:40 -0000 1.40
> +++ shells/zsh//pkg/PLIST 2 Jul 2015 08:24:45 -0000
> @@ -2,7 +2,7 @@
> @pkgpath shells/zsh,-main
> @shell bin/zsh
> %%SHARED%%
> -@bin bin/zsh-${V}
> +@bin bin/${FULLPKGNAME}
> @man man/man1/zsh.1
> @man man/man1/zshall.1
> @man man/man1/zshbuiltins.1
> @@ -67,6 +67,7 @@ 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-zsh-hook
> share/zsh/${V}/functions/_alias
> share/zsh/${V}/functions/_aliases
> share/zsh/${V}/functions/_all_labels
> @@ -111,12 +112,15 @@ share/zsh/${V}/functions/_bpython
> share/zsh/${V}/functions/_brace_parameter
> share/zsh/${V}/functions/_brctl
> share/zsh/${V}/functions/_bsd_pkg
> +share/zsh/${V}/functions/_bsdconfig
> +share/zsh/${V}/functions/_bsdinstall
> share/zsh/${V}/functions/_btrfs
> share/zsh/${V}/functions/_bts
> share/zsh/${V}/functions/_bug
> share/zsh/${V}/functions/_builtin
> share/zsh/${V}/functions/_bzip2
> share/zsh/${V}/functions/_bzr
> +share/zsh/${V}/functions/_cabal
> share/zsh/${V}/functions/_cache_invalid
> share/zsh/${V}/functions/_cal
> share/zsh/${V}/functions/_calendar
> @@ -138,6 +142,8 @@ share/zsh/${V}/functions/_chown
> share/zsh/${V}/functions/_chrt
> share/zsh/${V}/functions/_chsh
> share/zsh/${V}/functions/_clay
> +share/zsh/${V}/functions/_cmdstring
> +share/zsh/${V}/functions/_cmp
> share/zsh/${V}/functions/_combination
> share/zsh/${V}/functions/_comm
> share/zsh/${V}/functions/_command
> @@ -181,6 +187,7 @@ share/zsh/${V}/functions/_dchroot-dsa
> share/zsh/${V}/functions/_dcop
> 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/_debchange
> share/zsh/${V}/functions/_debdiff
> @@ -210,7 +217,6 @@ share/zsh/${V}/functions/_django
> share/zsh/${V}/functions/_dladm
> share/zsh/${V}/functions/_dlocate
> share/zsh/${V}/functions/_dmidecode
> -share/zsh/${V}/functions/_docker
> share/zsh/${V}/functions/_domains
> share/zsh/${V}/functions/_dpatch-edit-patch
> share/zsh/${V}/functions/_dpkg
> @@ -230,6 +236,7 @@ share/zsh/${V}/functions/_dynamic_direct
> share/zsh/${V}/functions/_ecasound
> share/zsh/${V}/functions/_echotc
> share/zsh/${V}/functions/_echoti
> +share/zsh/${V}/functions/_elfdump
> share/zsh/${V}/functions/_elinks
> share/zsh/${V}/functions/_elm
> share/zsh/${V}/functions/_email_addresses
> @@ -245,6 +252,7 @@ share/zsh/${V}/functions/_expand
> share/zsh/${V}/functions/_expand_alias
> share/zsh/${V}/functions/_expand_word
> share/zsh/${V}/functions/_extensions
> +share/zsh/${V}/functions/_external_pwds
> share/zsh/${V}/functions/_fakeroot
> share/zsh/${V}/functions/_fc
> share/zsh/${V}/functions/_feh
> @@ -256,6 +264,7 @@ share/zsh/${V}/functions/_file_descripto
> share/zsh/${V}/functions/_file_systems
> share/zsh/${V}/functions/_files
> share/zsh/${V}/functions/_find
> +share/zsh/${V}/functions/_find_net_interfaces
> share/zsh/${V}/functions/_finger
> share/zsh/${V}/functions/_fink
> share/zsh/${V}/functions/_first
> @@ -339,8 +348,11 @@ share/zsh/${V}/functions/_iptables
> share/zsh/${V}/functions/_irssi
> share/zsh/${V}/functions/_ispell
> share/zsh/${V}/functions/_iwconfig
> +share/zsh/${V}/functions/_jails
> share/zsh/${V}/functions/_java
> share/zsh/${V}/functions/_java_class
> +share/zsh/${V}/functions/_jexec
> +share/zsh/${V}/functions/_jls
> share/zsh/${V}/functions/_jobs
> share/zsh/${V}/functions/_jobs_bg
> share/zsh/${V}/functions/_jobs_builtin
> @@ -408,6 +420,7 @@ share/zsh/${V}/functions/_metaflac
> share/zsh/${V}/functions/_mh
> share/zsh/${V}/functions/_mii-tool
> share/zsh/${V}/functions/_mime_types
> +share/zsh/${V}/functions/_mixerctl
> share/zsh/${V}/functions/_mkdir
> share/zsh/${V}/functions/_mkshortcut
> share/zsh/${V}/functions/_mkzsh
> @@ -444,6 +457,7 @@ share/zsh/${V}/functions/_next_label
> share/zsh/${V}/functions/_next_tags
> share/zsh/${V}/functions/_nice
> share/zsh/${V}/functions/_nkf
> +share/zsh/${V}/functions/_nl
> share/zsh/${V}/functions/_nm
> share/zsh/${V}/functions/_nmap
> share/zsh/${V}/functions/_nmcli
> @@ -524,6 +538,8 @@ share/zsh/${V}/functions/_pump
> share/zsh/${V}/functions/_putclip
> share/zsh/${V}/functions/_pydoc
> share/zsh/${V}/functions/_python
> +share/zsh/${V}/functions/_python_modules
> +share/zsh/${V}/functions/_qdbus
> share/zsh/${V}/functions/_qemu
> share/zsh/${V}/functions/_qiv
> share/zsh/${V}/functions/_qtplay
> @@ -533,8 +549,10 @@ share/zsh/${V}/functions/_rake
> share/zsh/${V}/functions/_ranlib
> share/zsh/${V}/functions/_rar
> share/zsh/${V}/functions/_rcs
> +share/zsh/${V}/functions/_rdesktop
> share/zsh/${V}/functions/_read
> share/zsh/${V}/functions/_read_comp
> +share/zsh/${V}/functions/_readelf
> share/zsh/${V}/functions/_readshortcut
> share/zsh/${V}/functions/_rebootin
> share/zsh/${V}/functions/_redirect
> @@ -556,6 +574,7 @@ share/zsh/${V}/functions/_rsync
> share/zsh/${V}/functions/_rubber
> share/zsh/${V}/functions/_ruby
> share/zsh/${V}/functions/_run-help
> +share/zsh/${V}/functions/_runit
> share/zsh/${V}/functions/_sablotron
> share/zsh/${V}/functions/_samba
> share/zsh/${V}/functions/_savecore
> @@ -693,6 +712,7 @@ share/zsh/${V}/functions/_wajig
> share/zsh/${V}/functions/_wakeup_capable_devices
> share/zsh/${V}/functions/_wanna-build
> share/zsh/${V}/functions/_wanted
> +share/zsh/${V}/functions/_wc
> share/zsh/${V}/functions/_webbrowser
> share/zsh/${V}/functions/_wget
> share/zsh/${V}/functions/_whereis
> @@ -721,6 +741,7 @@ share/zsh/${V}/functions/_x_visual
> share/zsh/${V}/functions/_x_window
> share/zsh/${V}/functions/_xargs
> share/zsh/${V}/functions/_xauth
> +share/zsh/${V}/functions/_xautolock
> share/zsh/${V}/functions/_xclip
> share/zsh/${V}/functions/_xdvi
> share/zsh/${V}/functions/_xfig
> @@ -739,15 +760,16 @@ share/zsh/${V}/functions/_xt_session_id
> share/zsh/${V}/functions/_xterm
> share/zsh/${V}/functions/_xv
> share/zsh/${V}/functions/_xwit
> +share/zsh/${V}/functions/_xxd
> share/zsh/${V}/functions/_xz
> share/zsh/${V}/functions/_yafc
> share/zsh/${V}/functions/_yast
> -share/zsh/${V}/functions/_yast2
> 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
> share/zsh/${V}/functions/_zcalc_line
> share/zsh/${V}/functions/_zcat
> share/zsh/${V}/functions/_zcompile
> @@ -772,11 +794,13 @@ share/zsh/${V}/functions/_zstyle
> share/zsh/${V}/functions/_ztodo
> share/zsh/${V}/functions/_zypper
> share/zsh/${V}/functions/add-zsh-hook
> +share/zsh/${V}/functions/after
> share/zsh/${V}/functions/age
> share/zsh/${V}/functions/allopt
> share/zsh/${V}/functions/backward-kill-word-match
> share/zsh/${V}/functions/backward-word-match
> share/zsh/${V}/functions/bashcompinit
> +share/zsh/${V}/functions/before
> share/zsh/${V}/functions/calendar
> share/zsh/${V}/functions/calendar_add
> share/zsh/${V}/functions/calendar_edit
> @@ -860,16 +884,20 @@ share/zsh/${V}/functions/replace-string
> share/zsh/${V}/functions/replace-string-again
> share/zsh/${V}/functions/run-help
> share/zsh/${V}/functions/run-help-git
> +share/zsh/${V}/functions/run-help-ip
> share/zsh/${V}/functions/run-help-openssl
> share/zsh/${V}/functions/run-help-p4
> 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-bracketed
> +share/zsh/${V}/functions/select-quoted
> 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
> +share/zsh/${V}/functions/surround
> share/zsh/${V}/functions/tcp_alias
> share/zsh/${V}/functions/tcp_close
> share/zsh/${V}/functions/tcp_command
> @@ -889,6 +917,7 @@ share/zsh/${V}/functions/tcp_spam
> share/zsh/${V}/functions/tcp_talk
> share/zsh/${V}/functions/tcp_wait
> share/zsh/${V}/functions/tetris
> +share/zsh/${V}/functions/tetriscurses
> share/zsh/${V}/functions/throw
> share/zsh/${V}/functions/transpose-lines
> share/zsh/${V}/functions/transpose-words-match
>
