- remove references to <malloc.h>, which failed the build in MacOS - silence a bunch more compiler warnings - don't use index() - roll in the two current pkgsrc patches - some tidyup PKGREVISION -> 7