Fix version string, improve package naming
Also removed PORTREVISION, as pkg version -t v2.1.1_1 2.1.1 results in "<"
Reported by: mat