On Tue, Nov 07, 2017 at 09:41:38PM -0600, Matthew Martin wrote:
> Ping (with pea@ this time and my apologies). Haven't run into issues in
> the past two months.
>
Oups sorry. I didn't see your update on ports@
ok pea@
Regards,
> - Matthew Martin
>
> On Sat, Sep 09, 2017 at 09:39:11PM -0500, Matthew Martin wrote:
> > Been running this for about a week now. The patch is only large because
> > I'd like to kill the needless whitespace changes in the _bsd_pkg
> > completion patch. I don't have a strong opinion on the matter if someone
> > prefers to keep it as is.
> >
> > - Matthew Martin
> >
> >
> > diff --git Makefile Makefile
> > index 58066551155..ebf02b2ed75 100644
> > --- Makefile
> > +++ Makefile
> > @@ -2,7 +2,7 @@
> >
> > COMMENT= Z shell, Bourne shell-compatible
> >
> > -V= 5.4.1
> > +V= 5.4.2
> > DISTNAME= zsh-$V
> > CATEGORIES= shells
> >
> > diff --git distinfo distinfo
> > index 0c68d09cc98..446c618c94b 100644
> > --- distinfo
> > +++ distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (zsh-5.4.1.tar.gz) = xEe4MsroZvUEWh6WP5vrcjFQJScSIkLjMibbBzwAHOI=
> > -SIZE (zsh-5.4.1.tar.gz) = 4468512
> > +SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
> > +SIZE (zsh-5.4.2.tar.gz) = 4482413
> > diff --git patches/patch-Completion_BSD_Command__bsd_pkg
> > patches/patch-Completion_BSD_Command__bsd_pkg
> > index 2386825e9f6..7e5b6e8c7d3 100644
> > --- patches/patch-Completion_BSD_Command__bsd_pkg
> > +++ patches/patch-Completion_BSD_Command__bsd_pkg
> > @@ -1,12 +1,7 @@
> > $OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.4 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/BSD/Command/_bsd_pkg.orig Wed Jan 21 14:53:28 2004
> > -+++ Completion/BSD/Command/_bsd_pkg Mon Jan 23 21:30:02 2006
> > +Index: Completion/BSD/Command/_bsd_pkg
> > +--- Completion/BSD/Command/_bsd_pkg.orig
> > ++++ Completion/BSD/Command/_bsd_pkg
> > @@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
> >
> > case $OSTYPE in
> > @@ -39,113 +34,7 @@ Subject: [PATCH] 37383: add completion type for object
> > files
> > }
> >
> > (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
> > -@@ -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
> > -@@ -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
> >
> > @@ -172,41 +61,7 @@ Subject: [PATCH] 37383: add completion type for object
> > files
> > '-c[show comment fields]'
> > '-D[show install-message files]'
> > '-d[show long descriptions]'
> > -@@ -188,30 +200,41 @@ _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]'
> > - )
> > +@@ -209,9 +221,20 @@ _bsd_pkg() {
> > ;;
> > esac
> >
> > diff --git pkg/PLIST pkg/PLIST
> > index b1658532fde..ffcdce0503d 100644
> > --- pkg/PLIST
> > +++ pkg/PLIST
> > @@ -155,6 +155,7 @@ share/zsh/${V}/functions/_bindkey
> > share/zsh/${V}/functions/_bison
> > share/zsh/${V}/functions/_bittorrent
> > share/zsh/${V}/functions/_bogofilter
> > +share/zsh/${V}/functions/_bpf_filters
> > share/zsh/${V}/functions/_bpython
> > share/zsh/${V}/functions/_brace_parameter
> > share/zsh/${V}/functions/_brctl
> > @@ -537,6 +538,7 @@ share/zsh/${V}/functions/_netstat
> > share/zsh/${V}/functions/_newsgroups
> > share/zsh/${V}/functions/_next_label
> > share/zsh/${V}/functions/_next_tags
> > +share/zsh/${V}/functions/_ngrep
> > share/zsh/${V}/functions/_nice
> > share/zsh/${V}/functions/_nkf
> > share/zsh/${V}/functions/_nl
> > @@ -657,6 +659,7 @@ share/zsh/${V}/functions/_retrieve_mac_apps
> > share/zsh/${V}/functions/_ri
> > share/zsh/${V}/functions/_rlogin
> > share/zsh/${V}/functions/_rm
> > +share/zsh/${V}/functions/_route
> > share/zsh/${V}/functions/_rpm
> > share/zsh/${V}/functions/_rpmbuild
> > share/zsh/${V}/functions/_rrdtool
> > @@ -812,6 +815,7 @@ share/zsh/${V}/functions/_vorbis
> > share/zsh/${V}/functions/_vorbiscomment
> > share/zsh/${V}/functions/_vserver
> > share/zsh/${V}/functions/_vux
> > +share/zsh/${V}/functions/_w
> > share/zsh/${V}/functions/_w3m
> > share/zsh/${V}/functions/_wait
> > share/zsh/${V}/functions/_wajig
> > @@ -825,6 +829,7 @@ share/zsh/${V}/functions/_webbrowser
> > share/zsh/${V}/functions/_wget
> > share/zsh/${V}/functions/_whereis
> > share/zsh/${V}/functions/_which
> > +share/zsh/${V}/functions/_who
> > share/zsh/${V}/functions/_whois
> > share/zsh/${V}/functions/_widgets
> > share/zsh/${V}/functions/_wiggle
