Sync pkgsrc-wip with CVS 2014-11-13