While here: * Reorder some variables. * Remove post-patch section * Regenerate patch with makepatch Accumulated change log: * Remove a bogus symlink, and release some merged changes that resolve licence issues. * Removed more stale auto* files Reported by: portscout Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D17422