Clean out existing macports
Clean out existing macports
Clean out existing macports
Clean out any existing macports
Use test-osx branch for now
Use test-osx branch for now
Use test-osx branch for now
Use test-osx branch for now
Use test-osx branch for now
Use test-osx branch for now
Merge branch 'test-osx' into devel
Merge branch 'devel' into stable