Newer version upstream
Build fix for SunOS
Code cleanup
Build fix on NetBSD (not observed myself)
Build fix for SunOS
Avoid using $(LIBDIR) when not really available