Revert PORTREVISION, no real need
Merge branch '5.8p2'

* 5.8p2:
  Revert PORTREVISION, no real need

Conflicts:
	Makefile