Upgrade to 4.3.9. Most of our local patches have been committed upstream.

This commit is contained in:
Dag-Erling Smørgrav 2008-11-10 13:40:56 +00:00
parent 3024f52ace
commit 0ce6819834
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=222684
16 changed files with 95 additions and 745 deletions

View file

@ -21,8 +21,7 @@
# NOTE: does NOT have to be inside ${PREFIX} tree
PORTNAME= zsh
PORTVERSION= 4.3.6
PORTREVISION= 8
PORTVERSION= 4.3.9
CATEGORIES= shells
MASTER_SITES= SF
.if !defined(NOPORTDOCS)

View file

@ -1,6 +1,6 @@
MD5 (zsh-4.3.6.tar.bz2) = 16f399af1081ad3c303a794c9c7dc47e
SHA256 (zsh-4.3.6.tar.bz2) = 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
SIZE (zsh-4.3.6.tar.bz2) = 2527972
MD5 (zsh-4.3.6-doc.tar.bz2) = cab29228a90f58b1431a66ab24a0a0c2
SHA256 (zsh-4.3.6-doc.tar.bz2) = a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
SIZE (zsh-4.3.6-doc.tar.bz2) = 2473544
MD5 (zsh-4.3.9.tar.bz2) = 0539d0a590e545ad8c40ff8c97e94538
SHA256 (zsh-4.3.9.tar.bz2) = 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
SIZE (zsh-4.3.9.tar.bz2) = 2659602
MD5 (zsh-4.3.9-doc.tar.bz2) = b3a026cf02471b66454a2b241a4d92a4
SHA256 (zsh-4.3.9-doc.tar.bz2) = 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
SIZE (zsh-4.3.9-doc.tar.bz2) = 2570995

View file

@ -1,30 +0,0 @@
--- Completion/BSD/Command/_csup.orig 2007-07-20 18:39:15.000000000 +0200
+++ Completion/BSD/Command/_csup 2008-08-13 19:00:33.890223677 +0200
@@ -4,17 +4,17 @@
'-1[disable automatic retries]' \
'-4[Force usage of IPv4 addresses]' \
'-6[Force usage of IPv6 addresses]' \
- '-A:local address:_hosts' \
- '-b:base directory:_files -/' \
- '-c:collections directory:_files -/' \
- '-d:maximum number of deleted files:' \
- '-h:server host:_hosts' \
- '-i:file pattern:' \
+ '-A[Local address to bind to when connecting to the server]:local address:_hosts' \
+ '-b[Base directory]:base directory:_files -/' \
+ '-c[Subdirectory of base for information about collections]:collections directory:_files -/' \
+ '-d[maximum number of deleted files]:maximum number of deleted files:' \
+ '-h[Server host]:server host:_hosts' \
+ '-i[Include only files and directories matching]:file pattern:' \
'-k[keep temporary copies of failed updates]' \
- '-l:lock file:_files' \
- '-L:verbosity level:(0 1 2)' \
- '-p:port:_ports' \
- '-r:maximum number of retries:' \
+ '-l[Lock file]:lock file:_files' \
+ '-L[Verbosity level]:verbosity level:(0 1 2)' \
+ '-p[Server port]:port:_ports' \
+ '-r[maximum number of retries]:maximum number of retries:' \
'-s[suppress status checks]' \
'-v[print version information]' \
'(-Z)-z[enable compression]' \

View file

@ -1,33 +0,0 @@
--- Completion/BSD/Command/_fetch.orig 2008-08-12 13:52:12.422331053 +0200
+++ Completion/BSD/Command/_fetch 2008-08-07 16:33:14.000000000 +0200
@@ -0,0 +1,30 @@
+#compdef fetch
+# Deprecated arguments are removed from the completion
+
+_arguments -s \
+ '-1[Stop and return exit code 0 at the first successfully retrieved file]' \
+ '-4[Forces fetch to use IPv4 addresses only]' \
+ '-6[Forces fetch to use IPv6 addresses only]' \
+ '-A[Do not automatically follow "temporary" (302) redirects]' \
+ '-a[Automatically retry the transfer upon soft failures]' \
+ '-B[Specify the read buffer size in bytes]:bytes:' \
+ '-d[Use a direct connection even if a proxy is configured]' \
+ '-F[In combination with the -r flag, forces a restart]' \
+ '-l[If the target is a file-scheme URL, make a symbolic link to the target]' \
+ '-M' \
+ '-m[Mirror mode]' \
+ '-N[Use file instead of ~/.netrc to look up login names and pass- words for FTP sites]' \
+ '-n[Do not preserve the modification time]' \
+ '-o[Set the output file name]:file:_files' \
+ '-P' \
+ '-p[Use passive FTP]' \
+ '-q[Quiet mode]' \
+ '-R[Do not delete the output file in any circumstances]' \
+ '-r[Restart a previously interrupted transfer]' \
+ '-S[Require the file size reported by the server to match the specified value]' \
+ '-s[Print the size in bytes, without fetching it]' \
+ '-T[Set timeout value]:seconds:' \
+ '-U[When using passive FTP, allocate the port for the data connection from the low port range]' \
+ '-v[Increase verbosity level]' \
+ '-w[wait successive retries]:seconds:' \
+ '*:URL to fetch:_urls'

View file

