openbsd_pkg corner case fixes

These diffs make openbsd_pkg handle some pkg_add corner cases.