"Port" is maybe overstating it a bit, but in order to build notmuch with Xapian 1.5 (aka Xapian master), notmuch needs to migrate away from some obsolete APIs, and not require use of chert databases in the test suite. With the three patches here, notmuch builds and the test suite (minus the deleted upgrade tests) passes.