Revised the package scripts to deal with new roxygen system.