PATCH: update option completion for newer FreeBSD

[Oliver Kiddle <opk@zsh.org>]

I'm rather behind with the usual process where I diff --help etc
output to identify new and changed options relative to the completion
functions. I'll try to catch up a bit. If anyone would like to help,
that'd be much appreciated, I can point you to the relevant scripts on
github.

As Daniel pointed out, the big patches are not easy to review. I
regularly manage to slip silly mistakes in, especially as the patches
have often sat around in my own repository for months first so I'll send
these out in smaller bites. My apologies if that means more noise on the
list.

To start with this patch covers FreeBSD (minus zfs) up to 12.2 (though
I think these changes all appeared earlier) - diff, uniq and
freebsd-update.

Oliver

diff --git a/Completion/BSD/Command/_freebsd-update b/Completion/BSD/Command/_freebsd-update
index d42457272..7dd907298 100644
--- a/Completion/BSD/Command/_freebsd-update
+++ b/Completion/BSD/Command/_freebsd-update
@@ -5,9 +5,11 @@ 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]'
+  'updatesready[check if there are fetched updates ready to install]'
   '(upgrade rollback)install[install the most recently fetched updates or upgrade]'
   '(upgrade install)rollback[uninstall the most recently installed updates]'
   'IDS[compare the system against an index of "known good" files]'
+  'showconfig[show configuration options after parsing conffile and command line options]'
 )
 
 _arguments \
diff --git a/Completion/Unix/Command/_uniq b/Completion/Unix/Command/_uniq
index 97f73b3ac..e123a94cd 100644
--- a/Completion/Unix/Command/_uniq
+++ b/Completion/Unix/Command/_uniq
@@ -23,8 +23,9 @@ args=(
 if ! _pick_variant gnu=Free\ Soft unix --version; then
   local optchars="cdufs"
   if [[ "$OSTYPE" == (darwin|dragonfly|freebsd|openbsd)* ]]; then
-    optchars="${optchars}i"
+    optchars+=i
   fi
+  [[ $OSTYPE = freebsd* ]] && optchars+=D
   args=( ${(M)args:#(|\*)(|\(*\))-[$optchars]*} )
 fi
 
diff --git a/Completion/Unix/Type/_diff_options b/Completion/Unix/Type/_diff_options
index 440913dff..dfa9889f2 100644
--- a/Completion/Unix/Type/_diff_options
+++ b/Completion/Unix/Type/_diff_options
@@ -70,9 +70,7 @@ if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->
       '(-E --ignore-tab-expansion)'{-E,--ignore-tab-expansion}'[ignore changes due to tab expansion]'
       '(-Z --ignore-trailing-space)'{-Z,--ignore-trailing-space}'[ignore white space at line end]'
       "($ofwuc $oss -F --show-function-line)"{-F+,--show-function-line=}'[show the most recent line matching regex]:regex'
-      "($ofwy $ouc --width -W)"{--width=,-W+}'[set size of line]:number of characters per line'
       "($ofwy $ouc)--left-column[output only left column of common lines]"
-      "($ofwy $ouc)--suppress-common-lines[do not output common lines]"
       "($ofwg $ouc $oss)--old-group-format=[set old group format]:old group format"
       "($ofwg $ouc $oss)--new-group-format=[set new group format]:new group format"
       "($ofwl $ouc $oss)--unchanged-line-format=[set unchanged line format]:unchanged line format"
@@ -80,8 +78,6 @@ if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->
       '(--from-file)--to-file=[compare all operands to specified file]:to file:_files' \
       '--color=-[use colors in output]::when [auto]:(never always auto)'
       '--palette=[specify colors to use]:color:_diff_palette'
-      "($of $ouc)--side-by-side[output in two columns]"
-      "($of $ouc)-y[output in two columns]"
     )
   else
     args+=( '!--speed-large-files' )
@@ -128,6 +124,9 @@ if _pick_variant -r variant -c $cmd gnu=GNU unix -v || [[ $OSTYPE = freebsd<12->
     '(-S --starting-file)'{-S+,--starting-file=}'[set first file in comparison]:start with file:_files' \
     '--horizon-lines=[set number of lines to keep in prefix and suffix]:number of horizon lines' \
     '(-d --minimal)'{-d,--minimal}'[try to find a smaller set of changes]' \
+    "($of $ouc)"{-y,--side-by-side}'[output in two columns]' \
+    "($ofwy $ouc)--suppress-common-lines[don't output common lines]" \
+    "($ofwy $ouc --width -W)"{--width=,-W+}'[set size of line]:number of characters per line' \
     "$@"
 else
   of='-c -e -f'