Sync pkgsrc-wip with CVS 2014-12-04