@ -1,23 +0,0 @@
--- Completion/BSD/Command/_freebsd-update.orig 2008-08-12 13:52:12.415323508 +0200
+++ Completion/BSD/Command/_freebsd-update 2008-08-07 23:17:13.000000000 +0200
@@ -0,0 +1,20 @@
+#compdef freebsd-update
+
+local flags
+flags=(
+ '(cron)fetch[Fetch a compressed snapshot or update existing one]'
+ '(fetch)cron[Sleep rand(3600) seconds, and then fetch updates]'
+ '(install rollback)upgrade[Fetch files necessary for upgrading to a new release]'
+ '(upgrade rollback)install[Install the most recently fetched updates or upgrade]'
+ '(upgrade install)rollback[Uninstall the most recently installed updates]'
+)
+
+_arguments -s \
+ '-b[Operate on a system mounted at basedir]:basedir:_files -/' \
+ '-d[Store working files in workdir]:workdir:_files -/' \
+ '-f[Read configuration options from conffile]:conf file:_files' \
+ '-k[Trust an RSA key with SHA256 of KEY]:RSA key:' \
+ '-r[Specify the new release]:new release:' \
+ '-s[Fetch files from the specified server or server pool]:server:_hosts' \
+ '-f[Mail output of cron command, if any, to address]:address:' \
+ ':command:_values -S " " -w "commands" $flags[@]'

View file

@ -1,11 +0,0 @@
--- Completion/BSD/Command/_portlint.orig 2007-07-20 18:39:15.000000000 +0200
+++ Completion/BSD/Command/_portlint 2008-08-13 19:00:33.915251533 +0200
@@ -12,6 +12,6 @@
'-t[nit pick about use of spaces]' \
'-N[writing a new port]' \
'-V[print the version and exit]' \
- '-M:set make variables to ENV (ex. PORTSDIR=/usr/ports.work):_guard ".#" "environment vars"' \
- '-B:allow # contiguous blank lines:_guard "[0-9]#" "numeric value"' \
+ '-M[set make variables to ENV (ex. PORTSDIR=/usr/ports.work)]: :_guard ".#" "environment vars"' \
+ '-B[allow # contiguous blank lines]: :_guard "[0-9]#" "numeric value"' \
':port directory:_files -/'

View file

@ -1,22 +0,0 @@
--- Completion/BSD/Command/_portsnap.orig 2007-07-22 13:40:02.000000000 +0200
+++ Completion/BSD/Command/_portsnap 2008-08-13 19:00:33.920251572 +0200
@@ -11,13 +11,13 @@
)
_arguments -C -s \
- '-d:Store working files in workdir:_files -/' \
- '-f:Read configuration options from conffile:_files' \
+ '-d[Store working files in workdir]:workdir:_files -/' \
+ '-f[Read configuration options from conffile]:conf file:_files' \
'-I[Update INDEX only. (update command only)]' \
- '-k:Trust an RSA key with SHA256 hash of KEY:_files' \
- '-l:Merge the specified local describes file into the INDEX:_files' \
- '-p:Location of uncompressed ports tree:_files -/' \
- '-s:Server from which to fetch updates:_hosts' \
+ '-k[Trust an RSA key with SHA256 hash of KEY]:RSA key:_files' \
+ '-l[Merge the specified local describes file into the INDEX]:file:_files' \
+ '-p[Location of uncompressed ports tree]:uncompressed ports tree:_files -/' \
+ '-s[Server from which to fetch updates]:server:_hosts' \
'*:principal:->principal' && ret=0
if [[ $state == principal ]]; then

View file

@ -1,16 +0,0 @@
--- Completion/BSD/Command/_powerd.orig 2008-08-12 13:52:12.426336561 +0200
+++ Completion/BSD/Command/_powerd 2008-08-07 16:03:57.000000000 +0200
@@ -0,0 +1,13 @@
+#compdef powerd
+
+local powerd_mode
+powerd_mode=(minimum maximum adaptative)
+_arguments -s \
+ "-a[Mode to use while on AC power]:mode:($powerd_mode)" \
+ "-b[Mode to use while on battery power]:mode:($powerd_mode)" \
+ '-i[CPU idle percent level when begin to degrade performance]:percent:' \
+ "-n[mode to use normally when the AC line state is unknown]:mode:($powerd_mode)" \
+ '-p[polling interval (in milliseconds) for AC line state and system idle levels]:interval:' \
+ '-P[Alternative pidfile]:pidfile:_files' \
+ '-r[CPU idle percent level where to increase performance]:percent:' \
+ '-v[Verbose mode]'

View file

