Log Message:
Fixed all pkglint warnings, based on the previous revision, since martti's
changes have been incorrect in some places.