Clean up in preparation for update,
no functional change:

• indent more uniformly
• simplify slave port conditionals
• sort variables, pkg-plist