K 10 svn:author V 7 mandree K 8 svn:date V 27 2019-08-19T22:09:56.250183Z K 7 svn:log V 68 Resolve conflicts and fix portlint warnings around USES= placement. END