net/GeoIP has been deprecated but security/broccoli builds without
it; remove GeoIP dependency and undeprecate.

While we're here fix some portlint reported Makefile variable order
issues.

Approved by: ler (mentor, implicit)