Simplify MASTER_SITES=GNU/${PORTNAME} to MASTER_SITES=GNU.
Sort USES and USE_XORG properly. [1]
Reported by: portlint [1]