Sync with pkgsrc CVS tag 2014Q3 and CVS wip 2014-11-08