A and B and C reads badly

try: "only one of -l, -s, and -D may be used"

I like this re-organization to avoid #undef ugliness... Please do mention it in the commit message

Can you rename this to Dflag to match the case of the flag, given that there's also a -d?

Can you throw these tokens in a separate #define up above as well? DELIMITERS or something to that effect.

Also, style(9) spaces around =

style(9) spaces around =

Inconsistent omission of braces around single-line clauses

Spaces around =

Spaces around =

Spaces around =

Spaces around =

Spaces around =

This doesn't seem to match the given commit message, which indicates that the flag was called -r

This one seems to have actually been missed; the braces should be omitted here like on the other one-line blocks.

These left more inconsistent omission of braces for single line blocks, but otherwise also a good change that should be noted in the commit message. =)

Here

Here

Here

Here

Here

Here

Here

Here

renamed to rflag to match dragongflybsd.

I went the reverse: adding braces to all single line blocks. style(9) makes it optional, I prefer it.