Some fixes for pkgsrc 2013Q2.