@ -1,241 +0,0 @@
--- Completion/BSD/Command/_zfs.orig 2008-08-12 13:52:12.447355005 +0200
+++ Completion/BSD/Command/_zfs 2008-08-11 21:01:43.000000000 +0200
@@ -0,0 +1,238 @@
+#compdef zfs
+
+_zfs() {
+ local context state line expl
+ typeset -A opt_args
+ local -a subcmds rw_properties rw_propnames ro_properties
+
+ subcmds=(
+ "create" "destroy" "clone" "promote" "rename" "snapshot"
+ "rollback" "list" "set" "get" "inherit" "mount" "unmount"
+ "share" "unshare" "send" "receive" "allow" "unallow"
+ "upgrade"
+ )
+
+ ro_properties=(
+ "name" "type" "creation" "used" "available" "referenced"
+ "compressratio" "mounted" "origin"
+ )
+
+ # TODO: Be cleverer about what values can be set. Is there any way to
+ # set the sorting for *size properties to false by default?
+ rw_properties=(
+ "aclinherit:value:(discard noallow secure passthrough)"
+ "aclmode:value:(discard groupmask passthrough)"
+ "atime:value:(on off)"
+ "canmount:value:(on off)"
+ "checksum:value:(on off fletcher2 fletcher4 sha256)"
+ "compression:value:(on off lzjb gzip gzip-{1..9})"
+ "copies:value:(1 2 3)"
+ "devices:value:(on off)"
+ "exec:value:(on off)"
+ "mountpoint:value:{if [[ -prefix /* ]]; then _path_files -/; else _wanted mountpoints expl 'mountpoint (type \"/\" to start completing paths)' compadd legacy none; fi}"
+ "quota:number or 'none':{if [[ -prefix [0-9]## ]]; then _message -e 'number'; elif [[ $PREFIX == quota= ]]; then _wanted none expl 'number or none' compadd none; else _wanted none expl 'quota' compadd none; fi}"
+ "readonly:value:(on off)"
+ "recordsize:value:(512 1K 2K 4K 8K 16K 32K 64K 128K)"
+ "reservation:value:" # <size>, "none"
+ "setuid:value:(on off)"
+ "shareiscsi:value:(on off)" # or "type=<type>"
+ "sharenfs:value:(on off)" # or share(1M) options
+ "snapdir:value:(hidden visible)"
+ "version:value:(1 2 current)"
+ "volblocksize:value:(512 1K 2K 4K 8K 16K 32K 64K 128K)"
+ "volsize:value:" # <size>
+ "xattr:value:(on off)"
+ "zoned:value:(on off)"
+ )
+
+ rw_propnames=( ${rw_properties%%:*} )
+
+ if [[ $service == "zfs" ]]; then
+ _arguments -C -A "-*" \
+ '-\?[Help]' \
+ '*::command:->subcmd' && return 0
+
+ if (( CURRENT == 1 )); then
+ _wanted commands expl "zfs subcommand" compadd -a subcmds
+ return
+ fi
+ service="$words[1]"
+ curcontext="${curcontext%:*}=$service:"
+ fi
+
+ case $service in
+ ("create")
+ _arguments -A "-*" \
+ '-p[Create parent datasets]' \
+ '-o[Set initial properties]:property:_values -s , "property" $rw_properties' \
+ - set1 \
+ ':filesystem:' \
+ - set2 \
+ '-s[Create sparse volume]' \
+ '-b[Set volblocksize]:blocksize:' \
+ '-V[Set size]:size:' \
+ ':volume:'
+ ;;
+
+ ("destroy")
+ _arguments -A "-*" \
+ '-r[Recursively destroy all children]' \
+ '-R[Recursively destroy all dependents]' \
+ '-f[Force unmounts]' \
+ ':filesystem/volume/snapshot:_zfs_dataset'
+ ;;
+
+ ("snapshot")
+ _arguments -A "-*" \
+ '-r[Recursively snapshot all descendant datasets]' \
+ ':filesystem/volume:_zfs_dataset -t fs -t vol -S@'
+ ;;
+
+ ("rollback")
+ _arguments -A "-*" \
+ '-r[Recursively destroy more recent snapshots]' \
+ '-R[Recursively destroy more recent snapshots and clones]' \
+ '-f[Force unmounts]' \
+ ':snapshot:_zfs_dataset -t snap'
+ ;;
+
+ ("clone")
+ # XXX needs to bail if there are no snapshots
+ _arguments -A "-*" \
+ '-p[Create parent datasets]' \
+ ':snapshot:_zfs_dataset -t snap' \
+ ':filesystem/volume:'
+ ;;
+
+ ("promote")
+ # XXX complete only cloned filesystems
+ _arguments \
+ ':filesystem:_zfs_dataset -t fs' \
+ ;;
+
+ ("rename")
+ _arguments -A "-*" \
+ - set1 \
+ '-p[Create parent datasets]' \
+ ':filesystem/volume/snapshot:_zfs_dataset' \
+ ':filesystem/volume/snapshot:' \
+ - set2 \
+ '-r[Recursively rename snapshots of all descendent datasets]' \
+ ':snapshot:_zfs_dataset -t snap' \
+ ':snapshot:'
+ ;;
+
+ ("list")
+ _arguments -A "-*" \
+ '-r[Recursively display children]' \
+ '-H[Scripting mode]' \
+ '-o[Properties to list]:property:_values -s , "property" $ro_properties $rw_propnames' \
+ '*-s[Sort key (ascending)]:property:_values "property" $ro_properties $rw_propnames' \
+ '*-S[Sort key (descending)]:property:_values "property" $ro_properties $rw_propnames' \
+ '-t[Dataset types to list]:dataset type:_values -s , "dataset type" filesystem snapshot volume' \
+ '*:filesystem/volume/snapshot:_zfs_dataset'
+ ;;
+
+ ("set")
+ _arguments \
+ ':property:_values -s , "property" $rw_properties' \
+ '*:filesystem/volume:_zfs_dataset -t fs -t vol'
+ ;;
+
+ ("get")
+ _arguments -A "-*" \
+ "-r[Recursively display children's properties]" \
+ '-H[Scripting mode]' \
+ '-p[Display numbers exactly]' \
+ '-s[Specify sources]:source:_values -s , "source" local default inherited temporary none' \
+ '-o[Specify fields]:field:_values -s , "field" name property value source' \
+ ':property:_values -s , "property" $ro_properties $rw_propnames all' \
+ '*:filesystem/volume/snapshot:_zfs_dataset'
+ ;;
+
+ ("inherit")
+ _arguments -A "-*" \
+ '-r[Recursively inherit property for all children]' \
+ ':property:_values -s , "property" $ro_properties $rw_properties' \
+ '*:filesystem/volume:_zfs_dataset -t fs -t vol'
+ ;;
+
+ ("mount")
+ _arguments -A "-*" \
+ '-o[Mount options]:mount options:_values -s , "option" {,no}{devices,exec,setuid} ro rw' \
+ '-O[Overlay mount]' \
+ '-v[Report mount progress]' \
+ - set1 \
+ ':filesystem:_zfs_dataset -t fs' \
+ - set2 \
+ '-a[Mount all available ZFS filesystems]'
+ ;;
+
+ ("unmount")
+ _arguments -A "-*" \
+ - set1 \
+ '-f[Force unmount]' \
+ ':filesystem:_zfs_dataset -t fs -t mtpt' \
+ - set2 \
+ '-a[Unmount all ZFS filesystems]'
+ ;;
+
+ ("share")
+ _arguments -A "-*" \
+ - set1 \
+ '-a[Share all available ZFS filesystems]' \
+ - set2 \
+ ':filesystem:_zfs_dataset -t fs'
+ ;;
+
+ ("unshare")
+ _arguments -A "-*" \
+ - set1 \
+ '-a[Unshare all shared ZFS filesystems]' \
+ - set2 \
+ '-F[Force unshare]' \
+ ':filesystem:_zfs_dataset -t fs -t mtpt'
+ ;;
+
+ ("send")
+ _arguments -A "-*" \
+ '-i[Generate an incremental stream]:snapshot:_zfs_dataset -t snap' \
+ ':snapshot:_zfs_dataset -t snap'
+ ;;
+
+ ("receive")
+ _arguments -A "-*" \
+ '-v[Verbose]' \
+ '-n[Do not receive the stream]' \
+ '-F[Force a rollback if necessary]' \
+ - set1 \
+ ':filesystem/volume/snapshot:_zfs_dataset' \
+ - set2 \
+ '-d[Set path prefix]:filesystem:_zfs_dataset -t fs'
+ ;;
+
+ ("allow"|"unallow")
+ _message "unimplemented zfs subcommand: $service"
+ ;;
+
+ ("upgrade")
+ _arguments -A "-*" \
+ - set1 \
+ '-v[Verbose]' \
+ - set2 \
+ '-a[Upgrade all filesystems on all pools]' \
+ '-r[Upgrade descendent filesystems, too]' \
+ '-V[Upgrade to specified version]:version:(1 2)' \
+ - set3 \
+ '-r[Upgrade descendent filesystems, too]' \
+ '-V[Upgrade to specified version]:version:(1 2)' \
+ ':filesystem:_zfs_dataset -t fs' \
+ ;;
+
+ (*)
+ _message "unknown zfs subcommand: $service"
+ ;;
+ esac
+}
+
+_zfs "$@"

