Log message: Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk.