Bump PKGREVISION to 1 because of this. While here, split the Makefile in two parts to help in the creation of the new catdoc-tk package. Addresses PR pkg/18730.