when a conditional is the last stament on the line, either make sure there's an extra new line or add some characters behind it.
"trim_blocks" is removing this new line otherwise (http://jinja.pocoo.org/docs/dev/api/#basics).

We now have a branch-adaptation approach so that tools.git can
be a lot less clever as to what goes on internally.  Most meta-
data already comes from here, which is more in line with ports
and plugins.  :)

When the target has no entries at all, it doesn't know how to merge.

This is a veeeeeeeeeeeery old bug, amplified by the fact that we do
weekly updates.  Fix by using the shiny new sample file plist code.

While there, make install provide output as well and
mop up a few minor issues with the previous code.