MFH: r458058

Follow-up r458048: Properly trim FLAVOR from .MAKEOVERRIDES.

The code I removed was wrong but it still achieved the proper effect of
removing FLAVOR from .MAKEOVERRIDES. This is still needed and now is
done properly without truncating away all of the other valuable variables.

Pointyhat to: bdrewery
Approved by: portmgr (implicit)