(PUP-3604) Rework handling of :ensure with a version
Merge pull request #3266 from jasperla/openbsd/package_ensure

(PUP-3604) Rework handling of :ensure with a version