Restore the original formatting so that everything lines up nicely.
Reorder the priorities for choosing the what to compare the installed
package set against, when not explicitly specified.

Prefer using the ports index rather than comparing against the ports
tree (which is very slow).  This also returns to compatibility with
the old pkg_version behaviour.
Merge branch 'master' into testing