41855: completion option updates for OpenBSD 6.2 and handle macOS in rm completion

Completion/Unix/Command/_dhclient

@@ -7,13 +7,13 @@ case $OSTYPE in
     args+=(
       '-c+[specify configuration file]:file:_files'
       '-l+[specify leases file]:file:_files'
-      '-u[reject leases with unknown options]'
     )
   ;|
   freebsd*)
     args+=(
       '(-d)-b[immediately move to the background]'
       '-p+[specify PID file]:file:_files'
+      '-u[reject leases with unknown options]'
     )
   ;;
   openbsd*)

Completion/Unix/Command/_id

@@ -16,7 +16,7 @@ if _pick_variant gnu=GNU $OSTYPE --version; then
     '(- :)--version[display version]' \
     ':user:_users'
 else
-  choices="-A -a -c -G -g -M -p -P -u"
+  choices="-A -a -c -G -g -M -p -P -R -u"
   args=(
     "($choices)-g[print only EGID]"
     "($choices -r)-G[print all GIDs]"
@@ -31,6 +31,9 @@ else
 	'(-g -G -u -n -r)-p[show project membership]'
       )
     ;;
+    openbsd*)
+      args+=( '(-)-R[display the routing table of the current process]' )
+    ;;
     darwin*|dragonfly*|freebsd*)
       args+=( '(-)-P[print id in the form of a password file entry]' )
     ;|

Completion/Unix/Command/_rm

@@ -24,16 +24,20 @@ if _pick_variant gnu=gnu unix --help; then
 else
   args=(${args:#*)--*\[*})
   case $OSTYPE in
-    dragonfly*|freebsd*|netbsd*|openbsd*)
+    darwin*|dragonfly*|freebsd*|netbsd*|openbsd*)
       args+=(
         '-d[remove directories as well]'
         '-P[overwrite files before deleting them]'
+        '-v[explain what is being done]'
+      )
+    ;|
+    darwin*|dragonfly*|freebsd*|netbsd*)
+      args+=(
+        '-W[attempt to undelete named files]'
       )
     ;|
     dragonfly*|freebsd*|netbsd*)
       args+=(
-        '-v[explain what is being done]'
-        '-W[attempt to undelete named files]'
         "-x[don't cross file systems when removing a hierarchy]"
       )
     ;|