Backport pkgin 'pkg_add -f' fix from trunk.