Update joyent and wip
Merge branch 'joyent/release/2013Q3' of github.com:joyent/pkgsrc into joyent/release/2013Q3
Update joyent and wip