Just a cleanup commit sorting the Makefile according to portclippy
suggestions, and reducing the number of times we check for a headless
build, as suggested by vsasjason_gmail.com.
This commit does not increase the PORTREVISION as it does not introduce
any changes to functionality or dependencies.
Sponsored by: The FreeBSD Foundation