b442a1d600
This update also fixes broken builds. While here, reorder variables a bit. PR: 253297 Submitted by: freebsd-ports@dan.me.uk (maintainer)