Sync with what went into ports.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1533 058c260c-8361-11dd-a0ac-aa2bafec7d09