25435: Baptiste Daroussin <baptiste.daroussin@gmail.com>:

new and improved BSD completions
unposted: fix Solaris completion .distfiles

8 files changed, 106 insertions, 20 deletions

diff --git a/Completion/BSD/Command/.distfiles b/Completion/BSD/Command/.distfiles
index 188292f3e..0fc183522 100644
--- a/Completion/BSD/Command/.distfiles
+++ b/Completion/BSD/Command/.distfiles
@@ -1,5 +1,14 @@
 DISTFILES_SRC='
 .distfiles
-_bsd_pkg  _cvsup    _kld  _chflags
-_csup     _portlint _portsnap
+_bsd_pkg
+_chflags
+_csup
+_cvsup
+_fetch
+_freebsd-update
+_kld
+_portaudit
+_portlint
+_portsnap
+_powerd
 '
diff --git a/Completion/BSD/Command/_csup b/Completion/BSD/Command/_csup
index 1a19bd1e5..ad36000c2 100644
--- a/Completion/BSD/Command/_csup
+++ b/Completion/BSD/Command/_csup
@@ -4,17 +4,17 @@ _arguments -s \
     '-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]' \
diff --git a/Completion/BSD/Command/_fetch b/Completion/BSD/Command/_fetch
new file mode 100644
index 000000000..7ca59b2e0
--- /dev/null
+++ b/Completion/BSD/Command/_fetch
@@ -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'
diff --git a/Completion/BSD/Command/_freebsd-update b/Completion/BSD/Command/_freebsd-update
new file mode 100644
index 000000000..a47ac21d6
--- /dev/null
+++ b/Completion/BSD/Command/_freebsd-update
@@ -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[@]'
diff --git a/Completion/BSD/Command/_portaudit b/Completion/BSD/Command/_portaudit
new file mode 100644
index 000000000..879e4c537
--- /dev/null
+++ b/Completion/BSD/Command/_portaudit
@@ -0,0 +1,14 @@
+#compdef portaudit
+
+_arguments -s \
+    '-a[Vulnerability report for all installed packages]' \
+    '-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[Verbose mode]' \
+    '-r[Restrict listed vulnerabilities with eregex pattern]:eregex:' \
+    '-X[Download a fresh database]:days:' \
+    ':pkg-name:_files'
diff --git a/Completion/BSD/Command/_portlint b/Completion/BSD/Command/_portlint
index d3619bbca..4cbeb20c6 100644
--- a/Completion/BSD/Command/_portlint
+++ b/Completion/BSD/Command/_portlint
@@ -12,6 +12,6 @@ _arguments -s \
     '-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 -/'
diff --git a/Completion/BSD/Command/_portsnap b/Completion/BSD/Command/_portsnap
index 1808bcd20..505c7a321 100644
--- a/Completion/BSD/Command/_portsnap
+++ b/Completion/BSD/Command/_portsnap
@@ -11,13 +11,13 @@ flags=(
 )
 
 _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
diff --git a/Completion/BSD/Command/_powerd b/Completion/BSD/Command/_powerd
new file mode 100644
index 000000000..8b275ed89
--- /dev/null
+++ b/Completion/BSD/Command/_powerd
@@ -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]'