Fix stupid error in last update (plus some pkglint -Wall cleanup).
No pkgrevision bump as last version would not have packaged

(abs)