update to proj 4.6.0 (second try)
revert the update to proj 4.6.0
update proj4 sources to version 4.6.0
make basemap-testing the trunk