View file

@ -1,25 +0,0 @@
--- Completion/BSD/Command/_zfs_dataset.orig 2008-08-12 13:52:12.453362430 +0200
+++ Completion/BSD/Command/_zfs_dataset 2008-08-11 21:02:13.000000000 +0200
@@ -0,0 +1,22 @@
+#autoload
+
+local -a type typearg list
+
+zparseopts -D -E -a type t+:
+
+[[ -n $type[(r)fs] ]] && typearg=( filesystem )
+[[ -n $type[(r)vol] ]] && typearg=( $typearg volume )
+[[ -n $type[(r)snap] ]] && typearg=( $typearg snapshot )
+[[ -n $typearg ]] && typearg=( -t ${(j:,:)typearg} )
+
+datasetlist=( ${="$(zfs list -H -o name $typearg)":#no datasets available} )
+
+expl_type=${typearg[2,-1]//,/\/}
+if [[ -n $type[(r)mtpt] ]]; then
+ mlist=( ${="$(zfs list -H -o mountpoint $typearg)":#no mountpoints available} )
+ datasetlist=( $datasetlist $mlist )
+ expl_type="$expl_type/mountpoint"
+fi
+
+# compadd "$@" - $list
+_wanted dataset expl "$expl_type" _multi_parts "$@" / datasetlist

View file

@ -1,6 +0,0 @@
--- Completion/BSD/Command/_zfs_pool.orig 2008-08-12 13:52:12.459367620 +0200
+++ Completion/BSD/Command/_zfs_pool 2008-08-11 21:02:23.000000000 +0200
@@ -0,0 +1,3 @@
+#autoload
+
+compadd "$@" - $(zpool list -H -o name)

View file

@ -1,204 +0,0 @@
--- Completion/BSD/Command/_zpool.orig 2008-08-12 13:52:12.465374207 +0200
+++ Completion/BSD/Command/_zpool 2008-08-11 21:01:58.000000000 +0200
@@ -0,0 +1,201 @@
+#compdef zpool
+
+_zpool() {
+ local -a subcmds fields
+
+ subcmds=(
+ create destroy add remove list iostat status online
+ offline clear attach detach replace scrub import export
+ upgrade history get set
+ )
+
+ fields=(
+ name\:"Pool name" size\:"Total size" used\:"Space used"
+ available\:"Space available" capacity\:"Space used (percentage)"
+ health\:"Health status"
+ )
+
+ properties=(
+ "bootfs:value:"
+ "autoreplace:value:(on off)"
+ "delegation:value:(on off)"
+ )
+ propnames=( ${properties%%:*} )
+
+ import_properties=(
+ xattr
+ copies
+ shareiscsi
+ canmount
+ share
+ sharenfs
+ userprop
+ mount
+ )
+
+ if [[ $service == "zpool" ]]; then
+ _arguments -C -A "-*" \
+ '-\?[Help]' \
+ '*::command:->subcmd' && return 0
+
+ if (( CURRENT == 1 )); then
+ _wanted commands expl "zpool subcommand" compadd -a subcmds
+ return
+ fi
+ service="$words[1]"
+ curcontext="${curcontext%:*}=$service:"
+ fi
+
+ case $service in
+ (clear)
+ _arguments \
+ ':pool name:_zfs_pool' \
+ '*:virtual device:_files'
+ ;;
+
+ (create)
+ # TODO: investigate better vdev handling
+ _arguments -A "-*" \
+ '-f[Force use of in-use devices]' \
+ '-n[Display configuration without creating pool]' \
+ '-R[Use alternate root]:alternate root:_files -/' \
+ '-m[Set mountpoint for root dataset]:mountpoint:' \
+ ':pool name:' \
+ '*:virtual device:_files'
+ ;;
+
+ (destroy)
+ _arguments -A "-*" \
+ '-f[Force active datasets to be unmounted]' \
+ ':pool name:_zfs_pool'
+ ;;
+
+ (add)
+ _arguments -A "-*" \
+ '-f[Force use of in-use devices]' \
+ '-n[Display configuration without modifying pool]' \
+ ':pool name:_zfs_pool' \
+ '*:virtual device:_files'
+ ;;
+
+ (list)
+ _arguments \
+ '-H[Scripted mode]' \
+ '-o[Fields to list]:field:_values -s , "field" ${^fields/\:/[}\]' \
+ '::pool name:_zfs_pool'
+ ;;
+
+ (iostat)
+ _arguments -A "-*" \
+ '-v[Verbose statistics]' \
+ '*::pool name:_zfs_pool' \
+ '::interval:' \
+ '::count:'
+ ;;
+
+ (status)
+ _arguments -A "-*" \
+ '-v[Verbose information]' \
+ '-x[Show only unhealthy pools]' \
+ '*::pool name:_zfs_pool'
+ ;;
+
+ (offline)
+ _arguments -A "-*" \
+ '-t[Offline until next reboot]' \
+ ':pool name:_zfs_pool' \
+ '*:virtual device:_files'
+ ;;
+
+ (online)
+ _arguments \
+ ':pool name:_zfs_pool' \
+ '*:virtual device:_files'
+ ;;
+
+ (attach)
+ # TODO: first device should choose first from existing.
+ _arguments \
+ '-f[Force attach, even if in use]' \
+ ':pool name:_zfs_pool' \
+ ':virtual device:_files' \
+ ':virtual device:_files'
+ ;;
+
+ (detach)
+ _arguments \
+ ':pool name:_zfs_pool' \
+ ':virtual device:_files'
+ ;;
+
+ (replace)
+ _arguments -A "-*" \
+ '-f[Force attach, even if in use]' \
+ ':pool name:_zfs_pool' \
+ ':virtual device:_files' \
+ '::virtual device:_files'
+ ;;
+
+ (scrub)
+ _arguments -A "-*" \
+ '-s[Stop scrubbing]' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (export)
+ _arguments -A "-*" \
+ '-f[Forcefully unmount all datasets]' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (import)
+ # TODO: -o should complete options
+ _arguments -A "-*" \
+ '*-d[Search for devices or files in directory]:_files -/' \
+ '-D[Destroyed pools]' \
+ '-f[Force import]' \
+ - set1 \
+ '-o[Mount options]' \
+ '-p[Set property]:property:_values -s , "property" $import_properties' \
+ '-R[Alternate root]:_files -/' \
+ '*:pool name or id:_zfs_pool' \
+ '::new pool name:' \
+ - set2 \
+ '-a[All pools]'
+ ;;
+
+ (get)
+ _arguments -A "-*" \
+ ':property:_values -s , "property" $propnames all' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (set)
+ _arguments -A "-*" \
+ ':property:_values -s , "property" $properties' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (upgrade)
+ _arguments -A "-*" \
+ - set1 \
+ '-v[Display ZFS versions and descriptions]' \
+ - set2 \
+ '-a[Upgrade all pools]' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (history)
+ _arguments -A "-*" \
+ '-i[Display internal events]' \
+ '-l[Long format]' \
+ '*:pool name:_zfs_pool'
+ ;;
+
+ (*)
+ _message "unknown zpool subcommand: $service"
+ ;;
+ esac
+}
+
+_zpool "$@"

View file

@ -1,11 +0,0 @@
--- Completion/Unix/Command/_locate.orig 2006-09-27 09:50:25.000000000 -0500
+++ Completion/Unix/Command/_locate 2007-08-20 22:08:08.000000000 -0500
@@ -11,7 +11,7 @@
;;
(locate)
- input="$(_call_program locate $words[1] -V)"
+ input="$(_call_program locate $words[1] -V 2>&1)"
case $input in
(*mlocate*)
ltype=mlocate

View file

@ -1,28 +0,0 @@
--- Src/Zle/compresult.c.orig 2008-05-07 10:19:11.000000000 -0300
+++ Src/Zle/compresult.c 2008-05-07 10:19:35.000000000 -0300
@@ -1188,6 +1188,12 @@
{
int was_meta;
+ /* Just list the matches if the list was requested. */
+ if (lst == COMP_LIST_COMPLETE) {
+ showinglist = -2;
+ return;
+ }
+
/* Already metafied when called from domenuselect already */
if (zlemetaline == NULL) {
was_meta = 0;
@@ -1195,12 +1201,6 @@
} else
was_meta = 1;
- /* Just list the matches if the list was requested. */
- if (lst == COMP_LIST_COMPLETE) {
- showinglist = -2;
- return;
- }
-
/* Otherwise go to the next match in the array... */
do {
if (!*++(minfo.cur)) {

View file

@ -1,60 +0,0 @@
--- configure.ac.orig 2008-03-28 12:49:32.000000000 +0100
+++ configure.ac 2008-05-05 09:47:30.860369561 +0200
@@ -669,20 +669,20 @@
termcap_curses_order="$ncursesw_test tinfo termcap $ncurses_test curses" ;;
esac])dnl
-AH_TEMPLATE([ZSH_CURSES_NEEDS_XOPEN],
-[Define if the curses libraries need _XOPEN_SOURCE_EXTENDED defined])
-AC_CACHE_CHECK(if the curses library needs _XOPEN_SOURCE_EXTENDED,
-zsh_cv_curses_needs_xopen,
+AH_TEMPLATE([ZSH_NO_XOPEN],
+[Define if _XOPEN_SOURCE_EXTENDED should not be defined to avoid clashes])
+AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
+zsh_cv_no_xopen,
-[case "$host_os" in
- *openbsd*)
- zsh_cv_curses_needs_xopen=no
+[[case "$host_os" in
+ *openbsd*|*freebsd5*|*freebsd6.[012]*)
+ zsh_cv_no_xopen=yes
;;
*)
- zsh_cv_curses_needs_xopen=yes
+ zsh_cv_no_xopen=no
;;
-esac])
+esac]])
-if test x$zsh_cv_curses_needs_xopen = xyes; then
- AC_DEFINE(ZSH_CURSES_NEEDS_XOPEN)
+if test x$zsh_cv_no_xopen = xyes; then
+ AC_DEFINE(ZSH_NO_XOPEN)
fi
dnl Check for tigetflag (terminfo) before tgetent (termcap).
--- Src/system.h.orig 2007-12-14 13:43:33.000000000 +0100
+++ Src/system.h 2008-05-05 09:50:17.333164563 +0200
@@ -52,9 +52,20 @@
# undef HAVE_SYS_UTSNAME_H
#endif
-#if defined(ZSH_CURSES_SOURCE) && defined(ZSH_CURSES_NEEDS_XOPEN)
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
+#ifndef ZSH_NO_XOPEN
+# ifdef ZSH_CURSES_SOURCE
+# define _XOPEN_SOURCE_EXTENDED 1
+# else
+# ifdef MULTIBYTE_SUPPORT
+/*
+ * Needed for wcwidth() which is part of XSI.
+ * Various other uses of the interface mean we can't get away with just
+ * _XOPEN_SOURCE.
+ */
+# define _XOPEN_SOURCE_EXTENDED 1
+# endif /* MULTIBYTE_SUPPORT */
+# endif /* ZSH_CURSES_SOURCE */
+#endif /* ZSH_NO_XOPEN */
/*
* Solaris by default zeroes all elements of the tm structure in

View file

@ -46,7 +46,7 @@ bin/zsh-%%ZSH_VER%%
%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
%%NO_STATIC%%@dirrm lib/zsh
@exec mkdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
@unexec rmdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
@dirrmtry %%ZSH_SITEFNDIR%%
%%ZSH_FNDIR%%/Calendar/age
%%ZSH_FNDIR%%/Calendar/calendar
%%ZSH_FNDIR%%/Calendar/calendar_add
@ -76,13 +76,10 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/BSD/_fetch
%%ZSH_FNDIR%%/Completion/BSD/_freebsd-update
%%ZSH_FNDIR%%/Completion/BSD/_kld
%%ZSH_FNDIR%%/Completion/BSD/_portaudit
%%ZSH_FNDIR%%/Completion/BSD/_portlint
%%ZSH_FNDIR%%/Completion/BSD/_portsnap
%%ZSH_FNDIR%%/Completion/BSD/_powerd
%%ZSH_FNDIR%%/Completion/BSD/_zfs
%%ZSH_FNDIR%%/Completion/BSD/_zfs_dataset
%%ZSH_FNDIR%%/Completion/BSD/_zfs_pool
%%ZSH_FNDIR%%/Completion/BSD/_zpool
%%ZSH_FNDIR%%/Completion/Base/_all_labels
%%ZSH_FNDIR%%/Completion/Base/_all_matches
%%ZSH_FNDIR%%/Completion/Base/_alternative
@ -188,6 +185,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
%%ZSH_FNDIR%%/Completion/Debian/_dput
%%ZSH_FNDIR%%/Completion/Debian/_dupload
%%ZSH_FNDIR%%/Completion/Debian/_grep-excuses
%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
%%ZSH_FNDIR%%/Completion/Debian/_lighttpd
%%ZSH_FNDIR%%/Completion/Debian/_linda
@ -212,9 +210,13 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Linux/_acpitool
%%ZSH_FNDIR%%/Completion/Linux/_analyseplugin
%%ZSH_FNDIR%%/Completion/Linux/_brctl
%%ZSH_FNDIR%%/Completion/Linux/_chrt
%%ZSH_FNDIR%%/Completion/Linux/_ethtool
%%ZSH_FNDIR%%/Completion/Linux/_fuse_arguments
%%ZSH_FNDIR%%/Completion/Linux/_fuse_values
%%ZSH_FNDIR%%/Completion/Linux/_fusermount
%%ZSH_FNDIR%%/Completion/Linux/_ionice
%%ZSH_FNDIR%%/Completion/Linux/_ipset
%%ZSH_FNDIR%%/Completion/Linux/_iptables
%%ZSH_FNDIR%%/Completion/Linux/_iwconfig
%%ZSH_FNDIR%%/Completion/Linux/_losetup
@ -224,6 +226,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Linux/_mondo
%%ZSH_FNDIR%%/Completion/Linux/_pkgtool
%%ZSH_FNDIR%%/Completion/Linux/_sshfs
%%ZSH_FNDIR%%/Completion/Linux/_strace
%%ZSH_FNDIR%%/Completion/Linux/_tpb
%%ZSH_FNDIR%%/Completion/Linux/_tpconfig
%%ZSH_FNDIR%%/Completion/Linux/_tune2fs
@ -247,6 +250,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_arp
%%ZSH_FNDIR%%/Completion/Unix/_arping
%%ZSH_FNDIR%%/Completion/Unix/_attr
%%ZSH_FNDIR%%/Completion/Unix/_awk
%%ZSH_FNDIR%%/Completion/Unix/_baz
%%ZSH_FNDIR%%/Completion/Unix/_bind_addresses
%%ZSH_FNDIR%%/Completion/Unix/_bison
@ -286,6 +290,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_diffstat
%%ZSH_FNDIR%%/Completion/Unix/_dir_list
%%ZSH_FNDIR%%/Completion/Unix/_directories
%%ZSH_FNDIR%%/Completion/Unix/_django
%%ZSH_FNDIR%%/Completion/Unix/_dmidecode
%%ZSH_FNDIR%%/Completion/Unix/_domains
%%ZSH_FNDIR%%/Completion/Unix/_du
@ -318,6 +323,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_global
%%ZSH_FNDIR%%/Completion/Unix/_global_tags
%%ZSH_FNDIR%%/Completion/Unix/_gnu_generic
%%ZSH_FNDIR%%/Completion/Unix/_gnupod
%%ZSH_FNDIR%%/Completion/Unix/_gnutls
%%ZSH_FNDIR%%/Completion/Unix/_gpg
%%ZSH_FNDIR%%/Completion/Unix/_gphoto2
@ -333,6 +339,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_iconv
%%ZSH_FNDIR%%/Completion/Unix/_id
%%ZSH_FNDIR%%/Completion/Unix/_ifconfig
%%ZSH_FNDIR%%/Completion/Unix/_iftop
%%ZSH_FNDIR%%/Completion/Unix/_imagemagick
%%ZSH_FNDIR%%/Completion/Unix/_init_d
%%ZSH_FNDIR%%/Completion/Unix/_ip
@ -341,6 +348,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_java
%%ZSH_FNDIR%%/Completion/Unix/_java_class
%%ZSH_FNDIR%%/Completion/Unix/_joe
%%ZSH_FNDIR%%/Completion/Unix/_join
%%ZSH_FNDIR%%/Completion/Unix/_killall
%%ZSH_FNDIR%%/Completion/Unix/_knock
%%ZSH_FNDIR%%/Completion/Unix/_kvno
@ -406,6 +414,10 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_pine
%%ZSH_FNDIR%%/Completion/Unix/_ping
%%ZSH_FNDIR%%/Completion/Unix/_pkg-config
%%ZSH_FNDIR%%/Completion/Unix/_pkg_instance
%%ZSH_FNDIR%%/Completion/Unix/_pkgadd
%%ZSH_FNDIR%%/Completion/Unix/_pkginfo
%%ZSH_FNDIR%%/Completion/Unix/_pkgrm
%%ZSH_FNDIR%%/Completion/Unix/_pon
%%ZSH_FNDIR%%/Completion/Unix/_ports
%%ZSH_FNDIR%%/Completion/Unix/_postfix
@ -427,6 +439,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_renice
%%ZSH_FNDIR%%/Completion/Unix/_ri
%%ZSH_FNDIR%%/Completion/Unix/_rlogin
%%ZSH_FNDIR%%/Completion/Unix/_rm
%%ZSH_FNDIR%%/Completion/Unix/_rrdtool
%%ZSH_FNDIR%%/Completion/Unix/_rsync
%%ZSH_FNDIR%%/Completion/Unix/_rubber
@ -443,9 +456,11 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_sisu
%%ZSH_FNDIR%%/Completion/Unix/_slrn
%%ZSH_FNDIR%%/Completion/Unix/_socket
%%ZSH_FNDIR%%/Completion/Unix/_sort
%%ZSH_FNDIR%%/Completion/Unix/_spamassassin
%%ZSH_FNDIR%%/Completion/Unix/_sqsh
%%ZSH_FNDIR%%/Completion/Unix/_ssh
%%ZSH_FNDIR%%/Completion/Unix/_stgit
%%ZSH_FNDIR%%/Completion/Unix/_strip
%%ZSH_FNDIR%%/Completion/Unix/_stty
%%ZSH_FNDIR%%/Completion/Unix/_su
@ -456,6 +471,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_tar
%%ZSH_FNDIR%%/Completion/Unix/_tar_archive
%%ZSH_FNDIR%%/Completion/Unix/_tardy
%%ZSH_FNDIR%%/Completion/Unix/_tcpdump
%%ZSH_FNDIR%%/Completion/Unix/_tcptraceroute
%%ZSH_FNDIR%%/Completion/Unix/_telnet
%%ZSH_FNDIR%%/Completion/Unix/_terminals
@ -500,7 +516,11 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Unix/_yp
%%ZSH_FNDIR%%/Completion/Unix/_zcat
%%ZSH_FNDIR%%/Completion/Unix/_zdump
%%ZSH_FNDIR%%/Completion/Unix/_zfs
%%ZSH_FNDIR%%/Completion/Unix/_zfs_dataset
%%ZSH_FNDIR%%/Completion/Unix/_zfs_pool
%%ZSH_FNDIR%%/Completion/Unix/_zip
%%ZSH_FNDIR%%/Completion/Unix/_zpool
%%ZSH_FNDIR%%/Completion/X/_acroread
%%ZSH_FNDIR%%/Completion/X/_dcop
%%ZSH_FNDIR%%/Completion/X/_gnome-gv
@ -567,6 +587,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Zsh/_directory_stack
%%ZSH_FNDIR%%/Completion/Zsh/_dirs
%%ZSH_FNDIR%%/Completion/Zsh/_disable
%%ZSH_FNDIR%%/Completion/Zsh/_dynamic_directory_name
%%ZSH_FNDIR%%/Completion/Zsh/_echotc
%%ZSH_FNDIR%%/Completion/Zsh/_echoti
%%ZSH_FNDIR%%/Completion/Zsh/_emulate
@ -607,6 +628,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Zsh/_stat
%%ZSH_FNDIR%%/Completion/Zsh/_subscript
%%ZSH_FNDIR%%/Completion/Zsh/_suffix_alias_files
%%ZSH_FNDIR%%/Completion/Zsh/_tcpsys
%%ZSH_FNDIR%%/Completion/Zsh/_tilde
%%ZSH_FNDIR%%/Completion/Zsh/_trap
%%ZSH_FNDIR%%/Completion/Zsh/_ttyctl
@ -619,6 +641,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Completion/Zsh/_vars
%%ZSH_FNDIR%%/Completion/Zsh/_wait
%%ZSH_FNDIR%%/Completion/Zsh/_which
%%ZSH_FNDIR%%/Completion/Zsh/_zcalc_line
%%ZSH_FNDIR%%/Completion/Zsh/_zcompile
%%ZSH_FNDIR%%/Completion/Zsh/_zed
%%ZSH_FNDIR%%/Completion/Zsh/_zftp
@ -675,6 +698,7 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Prompts/prompt_fire_setup
%%ZSH_FNDIR%%/Prompts/prompt_off_setup
%%ZSH_FNDIR%%/Prompts/prompt_oliver_setup
%%ZSH_FNDIR%%/Prompts/prompt_pws_setup
%%ZSH_FNDIR%%/Prompts/prompt_redhat_setup
%%ZSH_FNDIR%%/Prompts/prompt_special_chars
%%ZSH_FNDIR%%/Prompts/prompt_suse_setup
@ -699,6 +723,41 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/TCP/tcp_spam
%%ZSH_FNDIR%%/TCP/tcp_talk
%%ZSH_FNDIR%%/TCP/tcp_wait
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_bzr
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_cdv
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_cvs
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_darcs
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_git
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_hg
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_mtn
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_p4
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_svk
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_svn
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_detect_tla
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_bzr
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_cdv
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_cvs
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_darcs
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_git
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_hg
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_mtn
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_p4
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_svk
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_svn
%%ZSH_FNDIR%%/VCS_Info/Backends/VCS_INFO_get_data_tla
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_adjust
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_bydir_detect
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_check_com
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_formats
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_maxexports
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_nvcsformats
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_realpath
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_reposub
%%ZSH_FNDIR%%/VCS_Info/VCS_INFO_set
%%ZSH_FNDIR%%/VCS_Info/vcs_info
%%ZSH_FNDIR%%/VCS_Info/vcs_info_lastmsg
%%ZSH_FNDIR%%/VCS_Info/vcs_info_printsys
%%ZSH_FNDIR%%/VCS_Info/vcs_info_setsys
%%ZSH_FNDIR%%/Zftp/zfanon
%%ZSH_FNDIR%%/Zftp/zfautocheck
%%ZSH_FNDIR%%/Zftp/zfcd
@ -772,29 +831,31 @@ bin/zsh-%%ZSH_VER%%
%%ZSH_FNDIR%%/Zle/which-command
%%ZSH_FNDIR%%/Zle/zed-set-file-name
%%DATADIR%%/%%ZSH_VER%%/scripts/newuser
@dirrm %%ZSH_FNDIR%%/Calendar
@dirrm %%ZSH_FNDIR%%/Completion/AIX
@dirrm %%ZSH_FNDIR%%/Completion/BSD
@dirrm %%ZSH_FNDIR%%/Completion/Base
@dirrm %%ZSH_FNDIR%%/Completion/Cygwin
@dirrm %%ZSH_FNDIR%%/Completion/Darwin
@dirrm %%ZSH_FNDIR%%/Completion/Debian
@dirrm %%ZSH_FNDIR%%/Completion/Linux
@dirrm %%ZSH_FNDIR%%/Completion/Mandriva
@dirrm %%ZSH_FNDIR%%/Completion/Redhat
@dirrm %%ZSH_FNDIR%%/Completion/Unix
@dirrm %%ZSH_FNDIR%%/Completion/X
@dirrm %%ZSH_FNDIR%%/Completion/Zsh
@dirrm %%ZSH_FNDIR%%/Completion
@dirrm %%ZSH_FNDIR%%/Exceptions
@dirrm %%ZSH_FNDIR%%/MIME
@dirrm %%ZSH_FNDIR%%/Misc
@dirrm %%ZSH_FNDIR%%/Newuser
@dirrm %%ZSH_FNDIR%%/Prompts
@dirrm %%ZSH_FNDIR%%/TCP
@dirrm %%ZSH_FNDIR%%/Zftp
@dirrm %%ZSH_FNDIR%%/Zle
@dirrm %%ZSH_FNDIR%%/Zftp
@dirrm %%ZSH_FNDIR%%/VCS_Info/Backends
@dirrm %%ZSH_FNDIR%%/VCS_Info
@dirrm %%ZSH_FNDIR%%/TCP
@dirrm %%ZSH_FNDIR%%/Prompts
@dirrm %%ZSH_FNDIR%%/Newuser
@dirrm %%ZSH_FNDIR%%/Misc
@dirrm %%ZSH_FNDIR%%/MIME
@dirrm %%ZSH_FNDIR%%/Exceptions
@dirrm %%ZSH_FNDIR%%/Completion/Zsh
@dirrm %%ZSH_FNDIR%%/Completion/X
@dirrm %%ZSH_FNDIR%%/Completion/Unix
@dirrm %%ZSH_FNDIR%%/Completion/Redhat
@dirrm %%ZSH_FNDIR%%/Completion/Mandriva
@dirrm %%ZSH_FNDIR%%/Completion/Linux
@dirrm %%ZSH_FNDIR%%/Completion/Debian
@dirrm %%ZSH_FNDIR%%/Completion/Darwin
@dirrm %%ZSH_FNDIR%%/Completion/Cygwin
@dirrm %%ZSH_FNDIR%%/Completion/Base
@dirrm %%ZSH_FNDIR%%/Completion/BSD
@dirrm %%ZSH_FNDIR%%/Completion/AIX
@dirrm %%ZSH_FNDIR%%/Completion
@dirrm %%ZSH_FNDIR%%/Calendar
@dirrm %%ZSH_FNDIR%%
@dirrm %%DATADIR%%/%%ZSH_VER%%/scripts
@dirrm %%DATADIR%%/%%ZSH_VER%%
@dirrm %%DATADIR%%
@dirrmtry %%DATADIR%%