[FIX] included changes proposed by ryandesign@macports.org