OS-2161 want workaround for joyent/pkgsrc#50
Merge branch 'master' of git://github.com/joyent/smartos-live into ec