Sync strongswan with ports tree, also move part of customization to make.conf