"BUNDLED_BCRYPT" improvements and BSD Makefile restructures.

Finally a Makefile syntax that works on both OpenBSD and FreeBSD...