Fix bugs in, and clean up, calculation of which startupitem type to use in a given situation.
Fix bugs in, and clean up, calculation of which startupitem type to use
in a given situation.

git-svn-id: 620571fa9b4bd0cbce9a0cf901e91ef896adbf27@13705 d073be05-634f-4543-b044-5fe20cf6d1d6

macports/macports-base,macports/macports-base,danchr/macports-base,neverpanic/macports-base,neverpanic/macports-base,danchr/macports-base