e3bd203c5e
Chase commit 14e733a6bb and depend on the new port origin. While
here, remove excessive horizontal whitespace within the Makefile.