Add missed PORTVERSION bump from r369854
And allow people building with options.

Noticed by:	hrs
Pointy hat to:	mat
Sponsored by:	Absolight
- Remove an old patch that does not apply anymore that I missed in the previous commit

Reviewed by:	bdrewery