Merge pull request #4645 from akallabeth/mac_ports_removed

Fix #2617: Removed MacPorts from CMake (default) search path.

CMakeLists.txt

@@ -560,11 +560,6 @@ if(APPLE)
 		if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
 			set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
 		endif()
-
-		if(IS_DIRECTORY /opt/local/include)
-			include_directories(/opt/local/include)
-			link_directories(/opt/local/lib)
-		endif()
 	endif(IOS)
 
 # Temporarily disabled, causes the cmake script to be reexecuted, causing the compilation to fail.

cmake/FindUUID.cmake

@@ -37,7 +37,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
 			/usr/include
 			/usr/include/gdal
 			/sw/include # Fink
-			/opt/local/include # DarwinPorts
 			/opt/csw/include # Blastwave
 			/opt/include
 			[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
@@ -61,7 +60,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
 			/usr/local/lib
 			/usr/lib
 			/sw/lib
-			/opt/local/lib
 			/opt/csw/lib
 			/opt/lib
 			/usr/freeware/lib64
@@ -84,7 +82,6 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
 			/usr/local/lib
 			/usr/lib
 			/sw/lib
-			/opt/local/lib
 			/opt/csw/lib
 			/opt/lib
 			/usr/freeware/lib64

cmake/Findlibusb-1.0.cmake

@@ -53,7 +53,6 @@ libusb.h
     PATHS
       /usr/include
       /usr/local/include
-      /opt/local/include
       /sw/include
 PATH_SUFFIXES
 libusb-1.0
@@ -65,7 +64,6 @@ libusb-1.0
     PATHS
       /usr/lib
       /usr/local/lib
-      /opt/local/lib
       /sw/lib
   )