Sync to pkgsrc proper for furthur debug and test.