upgrade to latest nightly and removed hacks for building on freebsd.