Update MacPorts file to 2014-02-R2 and include fixes from Whiterocker
Merge remote-tracking branch 'upstream/master'