r3638: solaris packaging fixes