Log Message: Add patches from Jim Bernard to make this build on -current and fix a problem with basename(); bump PKGREVISION. Closes PR 20978 and PR 25733 by Jim Bernard.