Add some additional mailbox definitions. Rename ICBOPT_PORTNAME to ICBOPT_BOTH_WWNS as being more descriptive.
Add some additional mailbox definitions. Rename ICBOPT_PORTNAME to
ICBOPT_BOTH_WWNS as being more descriptive.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars