OSX build: It is safe to revert 7a87974c now (MacPorts issue #42434 is fixed)
OSX build: Change configuration to build without X11