Modifications advised after review on pkgsrc-wip-review mailing-list.