- Take maintainership, des@ is no longer having enough time for zsh, he has done a

really great job with zsh, thanks a lot. [1]
- Upgrade to 4.3.11
- add linsysfs to the file system list for completion [2]
- fix mount completion when adding available labels to the list of devices [3]

PR:		ports/141472 [2], ports/145657 [3]
Submitted by:	scf [2], Frédéric Perrin <frederic.perrin _at_ resel.fr> [3]
Approved by:	des@ [1]

7 files changed, 26 insertions, 310 deletions

diff --git a/shells/zsh/files/_fstat b/shells/zsh/files/_fstat
deleted file mode 100644
index 553d07313c68..000000000000
--- a/shells/zsh/files/_fstat
+++ /dev/null
@@ -1,15 +0,0 @@
-#compdef fstat
-
-local pids
-pids=(${${${(f)"$(/usr/bin/procstat -ah)"}/[[:space:]]#/}/[[:space:]]*[[:space:]](ELF32[[:space:]]|-[[:space:]]#)/:})
-
-_arguments -s \
-'-f[Restrict examination to files open in the same file systems as the named file arguments]' \
-'-M[Extract values associated with the name list from the specified core]:core:_files' \
-'-N[Extract the name list from the specified system]:system:' \
-'-m[Include memory-mapped files in the listing]' \
-'-n[Numerical format]' \
-'-p[Report all files open by the specified process]:Process id:(($pids))' \
-'-u[Report all files open by the specified user]:User:_users' \
-'-v[Verbose mode]' \
-'*:Files:_files'
diff --git a/shells/zsh/files/_procstat b/shells/zsh/files/_procstat
deleted file mode 100644
index 476daa8212f9..000000000000
--- a/shells/zsh/files/_procstat
+++ /dev/null
@@ -1,17 +0,0 @@
-#compdef procstat
-
-local pids
-#get list of pids and associated process name as comment
-pids=(${${${(f)"$(/usr/bin/procstat -ah)"}/[[:space:]]#/}/[[:space:]]*[[:space:]](ELF32[[:space:]]|-[[:space:]]#)/:})
-
-_arguments -s \
-'-b[Display binary information for the process]' \
-'-c[Display command line arguments for the process]' \
-'-f[Display file descriptor information for the process]' \
-'-k[Display the stacks of kernel threads in the process]' \
-'-s[Display security credential information for the process]' \
-'-t[Display thread information for the process]' \
-'-v[Display virtual memory mappings for the process]' \
-'-h[Suppress table headers.]' \
-'-a[All processes]' \
-':Process id:(($pids))'
diff --git a/shells/zsh/files/extra-patch-bsdtar b/shells/zsh/files/extra-patch-bsdtar
index d5f79f8e27b6..ee7456f89a34 100644
--- a/shells/zsh/files/extra-patch-bsdtar
+++ b/shells/zsh/files/extra-patch-bsdtar
@@ -1,6 +1,6 @@
---- Completion/Unix/Type/_tar_archive.orig	Fri Aug  4 08:41:07 2006
-+++ Completion/Unix/Type/_tar_archive	Tue Jul 24 15:34:29 2007
-@@ -14,15 +14,8 @@
+--- ./Completion/Unix/Type/_tar_archive.orig	2009-12-05 18:29:12.000000000 +0100
++++ ./Completion/Unix/Type/_tar_archive	2011-02-27 23:44:32.000000000 +0100
+@@ -14,17 +14,8 @@
  _description files expl 'archive file'
  
  if [[ "$1" = *[urtx]* ]]; then
@@ -8,13 +8,15 @@
 -    _files "$expl[@]" -g '*.((tar|TAR).(gz|GZ|Z)|tgz)(-.)'
 -  elif [[ "$1" = *[Ijy]* ]]; then
 -    _files "$expl[@]" -g '*.(tar|TAR).bz2(-.)'
+-  elif [[ "$1" = *J* ]]; then
+-    _files "$expl[@]" -g '*.(tar|TAR).(lzma|xz)(-.)'
 -  elif [[ "$_cmd_variant[$service]" == gnu ]]; then
--    _files "$expl[@]" -g '*.((tar|TAR)(.gz|.GZ|.Z|.bz2|)|tgz)(-.)'
+-    _files "$expl[@]" -g '*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)'
 -  else
 -    _files "$expl[@]" -g '*.(tar|TAR)(-.)'
 -  fi
-+  # bsdtar/libarchive handle these automagically
-+  _files "$expl[@]" -g '*.((tar|TAR|iso|ISO|cpio).(|(gz|GZ|Z|bz2))|tgz|tbz|jar|zip)(-.)'
++   # bsdtar/libarchive handle these automagically
++   _files "$expl[@]" -g '*.((tar|TAR|iso|ISO|cpio).(|(gz|GZ|Z|bz2|lzma|xz))|tgz|tbz|jar|zip|txz)(-.)'
  else
    _files "$expl[@]"
  fi
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_pfctl b/shells/zsh/files/patch-Completion-BSD-Command-_pfctl
deleted file mode 100644
index dc99e66fd7f0..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_pfctl
+++ /dev/null
@@ -1,99 +0,0 @@
---- /dev/null	2008-11-21 09:33:25.000000000 +0100
-+++ Completion/BSD/Command/_pfctl	2008-11-21 09:33:27.645838087 +0100
-@@ -0,0 +1,96 @@
-+#compdef pfctl
-+
-+local pfctl_flush_modifiers pfctl_optimizer_level pfctl_show_modifiers pfctl_tables_command pfctl_debug_level
-+
-+pfctl_flush_modifiers=(
-+    'all:Flush all'
-+    'info:Flush the filter information'
-+    'nat:Flush the NAT rules'
-+    'osfp:Flush the passive operating system fingerprints'
-+    'queue:Flush the queue rules'
-+    'rules:Flush the filter rules'
-+    'state:Flush the stable table'
-+    'Sources:Flush the source tracking table'
-+    'Tables:Flush the tables'
-+)
-+
-+pfctl_show_modifiers=(
-+    'nat:Show the currently loaded NAT rules'
-+    'queue:Show the currently loaded queue rules'
-+    'rules:Show the currently loaded filter rules'
-+    'Anchors:Show the currently loaded anchors directly attached to the main ruleset'
-+    'state:Show the contents of the state table'
-+    'Sources:Show the contents of the source tracking table'
-+    'info:Show filter information'
-+    'labels:Show per-rule statistics of filter rules with labels'
-+    'timeouts:Show the current global timeouts'
-+    'memory:Show the current pool memory hard limits'
-+    'Tables:Show the list of tables'
-+    'osfp:Show the list of operating system fingerprints'
-+    'Interfaces:Show the list of interfaces and interface drivers available to PF'
-+    'all:Show all except for the lists of interfaces and operating system fingerprints'
-+)
-+
-+pfctl_optimizer_level=(
-+    'none:Disable the ruleset optimizer'
-+    'basic:Enable basic ruleset optimizations'
-+    'profile:Enable basic ruleset optimizations with profiling'
-+)
-+pfctl_tables_command=(
-+    'kill:Kill a table'
-+    'flush:Flush all addresses of a table'
-+    'add:Add one or more addresses in a table'
-+    'delete:Delete one or more addresses from a table'
-+    'expire:Delete addresses which had their statistics cleared more than number seconds ago'
-+    'replace:Replace the addresses of the table'
-+    'show:Show the content (addresses) of a table'
-+    'test:Test if the given addresses match a table'
-+    'zero:Clear all the statistics of a table'
-+    'load:Load only the table definitions from pf.conf(5)'
-+)
-+pfctl_debug_level=(
-+    "none:Don\'t generate debug messages" 
-+    'urgent:Generate debug messages only for serious errors' 
-+    'misc:Generate debug messages for various errors' 
-+    'loud:Generate debug messages for common conditions'
-+)
-+_iface() {
-+    local pfctl_iface
-+    pfctl_iface=($(pfctl -s Interfaces))
-+    compadd $pfctl_iface
-+}
-+_tables() {
-+    local pfctl_tables
-+    pfctl_tables=($(pfctl -s Tables))
-+     compadd $pfctl_tables
-+}
-+# TODO:
-+# Missing -a
-+#
-+_arguments -s \
-+    '-F[Flush the filter parameters specified by modifier]:modifier:(($pfctl_flush_modifiers))' \
-+    '-A[Load only the queue rules present in the rule file]' \
-+    '-D[Define macro to be set to value]:macro:' \
-+    '-d[Disable the packet filter]' \
-+    '-e[Enable the packet filter]' \
-+    '-f[Load the rules contained in a file]:configuration file:_files' \
-+    '-g[Include output helpful for debugging]' \
-+    '-h[Help]' \
-+    '-i[Restrict the operation to the given interface]:interface:_iface' \
-+    '-K[Kill all of the source tracking entries originating from the specified host or network]:host or network:_hosts' \
-+    '-k[Kill all of the state entries originating from the specified host or network]:host or network:_hosts' \
-+    '-m[Merge in explicitly given options]' \
-+    '-N[Load only the NAT rules present in the rule file]' \
-+    '-n[Do not actually load rules, just parse them]' \
-+    '-O[Load only the options present in the rule file]' \
-+    '-o[Control the ruleset optimizer]:level:(($pfctl_optimizer_level))' \
-+    '-p[Use the device file device instead of the default /dev/pf]:device:_files' \
-+    '-q[Only print errors and warnings]' \
-+    '-R[Load only the filter rules present in the rule file]' \
-+    '-r[Perform reverse DNS lookups on states when displaying them]' \
-+    '-s[Show the filter parameters specified by modifier]:modifier:(($pfctl_show_modifiers ))' \
-+    '-T[Specify the command to apply to the table]:command:(($pfctl_tables_command))' \
-+    '-t[Specify the name of the table]:table:_tables' \
-+    '-v[Produce more verbose output]' \
-+    '-x[Set the debug level]:debug level:(($pfctl_debug_level))' \
-+    '-z[Clear per-rule statistics]'
diff --git a/shells/zsh/files/patch-Completion-BSD-Command-_portaudit b/shells/zsh/files/patch-Completion-BSD-Command-_portaudit
deleted file mode 100644
index 3616b9c2124f..000000000000
--- a/shells/zsh/files/patch-Completion-BSD-Command-_portaudit
+++ /dev/null
@@ -1,21 +0,0 @@
---- Completion/BSD/Command/_portaudit.orig	2008-08-12 12:27:51.000000000 +0200
-+++ Completion/BSD/Command/_portaudit	2008-11-21 09:26:15.328376479 +0100
-@@ -2,13 +2,13 @@
- 
- _arguments -s \
-     '-a[Vulnerability report for all installed packages]' \
--    '-C[Vulnerability report for the port in the current working directory]' \
-+    '-C[Vulnerability report for the port in the current working directory]' \
-     '-d[Print creation date of the database]' \
--    '-f[Check the packages listed in file]:file:_files' \
-     '-F[Fetch the current database]' \
-     '-q[Quiet mode]' \
--    '-V[Show portaudit version number]' \
-+    '-V[Show portaudit version number]' \
-     '-v[Verbose mode]' \
-+    '-X[Download a fresh database from least days old]:days:' \
-+    '-f[Check the packages listed in file]:file:_files' \
-     '-r[Restrict listed vulnerabilities with eregex pattern]:eregex:' \
--    '-X[Download a fresh database]:days:' \
--    ':pkg-name:_files'
-+    ':pkg-name:'
diff --git a/shells/zsh/files/patch-Completion-Unix-Command-_mount b/shells/zsh/files/patch-Completion-Unix-Command-_mount
index 4de9b537984f..eaa4e4eee6a9 100644
--- a/shells/zsh/files/patch-Completion-Unix-Command-_mount
+++ b/shells/zsh/files/patch-Completion-Unix-Command-_mount
@@ -1,137 +1,11 @@
---- Completion/Unix/Command/_mount
-+++ Completion/Unix/Command/_mount
-@@ -41,10 +41,10 @@ fi
- 
- local curcontext="$curcontext" state line expl suf ret=1
- local args deffs=iso9660 tmp typeops=-t _nfs_access _fs_nfs _nfs_ufs \
--_fs_ufs _fs_efs _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs _fs_hsfs \
--_fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos _fs_umsdos \
--_fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs _fs_xfs _fs_std _fs_devfs \
--_fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs
-+_fs_ufs _fs_efs _fs_cd9660 _fs_iso9660 _fs_cachefs _fs_s5fs _fs_tmpfs _fs_pcfs \
-+_fs_hsfs _fs_advfs _fs_cdfs _fs_affs _fs_ext2 _fs_fat _fs_ext3 _fs_msdos \
-+_fs_msdosfs _fs_umsdos _fs_vfat _fs_hpfs _fs_ntfs _fs_reiserfs _fs_smbfs \
-+_fs_xfs _fs_std _fs_devfs _fs_fdesc _fs_kernfs _fs_linprocfs _fs_procfs
- 
- typeset -A opt_args
- 
-@@ -527,7 +527,7 @@ if (( ! $+_fs_any )); then
-       'swidth[specify stripe width]:size'
-     )
-     ;;
--  *freebsd*|dragonfly*)
-+  freebsd*|dragonfly*)
-     _fs_any=(
-       '(sync)async[do all I/O asynchronously]'
-       'current[use current options on already mounted file system]'
-@@ -548,12 +548,12 @@ if (( ! $+_fs_any )); then
-       'update[change status of already mounted filesystem]'
-       'union[cause the namespace at the mount point to appear as the union of the mounted filesystem and the existing directory]'
-     )
--    _fs_iso9660=(
--      'extatt[enable use of extended attributes]'
--      "gens[don't strip version number on files]"
--      "joliet[don't use any Joliet extensions]"
--      "rrip[don't use any Rockridge extensions]"
--      'strictjoliet[relax checking for Supplementary Volume Descriptor Flags field which is set to a wrong value on some Joliet formatted disks]'
-+    _fs_cd9660=(
-+      'extatt[enable the use of extended attributes]'
-+      'gens[do not strip version numbers on files]'
-+      'nojoliet[do not use any Joliet extensions]'
-+      'norrip[do not use any Rockridge extensions]'
-+      'nostrictjoliet[relax checking for Supplementary Volume Descriptor Flags field]'
-     )
-     _fs_std=(
-       "nodev[don't interpret devices]"
-@@ -571,7 +571,13 @@ if (( ! $+_fs_any )); then
-       'shortnames[]'
-       'longnames[]'
-       'nowin95[]'
-+      'shortnames[force only the old MS-DOS 8.3 style filenames to be visible]'
-+      'longnames[force Windows 95 long filenames to be visible]'
-+      'nowin95[completely ignore Windows 95 extended file information]'
-     )
-+    if [[ "${OSTYPE}" =~ freebsd.* ]]; then
-+	    _fs_msdosfs=( "$_fs_msdos[@]" )
-+    fi
-     ;;
-   esac
- fi
-@@ -682,7 +688,7 @@ if [[ "$service" = mount ]]; then
-     deffs=hsfs
-     typeops=-F
-     ;;
--  *freebsd*|dragonfly*)
-+  freebsd*|dragonfly*)
-     args=( -s
-       '(:)-a[mount all filesystems in fstab]'
-       '-d[cause everything to be done except for the actual system call]'      
-@@ -757,7 +763,7 @@ else
- 	'*:dev or dir:->udevordir'
-       )
-     ;;
--    *freebsd*|dragonfly*)
-+    freebsd*|dragonfly*)
-       args=(
- 	'(*)-a[unmount all mounted file systems]'
- 	'-A[unmount all mounted file systems except the root]'
-@@ -819,7 +825,28 @@ devordir)
-   fi
- 
-   case "$OSTYPE" in
--  *freebsd*|dragonfly*)
-+  dragonfly*)
-+    while read mline; do 
-+      case $mline[(w)1] in
-+	\#* )
-+	  ;;
-+	proc)
-+	  ;;
-+	*)
-+	  [[ $mline[(w)3] == swap ]] || \
-+	    dev_tmp+=( $mline[(w)1] ) \
-+	    mp_tmp+=( $mline[(w)2] )
-+	  ;;
-+      esac
-+    done < /etc/fstab
-+
-+    _alternative \
-+      'hosts:host:_hosts -S :' \
-+      'devices:device:compadd -a dev_tmp' \
-+      'directories:mount point:compadd -a mp_tmp' && ret=0
-+      ;;
-+  freebsd*)
-+    local _glabel
-     while read mline; do 
-       case $mline[(w)1] in
- 	\#* )
-@@ -833,6 +860,16 @@ devordir)
- 	  ;;
-       esac
-     done < /etc/fstab
-+    # 
-+    /sbin/ggatel list | while read mline; do
-+      dev_tmp+=(/dev/$mline)
-+    done
-+
-+    # add glabel devices
-+    _glabel=(${(M)${(f)"$(/sbin/glabel list)"}:#*Name:[[:space:]]*/*})
-+    for mline ($_glabel);do
-+	    dev_tmp+=( mline[(w)3] )
-+    done
+--- ./Completion/Unix/Command/_mount.orig	2009-08-28 17:10:39.000000000 +0200
++++ ./Completion/Unix/Command/_mount	2011-02-28 00:34:40.000000000 +0100
+@@ -868,7 +868,7 @@
+     # add glabel devices
+     _glabel=(${(M)${(f)"$(/sbin/glabel list)"}:#*Name:[[:space:]]*/*})
+     for mline ($_glabel);do
+-	    dev_tmp+=( mline[(w)3] )
++	    dev_tmp+=( /dev/$mline[(w)3] )
+     done
  
      _alternative \
-       'hosts:host:_hosts -S :' \
-@@ -859,6 +896,12 @@ udevordir)
-     dev_tmp=( "${(@)${(@)tmp%% *}:#none}" )
-     mp_tmp=( "${(@)${(@)tmp#* }%% *}" )
-     ;;
-+  freebsd*|dragonfly*)
-+    /sbin/mount | while read mline; do
-+      dev_tmp+=( $mline[(w)1] )
-+      mp_tmp+=( $mline[(w)3] )
-+    done
-+  ;;
-   *)
-     /sbin/mount | while read mline; do
-       mp_tmp+=( $mline[(w)1] )
diff --git a/shells/zsh/files/patch-Completion-Unix-Type-_file_systems b/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
index 99171b9bdc75..ac856a90f3f1 100644
--- a/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
+++ b/shells/zsh/files/patch-Completion-Unix-Type-_file_systems
@@ -1,19 +1,11 @@
---- Completion/Unix/Type/_file_systems
-+++ Completion/Unix/Type/_file_systems
-@@ -16,10 +16,15 @@ case $OSTYPE in
-   ;;
-   osf*) fss=( advfs ufs nfs mfs cdfs ) ;;
-   solaris*) fss=( ufs nfs hsfs s5fs pcfs cachefs tmpfs ) ;;
--  freebsd*|dragonfly*)
-+  dragonfly*)
-     fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdos nfs 
+--- ./Completion/Unix/Type/_file_systems.orig	2009-06-04 14:53:41.000000000 +0200
++++ ./Completion/Unix/Type/_file_systems	2011-02-28 00:47:20.000000000 +0100
+@@ -21,7 +21,7 @@
            ntfs null nwfs portal procfs std udf ufs umap union )
    ;;
-+  freebsd*)
-+    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdosfs nfs
-+    ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs 
-+    reiserfs xfs)
-+  ;;
-   darwin*)
-     fss=( afp cd9660 cddafs devfs fdesc hfs lfs msdos nfs
-           ntfs smbfs synthfs udf ufs volfs webdav )
+   freebsd*)
+-    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs mfs msdosfs nfs
++    fss=( cd9660 devfs ext2fs fdesc kernfs linprocfs linsysfs mfs msdosfs nfs
+     ntfs nullfs nwfs portal procfs smbfs std udf ufs umap unionfs 
+     reiserfs xfs)
+   ;;