Update some packages

Some package updates from Niels Kristian Bach Jensen, and one update macro fix.

All affected packages still build OK.