Modified to work with changes to pkgtool_base
.