Sync with pkgsrc-2014Q2