Updated with macports in mind