ivory-hxstream: port to latest ivory, fixup makefiles