Sync with pkgsrc CVS tag 2014Q3