diff OLDMODULES/FindOpenAL.cmake MYCMAKEMODULES/FindOpenAL.cmake
11,12c11
< # Created by Eric Wing. This was influenced by the FindSDL.cmake 
< # module, but with modifications to recognize OS X frameworks.
---
> # Created by Eric Wing. This was influenced by the FindSDL.cmake module.
21,32c20,42
<   ~/Library/Frameworks/OpenAL.framework/Headers
<   /Library/Frameworks/OpenAL.framework/Headers
<   /System/Library/Frameworks/OpenAL.framework/Headers
<   $ENV{OPENALDIR}/include
<   /usr/include
<   /usr/include/AL
<   /usr/include/OpenAL
<   /usr/local/include/AL
<   /usr/local/include/OpenAL
<   /sw/include
<   /sw/include/AL
<   )
---
> 	$ENV{OPENALDIR}/include
> 	~/Library/Frameworks/OpenAL.framework/Headers
> 	/Library/Frameworks/OpenAL.framework/Headers
> 	/System/Library/Frameworks/OpenAL.framework/Headers # Tiger
> 	/usr/local/include/AL
> 	/usr/local/include/OpenAL
> 	/usr/local/include
> 	/usr/include/AL
> 	/usr/include/OpenAL
> 	/usr/include
> 	/sw/include/AL # Fink
> 	/sw/include/OpenAL 
> 	/sw/include
> 	/opt/local/include/AL # DarwinPorts
> 	/opt/local/include/OpenAL
> 	/opt/local/include
> 	/opt/csw/include/AL # Blastwave
> 	/opt/csw/include/OpenAL
> 	/opt/csw/include
> 	/opt/include/AL
> 	/opt/include/OpenAL
> 	/opt/include
> )
38c48,64
<   SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
---
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" OPENAL_FRAMEWORK_PATH_TMP ${OPENAL_INCLUDE_DIR})
> 	IF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
> 	ELSE("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(OPENAL_LIBRARY "-F${OPENAL_FRAMEWORK_PATH_TMP} -framework OpenAL" CACHE STRING "OpenAL framework for OSX")
> 	ENDIF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(OPENAL_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
40,48c66,77
<   FIND_LIBRARY(OPENAL_LIBRARY 
<     NAMES openal al OpenAL32
<     PATHS
<     $ENV{OPENALDIR}/lib
<     $ENV{OPENALDIR}/libs
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(OPENAL_LIBRARY 
> 		NAMES openal al OpenAL32
> 		PATHS
> 		$ENV{OPENALDIR}/lib
> 		$ENV{OPENALDIR}/libs
> 	    /usr/local/lib
> 	    /usr/lib
> 	    /sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c82
<   SET(OPENAL_FOUND "YES")
---
>         SET(OPENAL_FOUND "YES")
diff OLDMODULES/FindPhysFS.cmake MYCMAKEMODULES/FindPhysFS.cmake
18,26c18,33
<   ~/Library/Frameworks/PhysFS.framework/Headers
<   /Library/Frameworks/PhysFS.framework/Headers
<   $ENV{PHYSFSDIR}/include
<   /usr/include
<   /usr/include/physfs
<   /usr/local/include/physfs
<   /sw/include
<   /sw/include/physfs
<   )
---
> 	$ENV{PHYSFSDIR}/include
> 	~/Library/Frameworks/PhysFS.framework/Headers
> 	/Library/Frameworks/PhysFS.framework/Headers
> 	/usr/local/include/physfs
> 	/usr/local/include
> 	/usr/include/physfs
> 	/usr/include
> 	/sw/include/physfs # Fink
> 	/sw/include
> 	/opt/local/include/physfs # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/physfs # Blastwave
> 	/opt/csw/include
> 	/opt/include/physfs
> 	/opt/include
> )
32c39,55
<   SET (PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
---
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" PHYSFS_FRAMEWORK_PATH_TMP ${PHYSFS_INCLUDE_DIR})
> 	IF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
> 	ELSE("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(PHYSFS_LIBRARY "-F${PHYSFS_FRAMEWORK_PATH_TMP} -framework PhysFS" CACHE STRING "PhysFS framework for OSX")
> 	ENDIF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(PHYSFS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
34,41c57,67
<   FIND_LIBRARY(PHYSFS_LIBRARY 
<     NAMES physfs PhysFS
<     PATHS
<     $ENV{PHYSFSDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(PHYSFS_LIBRARY 
> 		NAMES physfs PhysFS
> 		PATHS
> 		$ENV{PHYSFSDIR}/lib
> 	    /usr/local/lib
> 	    /usr/lib
> 	    /sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> )
46c72
<   SET(PHYSFS_FOUND "YES")
---
> 	SET(PHYSFS_FOUND "YES")
diff OLDMODULES/FindSDL.cmake MYCMAKEMODULES/FindSDL.cmake
10,12c10
< # module will automatically add the -framework Cocoa on your behalf
< # though it is not necessarily visible in the UI. (Maybe somebody else
< # can fix this.)
---
> # module will automatically add the -framework Cocoa on your behalf.
36,48c34,53
<   ~/Library/Frameworks/SDL.framework/Headers
<   /Library/Frameworks/SDL.framework/Headers
<   $ENV{SDLDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL.framework/Headers
> 	/Library/Frameworks/SDL.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
54,59c59,82
<   # The Cocoa framework must be linked into SDL because SDL is Cocoa based.
<   # Remember that the OS X framework version expects you to drop in
<   # SDLmain.h and SDLmain.m directly into your project.
<   # (Cocoa link moved to bottom of this script.)
<   # SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
<   SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
---
> 	# The Cocoa framework must be linked into SDL because SDL is Cocoa based.
> 	# Remember that the OS X framework version expects you to drop in
> 	# SDLmain.h and SDLmain.m directly into your project.
> 	# (Cocoa link moved to bottom of this script.)
> 	# SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
>     # SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_FRAMEWORK_PATH_TEMP ${SDL_INCLUDE_DIR})
> 	IF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDL_LIBRARY_TEMP "-framework SDL")
> 	ELSE("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDL_LIBRARY_TEMP "-F${SDL_FRAMEWORK_PATH_TEMP} -framework SDL")
> 	ENDIF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDL_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
61,82c84,111
<   # SDL-1.1 is the name used by FreeBSD ports...
<   # don't confuse it for the version number.
<   FIND_LIBRARY(SDL_LIBRARY 
<     NAMES SDL SDL-1.1
<     PATHS
<     $ENV{SDLDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
<   # Non-OS X framework versions expect you to also dynamically link to 
<   # SDLmain. This is mainly for Windows and OS X. Other platforms 
<   # seem to provide SDLmain for compatibility even though they don't
<   # necessarily need it.
<   FIND_LIBRARY(SDLMAIN_LIBRARY 
<     NAMES SDLmain SDLmain-1.1
<     PATHS
<     $ENV{SDLDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	# SDL-1.1 is the name used by FreeBSD ports...
> 	# don't confuse it for the version number.
> 	FIND_LIBRARY(SDL_LIBRARY_TEMP 
> 		NAMES SDL SDL-1.1
> 	PATHS
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
> 	# Non-OS X framework versions expect you to also dynamically link to 
> 	# SDLmain. This is mainly for Windows and OS X. Other platforms 
> 	# seem to provide SDLmain for compatibility even though they don't
> 	# necessarily need it.
> 	FIND_LIBRARY(SDLMAIN_LIBRARY 
> 		NAMES SDLmain SDLmain-1.1
> 		PATHS
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
90c119
<   FIND_PACKAGE(Threads)
---
> 	FIND_PACKAGE(Threads)
97c126
<   SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
---
> 	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
101,126c130,158
< IF(SDL_LIBRARY)
<   # For SDLmain
<   IF(SDLMAIN_LIBRARY)
<     SET(SDL_LIBRARY ${SDLMAIN_LIBRARY} ${SDL_LIBRARY})
<   ENDIF(SDLMAIN_LIBRARY)
< 
<   # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
<   # CMake doesn't display the -framework Cocoa string in the UI even 
<   # though it actually is there. I think it has something to do 
<   # with the CACHE STRING. Maybe somebody else knows how to fix this.
<   # The problem is mainly cosmetic, and not a functional issue.
<   IF(APPLE)
<     SET(SDL_LIBRARY ${SDL_LIBRARY} "-framework Cocoa")
<   ENDIF(APPLE)
<   
<   # For threads, as mentioned Apple doesn't need this.
<   # In fact, there seems to be a problem if Find the threads package
<   # and try using this line, so I'm just skipping it entirely for OS X.
<   IF(NOT APPLE)
<     SET(SDL_LIBRARY ${SDL_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
<   ENDIF(NOT APPLE)
< 
<   # For MinGW library
<   IF(MINGW)
<     SET(SDL_LIBRARY ${MINGW32_LIBRARY} ${SDL_LIBRARY})
<   ENDIF(MINGW)
---
> IF(SDL_LIBRARY_TEMP)
> 	# For SDLmain
> 	IF(SDLMAIN_LIBRARY)
> 		SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
> 	ENDIF(SDLMAIN_LIBRARY)
> 
> 	# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
> 	# CMake doesn't display the -framework Cocoa string in the UI even 
> 	# though it actually is there. I think it has something to do 
> 	# with the CACHE STRING. Maybe somebody else knows how to fix this.
> 	# The problem is mainly cosmetic, and not a functional issue.
> 	IF(APPLE)
> 		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
> 	ENDIF(APPLE)
> 		
> 	# For threads, as mentioned Apple doesn't need this.
> 	# In fact, there seems to be a problem if Find the threads package
> 	# and try using this line, so I'm just skipping it entirely for OS X.
> 	IF(NOT APPLE)
> 		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
> 	ENDIF(NOT APPLE)
> 
> 	# For MinGW library
> 	IF(MINGW)
> 		SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
> 	ENDIF(MINGW)
> 
> 	# Set the final string here so the GUI reflects the final state.
> 	SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
128,129c160,161
<   SET(SDL_FOUND "YES")
< ENDIF(SDL_LIBRARY)
---
> 	SET(SDL_FOUND "YES")
> ENDIF(SDL_LIBRARY_TEMP)
diff OLDMODULES/FindSDL_image.cmake MYCMAKEMODULES/FindSDL_image.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_image.framework/Headers
<   /Library/Frameworks/SDL_image.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLIMAGEDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLIMAGEDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_image.framework/Headers
> 	/Library/Frameworks/SDL_image.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLIMAGE_FRAMEWORK_PATH_TEMP ${SDLIMAGE_INCLUDE_DIR})
> 	IF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
> 	ELSE("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLIMAGE_LIBRARY "-F${SDLIMAGE_FRAMEWORK_PATH_TEMP} -framework SDL_image" CACHE STRING "SDL_image framework for OSX")
> 	ENDIF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLIMAGE_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLIMAGE_LIBRARY 
<     NAMES SDL_image
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLIMAGEDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLIMAGE_LIBRARY 
> 		NAMES SDL_image
> 		PATHS
> 		$ENV{SDLIMAGEDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLIMAGE_FOUND "YES")
---
> 	SET(SDLIMAGE_FOUND "YES")
diff OLDMODULES/FindSDL_mixer.cmake MYCMAKEMODULES/FindSDL_mixer.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_mixer.framework/Headers
<   /Library/Frameworks/SDL_mixer.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLMIXERDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLMIXERDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_mixer.framework/Headers
> 	/Library/Frameworks/SDL_mixer.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLMIXER_FRAMEWORK_PATH_TEMP ${SDLMIXER_INCLUDE_DIR})
> 	IF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
> 	ELSE("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLMIXER_LIBRARY "-F${SDLMIXER_FRAMEWORK_PATH_TEMP} -framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
> 	ENDIF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLMIXER_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLMIXER_LIBRARY 
<     NAMES SDL_mixer
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLMIXERDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLMIXER_LIBRARY 
> 		NAMES SDL_mixer
> 		PATHS
> 		$ENV{SDLMIXERDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLMIXER_FOUND "YES")
---
> 	SET(SDLMIXER_FOUND "YES")
diff OLDMODULES/FindSDL_net.cmake MYCMAKEMODULES/FindSDL_net.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_net.framework/Headers
<   /Library/Frameworks/SDL_net.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLNETDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLNETDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_net.framework/Headers
> 	/Library/Frameworks/SDL_net.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLNET_FRAMEWORK_PATH_TEMP ${SDLNET_INCLUDE_DIR})
> 	IF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
> 	ELSE("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLNET_LIBRARY "-F${SDLNET_FRAMEWORK_PATH_TEMP} -framework SDL_net" CACHE STRING "SDL_net framework for OSX")
> 	ENDIF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLNET_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLNET_LIBRARY 
<     NAMES SDL_net
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLNET}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLNET_LIBRARY 
> 		NAMES SDL_net
> 		PATHS
> 		$ENV{SDLNET}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLNET_FOUND "YES")
---
> 	SET(SDLNET_FOUND "YES")
diff OLDMODULES/FindSDL_sound.cmake MYCMAKEMODULES/FindSDL_sound.cmake
9c9,15
< # SDL_SOUND_LIBRARIES, this contains the list of libraries that you need to link against
---
> # SDL_SOUND_LIBRARIES, this contains the list of libraries that you need 
> # to link against. This is a read-only variable and is marked INTERNAL.
> # SDL_SOUND_EXTRAS, this is an optional variable for you to add your own
> # flags to SDL_SOUND_LIBRARIES. This is prepended to SDL_SOUND_LIBRARIES.
> # This is available mostly for cases this module failed to anticipate for
> # and you must add additional flags. This is marked as ADVANCED.
>  
12c18,19
< # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link against.
---
> # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link
> # against. Use SDL_SOUND_LIBRARIES for you link instructions and not this one.
31,32c38,41
< # MikMod, FLAC, Speex, and potentially others. Some platforms or compilers seem to 
< # require that dependent libraries of libraries you use must also be explicitly 
---
> # MikMod, FLAC, Speex, and potentially others. 
> # Under some circumstances which I don't fully understand, 
> # there seems to be a requirement
> # that dependent libraries of libraries you use must also be explicitly 
36c45
< # libraries are required for building.
---
> # libraries are required for building (if any).
48a58,61
> 
> SET(SDL_SOUND_EXTRAS "" CACHE STRING "SDL_sound extra flags")
> MARK_AS_ADVANCED(SDL_SOUND_EXTRAS)
> 
51,53d63
<   ~/Library/Frameworks/SDL_sound.framework/Headers
<   /Library/Frameworks/SDL_sound.framework/Headers
<   $ENV{SDLDIR}/include
54a65,68
>   $ENV{SDLDIR}/include
>   ~/Library/Frameworks/SDL_sound.framework/Headers
>   /Library/Frameworks/SDL_sound.framework/Headers # OS X
>   /usr/local/include/SDL
55a70,71
>   /usr/local/include/SDL12
>   /usr/local/include/SDL11 # FreeBSD ports
58,61d73
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
62a75,76
>   /usr/include
>   /sw/include/SDL # Fink
63a78,83
>   /opt/local/include/SDL # DarwinPorts
>   /opt/local/include
>   /opt/csw/include/SDL # Blastwave
>   /opt/csw/include 
>   /opt/include/SDL
>   /opt/include
67c87,104
<   SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
---
>   # Extract the path the framework resides in so we can use it for the -F flag
>   STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_SOUND_FRAMEWORK_PATH_TMP ${SDL_SOUND_INCLUDE_DIR})
>   IF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>     # String is in default search path, don't need to use -F
>     SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
>   ELSE("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>     # String is not /Library/Frameworks, need to use -F
>     SET(SDL_SOUND_LIBRARY "-F${SDL_SOUND_FRAMEWORK_PATH_TMP} -framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
>   ENDIF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	  )
>    # Clear the temp variable so nobody can see it
>    SET(SDL_SOUND_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
72d108
<     $ENV{SDLDIR}/lib
74c110
<     /usr/lib
---
>     $ENV{SDLDIR}/lib
75a112
>     /usr/lib
76a114,116
> 	/opt/local/lib
> 	/opt/csw/lib
> 	/opt/lib
173c213,230
<          SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
---
>          # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
>          ELSE("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(MIKMOD_LIBRARY "-F${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP} -framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
179d235
<            $ENV{SDLDIR}/lib
181c237
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
182a239
>            /usr/lib
184c241,244
<            )
---
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
>          )
196c256
<          libmikmod-coreaudio 
---
>          modplug
201c261,279
<          SET(MIKMOD_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK})
> 		 MESSAGE("HELLO")
>          IF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(MODPLUG_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
>          ELSE("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(MODPLUG_LIBRARY "-F${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP} -framework modplug" CACHE STRING "MODPLUG framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 		 
207d284
<            $ENV{SDLDIR}/lib
209c286
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
210a288
>            /usr/lib
212c290,293
<            )
---
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
>          )
230c311,328
<          SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
>          ELSE("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(VORBIS_LIBRARY "-F${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP} -framework Vorbis" CACHE STRING "Vorbis framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
235d332
<            $ENV{OGGDIR}/lib
237c334
<            $ENV{SDLDIR}/lib
---
>            $ENV{OGGDIR}/lib
239c336
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
240a338
>            /usr/lib
241a340,342
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
256c357,374
<          SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
263d380
<            $ENV{SDLDIR}/lib
265c382
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
266a384
>            /usr/lib
267a386,388
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
286c407,424
<          SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
>          ELSE("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(SMPEG_LIBRARY "-F${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP} -framework smpeg" CACHE STRING "SMPEG framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
292,293d429
<            $ENV{SDLDIR}/lib
<            $ENV{SDLDIR}/lib
295c431
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
296a433
>            /usr/lib
297a435,437
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
316c456,473
<          SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
>          ELSE("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(FLAC_LIBRARY "-F${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP} -framework FLAC" CACHE STRING "FLAC framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
322d478
<            $ENV{SDLDIR}/lib
324c480
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
325a482
>            /usr/lib
326a484,486
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
348c508,525
<          SET(FLAC_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(SPEEX_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
>          ELSE("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(SPEEX_LIBRARY "-F${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP} -framework speex" CACHE STRING "SPEEX framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 
354d530
<            $ENV{SDLDIR}/lib
356c532
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
357a534
>            /usr/lib
358a536,538
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
372c552,569
<          SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
---
> 		 # Extract the path the framework resides in so we can use it for the -F flag
>          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
>          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
>       	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's in the default search path so I don't need to use -F
>            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>            # It's not in the default search path so I need to use -F
>            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
>          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
> 	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
> 	     )
>          # Clear the temp variable so nobody can see it
>          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
> 		 
380d576
<            $ENV{SDLDIR}/lib
382c578
<            /usr/lib
---
>            $ENV{SDLDIR}/lib
383a580
>            /usr/lib
384a582,584
>            /opt/local/lib
>            /opt/csw/lib
> 	       /opt/lib
397c597
<      SET(SDL_SOUND_LIBRARIES ${SDL_SOUND_LIBRARY} CACHE STRING "SDL_sound and dependent libraries")
---
>      SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARY}" CACHE INTERNAL "SDL_sound and dependent libraries")
400c600
<    SET(SDL_SOUND_LIBRARIES ${SDL_SOUND_LIBRARIES_TMP} CACHE STRING "SDL_sound and dependent libraries")
---
>    SET(SDL_SOUND_LIBRARIES "${SDL_SOUND_EXTRAS} ${SDL_SOUND_LIBRARIES_TMP}" CACHE INTERNAL "SDL_sound and dependent libraries")
402a603,605
> 
> # MESSAGE("SDL_SOUND_LIBRARIES is ${SDL_SOUND_LIBRARIES}")
> 
diff OLDMODULES/FindSDL_ttf.cmake MYCMAKEMODULES/FindSDL_ttf.cmake
19,32c19,39
<   ~/Library/Frameworks/SDL_ttf.framework/Headers
<   /Library/Frameworks/SDL_ttf.framework/Headers
<   $ENV{SDLDIR}/include
<   $ENV{SDLTTFDIR}/include
<   /usr/include/SDL
<   /usr/include/SDL12
<   /usr/include/SDL11
<   /usr/include
<   /usr/local/include/SDL
<   /usr/local/include/SDL12
<   /usr/local/include/SDL11
<   /usr/local/include
<   /sw/include
<   )
---
> 	$ENV{SDLTTFDIR}/include
> 	$ENV{SDLDIR}/include
> 	~/Library/Frameworks/SDL_ttf.framework/Headers
> 	/Library/Frameworks/SDL_ttf.framework/Headers
> 	/usr/local/include/SDL
> 	/usr/include/SDL
> 	/usr/local/include/SDL12
> 	/usr/local/include/SDL11 # FreeBSD ports
> 	/usr/include/SDL12
> 	/usr/include/SDL11
> 	/usr/local/include
> 	/usr/include
> 	/sw/include/SDL # Fink
> 	/sw/include
> 	/opt/local/include/SDL # DarwinPorts
> 	/opt/local/include
> 	/opt/csw/include/SDL # Blastwave
> 	/opt/csw/include 
> 	/opt/include/SDL
> 	/opt/include
> )
38c45,62
<   SET (SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
---
> 	# Extract the path the framework resides in so we can use it for the -F flag
> 	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLTTF_FRAMEWORK_PATH_TEMP ${SDLTTF_INCLUDE_DIR})
> 	IF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is in default search path, don't need to use -F
> 		SET(SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
> 	ELSE("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 		# String is not /Library/Frameworks, need to use -F
> 		SET(SDLTTF_LIBRARY "-F${SDLTTF_FRAMEWORK_PATH_TEMP} -framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
> 	ENDIF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
> 		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
> 	)
> 	# Clear the temp variable so nobody can see it
> 	SET(SDLTTF_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
> 
40,48c64,75
<   FIND_LIBRARY(SDLTTF_LIBRARY 
<     NAMES SDL_ttf
<     PATHS
<     $ENV{SDLDIR}/lib
<     $ENV{SDLTTFDIR}/lib
<     /usr/lib
<     /usr/local/lib
<     /sw/lib
<     )
---
> 	FIND_LIBRARY(SDLTTF_LIBRARY 
> 		NAMES SDL_ttf
> 		PATHS
> 		$ENV{SDLTTFDIR}/lib
> 		$ENV{SDLDIR}/lib
> 		/usr/local/lib
> 		/usr/lib
> 		/sw/lib
> 		/opt/local/lib
> 		/opt/csw/lib
> 		/opt/lib
> 	)
53c80
<   SET(SDLTTF_FOUND "YES")
---
> 	SET(SDLTTF_FOUND "YES")

? diffs
Index: Modules/FindOpenAL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenAL.cmake,v
retrieving revision 1.3
diff -u -r1.3 FindOpenAL.cmake
--- Modules/FindOpenAL.cmake	28 Oct 2005 21:46:44 -0000	1.3
+++ Modules/FindOpenAL.cmake	29 Oct 2005 09:50:49 -0000
@@ -10,76 +10,87 @@
 #
 # Created by Eric Wing. This was influenced by the FindSDL.cmake module.
 
+# This makes the presumption that you are include al.h like
+# #include "al.h"
+# and not 
+# #include <AL/al.h>
+# The reason for this is that the latter is not entirely portable.
+# Windows/Creative Labs does not by default put their headers in AL/ and 
+# OS X uses the convention <OpenAL/al.h> because of the framework system.
+# And also keep in mind that for OS X, OpenAL/al.h doesn't actually exist
+# anywhere in the file system and CMake's FIND_PATH currently isn't aware
+# of the mapping to make this all work. 
+#
 # On OSX, this will prefer the Framework version (if found) over others.
 # People will have to manually change the cache values of 
 # OPENAL_LIBRARY to override this selection.
-# Tiger will include OpenAL as part of the System.
-# But for now, we have to look around.
+# Tiger includes OpenAL as part of the System.
 # Other (Unix) systems should be able to utilize the non-framework paths.
 FIND_PATH(OPENAL_INCLUDE_DIR al.h
-  $ENV{OPENALDIR}/include
-  ~/Library/Frameworks/OpenAL.framework/Headers
-  /Library/Frameworks/OpenAL.framework/Headers
-  /System/Library/Frameworks/OpenAL.framework/Headers # Tiger
-  /usr/local/include/AL
-  /usr/local/include/OpenAL
-  /usr/local/include
-  /usr/include/AL
-  /usr/include/OpenAL
-  /usr/include
-  /sw/include/AL # Fink
-  /sw/include/OpenAL 
-  /sw/include
-  /opt/local/include/AL # DarwinPorts
-  /opt/local/include/OpenAL
-  /opt/local/include
-  /opt/csw/include/AL # Blastwave
-  /opt/csw/include/OpenAL
-  /opt/csw/include
-  /opt/include/AL
-  /opt/include/OpenAL
-  /opt/include
-  )
+	$ENV{OPENALDIR}/include
+	~/Library/Frameworks/OpenAL.framework/Headers
+	/Library/Frameworks/OpenAL.framework/Headers
+	/System/Library/Frameworks/OpenAL.framework/Headers # Tiger
+	/usr/local/include/AL
+	/usr/local/include/OpenAL
+	/usr/local/include
+	/usr/include/AL
+	/usr/include/OpenAL
+	/usr/include
+	/sw/include/AL # Fink
+	/sw/include/OpenAL 
+	/sw/include
+	/opt/local/include/AL # DarwinPorts
+	/opt/local/include/OpenAL
+	/opt/local/include
+	/opt/csw/include/AL # Blastwave
+	/opt/csw/include/OpenAL
+	/opt/csw/include
+	/opt/include/AL
+	/opt/include/OpenAL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" OPENAL_FRAMEWORK_PATH_TMP ${OPENAL_INCLUDE_DIR})
-  IF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
-  ELSE("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(OPENAL_LIBRARY "-F${OPENAL_FRAMEWORK_PATH_TMP} -framework OpenAL" CACHE STRING "OpenAL framework for OSX")
-  ENDIF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-    OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(OPENAL_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" OPENAL_FRAMEWORK_PATH_TMP ${OPENAL_INCLUDE_DIR})
+	IF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET (OPENAL_LIBRARY "-framework OpenAL" CACHE STRING "OpenAL framework for OSX")
+	ELSE("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(OPENAL_LIBRARY "-F${OPENAL_FRAMEWORK_PATH_TMP} -framework OpenAL" CACHE STRING "OpenAL framework for OSX")
+	ENDIF("${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${OPENAL_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(OPENAL_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
 ELSE(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(OPENAL_LIBRARY 
-    NAMES openal al OpenAL32
-    PATHS
-    $ENV{OPENALDIR}/lib
-    $ENV{OPENALDIR}/libs
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(OPENAL_LIBRARY 
+		NAMES openal al OpenAL32
+		PATHS
+		$ENV{OPENALDIR}/lib
+		$ENV{OPENALDIR}/libs
+		$ENV{OPENALDIR}/libs/Win32 # Creative OpenAL 1.1 installer
+	    /usr/local/lib
+	    /usr/lib
+	    /sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${OPENAL_INCLUDE_DIR} MATCHES ".framework")
 
 SET(OPENAL_FOUND "NO")
 IF(OPENAL_LIBRARY)
-  SET(OPENAL_FOUND "YES")
+        SET(OPENAL_FOUND "YES")
 ENDIF(OPENAL_LIBRARY)
 
 
Index: Modules/FindPhysFS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPhysFS.cmake,v
retrieving revision 1.2
diff -u -r1.2 FindPhysFS.cmake
--- Modules/FindPhysFS.cmake	28 Oct 2005 21:46:44 -0000	1.2
+++ Modules/FindPhysFS.cmake	29 Oct 2005 09:50:49 -0000
@@ -15,60 +15,60 @@
 # People will have to manually change the cache values of 
 # PHYSFS_LIBRARY to override this selection.
 FIND_PATH(PHYSFS_INCLUDE_DIR physfs.h
-  $ENV{PHYSFSDIR}/include
-  ~/Library/Frameworks/PhysFS.framework/Headers
-  /Library/Frameworks/PhysFS.framework/Headers
-  /usr/local/include/physfs
-  /usr/local/include
-  /usr/include/physfs
-  /usr/include
-  /sw/include/physfs # Fink
-  /sw/include
-  /opt/local/include/physfs # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/physfs # Blastwave
-  /opt/csw/include
-  /opt/include/physfs
-  /opt/include
-  )
+	$ENV{PHYSFSDIR}/include
+	~/Library/Frameworks/PhysFS.framework/Headers
+	/Library/Frameworks/PhysFS.framework/Headers
+	/usr/local/include/physfs
+	/usr/local/include
+	/usr/include/physfs
+	/usr/include
+	/sw/include/physfs # Fink
+	/sw/include
+	/opt/local/include/physfs # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/physfs # Blastwave
+	/opt/csw/include
+	/opt/include/physfs
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${PHYSFS_INCLUDE_DIR} MATCHES ".framework")
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" PHYSFS_FRAMEWORK_PATH_TMP ${PHYSFS_INCLUDE_DIR})
-  IF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
-  ELSE("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(PHYSFS_LIBRARY "-F${PHYSFS_FRAMEWORK_PATH_TMP} -framework PhysFS" CACHE STRING "PhysFS framework for OSX")
-  ENDIF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-    OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(PHYSFS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" PHYSFS_FRAMEWORK_PATH_TMP ${PHYSFS_INCLUDE_DIR})
+	IF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(PHYSFS_LIBRARY "-framework PhysFS" CACHE STRING "PhysFS framework for OSX")
+	ELSE("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(PHYSFS_LIBRARY "-F${PHYSFS_FRAMEWORK_PATH_TMP} -framework PhysFS" CACHE STRING "PhysFS framework for OSX")
+	ENDIF("${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
+		OR "${PHYSFS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(PHYSFS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
 ELSE(${PHYSFS_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(PHYSFS_LIBRARY 
-    NAMES physfs PhysFS
-    PATHS
-    $ENV{PHYSFSDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(PHYSFS_LIBRARY 
+		NAMES physfs PhysFS
+		PATHS
+		$ENV{PHYSFSDIR}/lib
+	    /usr/local/lib
+	    /usr/lib
+	    /sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+)
 ENDIF(${PHYSFS_INCLUDE_DIR} MATCHES ".framework")
 
 SET(PHYSFS_FOUND "NO")
 IF(PHYSFS_LIBRARY)
-  SET(PHYSFS_FOUND "YES")
+	SET(PHYSFS_FOUND "YES")
 ENDIF(PHYSFS_LIBRARY)
 
Index: Modules/FindSDL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL.cmake,v
retrieving revision 1.7
diff -u -r1.7 FindSDL.cmake
--- Modules/FindSDL.cmake	28 Oct 2005 21:46:44 -0000	1.7
+++ Modules/FindSDL.cmake	29 Oct 2005 09:50:49 -0000
@@ -31,84 +31,84 @@
 # is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
 # reasons because not all systems place things in SDL/ (see FreeBSD).
 FIND_PATH(SDL_INCLUDE_DIR SDL.h
-  $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL.framework/Headers
-  /Library/Frameworks/SDL.framework/Headers
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  )
+	$ENV{SDLDIR}/include
+	~/Library/Frameworks/SDL.framework/Headers
+	/Library/Frameworks/SDL.framework/Headers
+	/usr/local/include/SDL
+	/usr/include/SDL
+	/usr/local/include/SDL12
+	/usr/local/include/SDL11 # FreeBSD ports
+	/usr/include/SDL12
+	/usr/include/SDL11
+	/usr/local/include
+	/usr/include
+	/sw/include/SDL # Fink
+	/sw/include
+	/opt/local/include/SDL # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/SDL # Blastwave
+	/opt/csw/include 
+	/opt/include/SDL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${SDL_INCLUDE_DIR} MATCHES ".framework")
-  # The Cocoa framework must be linked into SDL because SDL is Cocoa based.
-  # Remember that the OS X framework version expects you to drop in
-  # SDLmain.h and SDLmain.m directly into your project.
-  # (Cocoa link moved to bottom of this script.)
-  # SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
-  # SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_FRAMEWORK_PATH_TEMP ${SDL_INCLUDE_DIR})
-  IF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(SDL_LIBRARY_TEMP "-framework SDL")
-  ELSE("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDL_LIBRARY_TEMP "-F${SDL_FRAMEWORK_PATH_TEMP} -framework SDL")
-  ENDIF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDL_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+	# The Cocoa framework must be linked into SDL because SDL is Cocoa based.
+	# Remember that the OS X framework version expects you to drop in
+	# SDLmain.h and SDLmain.m directly into your project.
+	# (Cocoa link moved to bottom of this script.)
+	# SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
+    # SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
+	# Extract the path the framework resides in so we can use it for the -F flag
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_FRAMEWORK_PATH_TEMP ${SDL_INCLUDE_DIR})
+	IF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(SDL_LIBRARY_TEMP "-framework SDL")
+	ELSE("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(SDL_LIBRARY_TEMP "-F${SDL_FRAMEWORK_PATH_TEMP} -framework SDL")
+	ENDIF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(SDL_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
 
 ELSE(${SDL_INCLUDE_DIR} MATCHES ".framework")
-  # SDL-1.1 is the name used by FreeBSD ports...
-  # don't confuse it for the version number.
-  FIND_LIBRARY(SDL_LIBRARY_TEMP 
-    NAMES SDL SDL-1.1
-    PATHS
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
-  # Non-OS X framework versions expect you to also dynamically link to 
-  # SDLmain. This is mainly for Windows and OS X. Other platforms 
-  # seem to provide SDLmain for compatibility even though they don't
-  # necessarily need it.
-  FIND_LIBRARY(SDLMAIN_LIBRARY 
-    NAMES SDLmain SDLmain-1.1
-    PATHS
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	# SDL-1.1 is the name used by FreeBSD ports...
+	# don't confuse it for the version number.
+	FIND_LIBRARY(SDL_LIBRARY_TEMP 
+		NAMES SDL SDL-1.1
+	PATHS
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
+	# Non-OS X framework versions expect you to also dynamically link to 
+	# SDLmain. This is mainly for Windows and OS X. Other platforms 
+	# seem to provide SDLmain for compatibility even though they don't
+	# necessarily need it.
+	FIND_LIBRARY(SDLMAIN_LIBRARY 
+		NAMES SDLmain SDLmain-1.1
+		PATHS
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${SDL_INCLUDE_DIR} MATCHES ".framework")
 
 # SDL may require threads on your system.
@@ -116,47 +116,47 @@
 # frameworks may already provide it. 
 # But for non-OSX systems, I will use the CMake Threads package.
 IF(NOT APPLE)
-  FIND_PACKAGE(Threads)
+	FIND_PACKAGE(Threads)
 ENDIF(NOT APPLE)
 
 # MinGW needs an additional library, mwindows
 # It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
 # (Actually on second look, I think it only needs one of the m* libraries.)
 IF(MINGW)
-  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+	SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
 ENDIF(MINGW)
 
 SET(SDL_FOUND "NO")
 IF(SDL_LIBRARY_TEMP)
-  # For SDLmain
-  IF(SDLMAIN_LIBRARY)
-    SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
-  ENDIF(SDLMAIN_LIBRARY)
-
-  # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even 
-  # though it actually is there. I think it has something to do 
-  # with the CACHE STRING. Maybe somebody else knows how to fix this.
-  # The problem is mainly cosmetic, and not a functional issue.
-  IF(APPLE)
-    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
-  ENDIF(APPLE)
-  
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if Find the threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  IF(NOT APPLE)
-    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(NOT APPLE)
-
-  # For MinGW library
-  IF(MINGW)
-    SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
-  ENDIF(MINGW)
+	# For SDLmain
+	IF(SDLMAIN_LIBRARY)
+		SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+	ENDIF(SDLMAIN_LIBRARY)
+
+	# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
+	# CMake doesn't display the -framework Cocoa string in the UI even 
+	# though it actually is there. I think it has something to do 
+	# with the CACHE STRING. Maybe somebody else knows how to fix this.
+	# The problem is mainly cosmetic, and not a functional issue.
+	IF(APPLE)
+		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
+	ENDIF(APPLE)
+		
+	# For threads, as mentioned Apple doesn't need this.
+	# In fact, there seems to be a problem if Find the threads package
+	# and try using this line, so I'm just skipping it entirely for OS X.
+	IF(NOT APPLE)
+		SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+	ENDIF(NOT APPLE)
+
+	# For MinGW library
+	IF(MINGW)
+		SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
+	ENDIF(MINGW)
 
-  # Set the final string here so the GUI reflects the final state.
-  SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
+	# Set the final string here so the GUI reflects the final state.
+	SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
 
-  SET(SDL_FOUND "YES")
+	SET(SDL_FOUND "YES")
 ENDIF(SDL_LIBRARY_TEMP)
 
Index: Modules/FindSDL_image.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_image.cmake,v
retrieving revision 1.3
diff -u -r1.3 FindSDL_image.cmake
--- Modules/FindSDL_image.cmake	28 Oct 2005 21:46:44 -0000	1.3
+++ Modules/FindSDL_image.cmake	29 Oct 2005 09:50:49 -0000
@@ -16,67 +16,67 @@
 # People will have to manually change the cache values of 
 # SDLIMAGE_LIBRARY to override this selection.
 FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h
-  $ENV{SDLIMAGEDIR}/include
-  $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL_image.framework/Headers
-  /Library/Frameworks/SDL_image.framework/Headers
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  )
+	$ENV{SDLIMAGEDIR}/include
+	$ENV{SDLDIR}/include
+	~/Library/Frameworks/SDL_image.framework/Headers
+	/Library/Frameworks/SDL_image.framework/Headers
+	/usr/local/include/SDL
+	/usr/include/SDL
+	/usr/local/include/SDL12
+	/usr/local/include/SDL11 # FreeBSD ports
+	/usr/include/SDL12
+	/usr/include/SDL11
+	/usr/local/include
+	/usr/include
+	/sw/include/SDL # Fink
+	/sw/include
+	/opt/local/include/SDL # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/SDL # Blastwave
+	/opt/csw/include 
+	/opt/include/SDL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLIMAGE_FRAMEWORK_PATH_TEMP ${SDLIMAGE_INCLUDE_DIR})
-  IF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
-  ELSE("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDLIMAGE_LIBRARY "-F${SDLIMAGE_FRAMEWORK_PATH_TEMP} -framework SDL_image" CACHE STRING "SDL_image framework for OSX")
-  ENDIF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDLIMAGE_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+	# Extract the path the framework resides in so we can use it for the -F flag
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLIMAGE_FRAMEWORK_PATH_TEMP ${SDLIMAGE_INCLUDE_DIR})
+	IF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(SDLIMAGE_LIBRARY "-framework SDL_image" CACHE STRING "SDL_image framework for OSX")
+	ELSE("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(SDLIMAGE_LIBRARY "-F${SDLIMAGE_FRAMEWORK_PATH_TEMP} -framework SDL_image" CACHE STRING "SDL_image framework for OSX")
+	ENDIF("${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLIMAGE_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(SDLIMAGE_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
 
 ELSE(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(SDLIMAGE_LIBRARY 
-    NAMES SDL_image
-    PATHS
-    $ENV{SDLIMAGEDIR}/lib
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(SDLIMAGE_LIBRARY 
+		NAMES SDL_image
+		PATHS
+		$ENV{SDLIMAGEDIR}/lib
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${SDLIMAGE_INCLUDE_DIR} MATCHES ".framework")
 
 SET(SDLIMAGE_FOUND "NO")
 IF(SDLIMAGE_LIBRARY)
-  SET(SDLIMAGE_FOUND "YES")
+	SET(SDLIMAGE_FOUND "YES")
 ENDIF(SDLIMAGE_LIBRARY)
 
Index: Modules/FindSDL_mixer.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_mixer.cmake,v
retrieving revision 1.3
diff -u -r1.3 FindSDL_mixer.cmake
--- Modules/FindSDL_mixer.cmake	28 Oct 2005 21:46:44 -0000	1.3
+++ Modules/FindSDL_mixer.cmake	29 Oct 2005 09:50:49 -0000
@@ -16,67 +16,67 @@
 # People will have to manually change the cache values of 
 # SDLMIXER_LIBRARY to override this selection.
 FIND_PATH(SDLMIXER_INCLUDE_DIR SDL_mixer.h
-  $ENV{SDLMIXERDIR}/include
-  $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL_mixer.framework/Headers
-  /Library/Frameworks/SDL_mixer.framework/Headers
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  )
+	$ENV{SDLMIXERDIR}/include
+	$ENV{SDLDIR}/include
+	~/Library/Frameworks/SDL_mixer.framework/Headers
+	/Library/Frameworks/SDL_mixer.framework/Headers
+	/usr/local/include/SDL
+	/usr/include/SDL
+	/usr/local/include/SDL12
+	/usr/local/include/SDL11 # FreeBSD ports
+	/usr/include/SDL12
+	/usr/include/SDL11
+	/usr/local/include
+	/usr/include
+	/sw/include/SDL # Fink
+	/sw/include
+	/opt/local/include/SDL # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/SDL # Blastwave
+	/opt/csw/include 
+	/opt/include/SDL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${SDLMIXER_INCLUDE_DIR} MATCHES ".framework")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLMIXER_FRAMEWORK_PATH_TEMP ${SDLMIXER_INCLUDE_DIR})
-  IF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
-  ELSE("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDLMIXER_LIBRARY "-F${SDLMIXER_FRAMEWORK_PATH_TEMP} -framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
-  ENDIF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDLMIXER_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+	# Extract the path the framework resides in so we can use it for the -F flag
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLMIXER_FRAMEWORK_PATH_TEMP ${SDLMIXER_INCLUDE_DIR})
+	IF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(SDLMIXER_LIBRARY "-framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
+	ELSE("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(SDLMIXER_LIBRARY "-F${SDLMIXER_FRAMEWORK_PATH_TEMP} -framework SDL_mixer" CACHE STRING "SDL_mixer framework for OSX")
+	ENDIF("${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLMIXER_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(SDLMIXER_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
 
 ELSE(${SDLMIXER_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(SDLMIXER_LIBRARY 
-    NAMES SDL_mixer
-    PATHS
-    $ENV{SDLMIXERDIR}/lib
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(SDLMIXER_LIBRARY 
+		NAMES SDL_mixer
+		PATHS
+		$ENV{SDLMIXERDIR}/lib
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${SDLMIXER_INCLUDE_DIR} MATCHES ".framework")
 
 SET(SDLMIXER_FOUND "NO")
 IF(SDLMIXER_LIBRARY)
-  SET(SDLMIXER_FOUND "YES")
+	SET(SDLMIXER_FOUND "YES")
 ENDIF(SDLMIXER_LIBRARY)
 
Index: Modules/FindSDL_net.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_net.cmake,v
retrieving revision 1.3
diff -u -r1.3 FindSDL_net.cmake
--- Modules/FindSDL_net.cmake	28 Oct 2005 21:46:44 -0000	1.3
+++ Modules/FindSDL_net.cmake	29 Oct 2005 09:50:49 -0000
@@ -16,67 +16,67 @@
 # People will have to manually change the cache values of 
 # SDLNET_LIBRARY to override this selection.
 FIND_PATH(SDLNET_INCLUDE_DIR SDL_net.h
-  $ENV{SDLNETDIR}/include
-  $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL_net.framework/Headers
-  /Library/Frameworks/SDL_net.framework/Headers
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  )
+	$ENV{SDLNETDIR}/include
+	$ENV{SDLDIR}/include
+	~/Library/Frameworks/SDL_net.framework/Headers
+	/Library/Frameworks/SDL_net.framework/Headers
+	/usr/local/include/SDL
+	/usr/include/SDL
+	/usr/local/include/SDL12
+	/usr/local/include/SDL11 # FreeBSD ports
+	/usr/include/SDL12
+	/usr/include/SDL11
+	/usr/local/include
+	/usr/include
+	/sw/include/SDL # Fink
+	/sw/include
+	/opt/local/include/SDL # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/SDL # Blastwave
+	/opt/csw/include 
+	/opt/include/SDL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${SDLNET_INCLUDE_DIR} MATCHES ".framework")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLNET_FRAMEWORK_PATH_TEMP ${SDLNET_INCLUDE_DIR})
-  IF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
-  ELSE("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDLNET_LIBRARY "-F${SDLNET_FRAMEWORK_PATH_TEMP} -framework SDL_net" CACHE STRING "SDL_net framework for OSX")
-  ENDIF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDLNET_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+	# Extract the path the framework resides in so we can use it for the -F flag
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLNET_FRAMEWORK_PATH_TEMP ${SDLNET_INCLUDE_DIR})
+	IF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(SDLNET_LIBRARY "-framework SDL_net" CACHE STRING "SDL_net framework for OSX")
+	ELSE("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(SDLNET_LIBRARY "-F${SDLNET_FRAMEWORK_PATH_TEMP} -framework SDL_net" CACHE STRING "SDL_net framework for OSX")
+	ENDIF("${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLNET_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(SDLNET_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
 
 ELSE(${SDLNET_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(SDLNET_LIBRARY 
-    NAMES SDL_net
-    PATHS
-    $ENV{SDLNET}/lib
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(SDLNET_LIBRARY 
+		NAMES SDL_net
+		PATHS
+		$ENV{SDLNET}/lib
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${SDLNET_INCLUDE_DIR} MATCHES ".framework")
 
 SET(SDLNET_FOUND "NO")
 IF(SDLNET_LIBRARY)
-  SET(SDLNET_FOUND "YES")
+	SET(SDLNET_FOUND "YES")
 ENDIF(SDLNET_LIBRARY)
 
Index: Modules/FindSDL_sound.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_sound.cmake,v
retrieving revision 1.2
diff -u -r1.2 FindSDL_sound.cmake
--- Modules/FindSDL_sound.cmake	28 Oct 2005 21:46:44 -0000	1.2
+++ Modules/FindSDL_sound.cmake	29 Oct 2005 09:50:49 -0000
@@ -12,7 +12,7 @@
 # flags to SDL_SOUND_LIBRARIES. This is prepended to SDL_SOUND_LIBRARIES.
 # This is available mostly for cases this module failed to anticipate for
 # and you must add additional flags. This is marked as ADVANCED.
-
+ 
 #
 # This module also defines (but you shouldn't need to use directly)
 # SDL_SOUND_LIBRARY, the name of just the SDL_sound library you would link
@@ -87,20 +87,20 @@
   # Extract the path the framework resides in so we can use it for the -F flag
   STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_SOUND_FRAMEWORK_PATH_TMP ${SDL_SOUND_INCLUDE_DIR})
   IF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
+	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	  )
     # String is in default search path, don't need to use -F
     SET (SDL_SOUND_LIBRARY "-framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
   ELSE("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-      )
+	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	  )
     # String is not /Library/Frameworks, need to use -F
     SET(SDL_SOUND_LIBRARY "-F${SDL_SOUND_FRAMEWORK_PATH_TMP} -framework SDL_sound" CACHE STRING "SDL_sound framework for OSX")
   ENDIF("${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDL_SOUND_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
+	  OR "${SDL_SOUND_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	  )
+   # Clear the temp variable so nobody can see it
+   SET(SDL_SOUND_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
 ELSE(${SDL_SOUND_INCLUDE_DIR} MATCHES ".framework")
   FIND_LIBRARY(SDL_SOUND_LIBRARY 
@@ -111,9 +111,9 @@
     /usr/local/lib
     /usr/lib
     /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
+	/opt/local/lib
+	/opt/csw/lib
+	/opt/lib
     )
 ENDIF(${SDL_SOUND_INCLUDE_DIR} MATCHES ".framework")
 
@@ -213,18 +213,18 @@
          # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK})
          IF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(MIKMOD_LIBRARY "-framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
          ELSE("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(MIKMOD_LIBRARY "-F${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP} -framework libmikmod-coreaudio" CACHE STRING "MikMod framework for OSX")
          ENDIF("${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_MIKMOD_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -240,8 +240,8 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
-           )
+	       /opt/lib
+         )
        ENDIF(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK)
        # Clear the temp variable so nobody can see it
        SET(TEMP_SDLSOUND_FIND_MIKMOD_FRAMEWORK "" CACHE INTERNAL "")
@@ -258,25 +258,25 @@
          /Library/Frameworks/modplug.framework
          )
        IF(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK})
-         MESSAGE("HELLO")
+		 MESSAGE("HELLO")
          IF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(MODPLUG_LIBRARY "-framework modplug" CACHE STRING "MODPLUG framework for OSX")
          ELSE("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(MODPLUG_LIBRARY "-F${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP} -framework modplug" CACHE STRING "MODPLUG framework for OSX")
          ENDIF("${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_MODPLUG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-         
+		 
        ELSE(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
          FIND_LIBRARY(MODPLUG_LIBRARY
            NAMES modplug
@@ -289,8 +289,8 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
-           )
+	       /opt/lib
+         )
        ENDIF(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK)
        # Clear the temp variable so nobody can see it
        SET(TEMP_SDLSOUND_FIND_MODPLUG_FRAMEWORK "" CACHE INTERNAL "")
@@ -308,21 +308,21 @@
          /Library/Frameworks/Vorbis.framework
          )
        IF(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK})
          IF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(VORBIS_LIBRARY "-framework Vorbis" CACHE STRING "Vorbis framework for OSX")
          ELSE("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(VORBIS_LIBRARY "-F${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP} -framework Vorbis" CACHE STRING "Vorbis framework for OSX")
          ENDIF("${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_VORBIS_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -339,7 +339,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_VORBIS_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -354,21 +354,21 @@
          /Library/Frameworks/Ogg.framework
          )
        IF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -385,7 +385,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -404,21 +404,21 @@
          /Library/Frameworks/smpeg.framework
          )
        IF(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK})
          IF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(SMPEG_LIBRARY "-framework smpeg" CACHE STRING "SMPEG framework for OSX")
          ELSE("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(SMPEG_LIBRARY "-F${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP} -framework smpeg" CACHE STRING "SMPEG framework for OSX")
          ENDIF("${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_SMPEG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -434,7 +434,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_SMPEG_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -453,21 +453,21 @@
          /Library/Frameworks/FLAC.framework
          )
        IF(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK})
          IF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(FLAC_LIBRARY "-framework FLAC" CACHE STRING "FLAC framework for OSX")
          ELSE("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(FLAC_LIBRARY "-F${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP} -framework FLAC" CACHE STRING "FLAC framework for OSX")
          ENDIF("${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_FLAC_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -483,7 +483,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_FLAC_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -505,21 +505,21 @@
          /Library/Frameworks/speex.framework
          )
        IF(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK})
          IF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(SPEEX_LIBRARY "-framework speex" CACHE STRING "SPEEX framework for OSX")
          ELSE("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(SPEEX_LIBRARY "-F${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP} -framework speex" CACHE STRING "SPEEX framework for OSX")
          ENDIF("${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_SPEEX_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
 
@@ -535,7 +535,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_SPEEX_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -549,24 +549,24 @@
          /Library/Frameworks/Ogg.framework
          )
        IF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
-         # Extract the path the framework resides in so we can use it for the -F flag
+		 # Extract the path the framework resides in so we can use it for the -F flag
          STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP ${TEMP_SDLSOUND_FIND_OGG_FRAMEWORK})
          IF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+      	    OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's in the default search path so I don't need to use -F
            SET(OGG_LIBRARY "-framework Ogg" CACHE STRING "Ogg framework for OSX")
          ELSE("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-             OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-             )
+	          OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
            # It's not in the default search path so I need to use -F
            SET(OGG_LIBRARY "-F${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP} -framework Ogg" CACHE STRING "Ogg framework for OSX")
          ENDIF("${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/Library/Frameworks"
-           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
-           )
+	           OR "${TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP}" STREQUAL "/System/Library/Frameworks"
+	     )
          # Clear the temp variable so nobody can see it
          SET(TEMP_SDLSOUND_OGG_FRAMEWORK_PATH_TMP "" CACHE INTERNAL "")
-         
+		 
        ELSE(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
          FIND_LIBRARY(OGG_LIBRARY
            NAMES ogg Ogg OGG
@@ -581,7 +581,7 @@
            /sw/lib
            /opt/local/lib
            /opt/csw/lib
-           /opt/lib
+	       /opt/lib
            )
        ENDIF(TEMP_SDLSOUND_FIND_OGG_FRAMEWORK)
        # Clear the temp variable so nobody can see it
@@ -601,5 +601,5 @@
    SET(SDL_SOUND_FOUND "YES")
  ENDIF(SDL_FOUND AND SDL_SOUND_INCLUDE_DIR AND SDL_SOUND_LIBRARY)
 
- # MESSAGE("SDL_SOUND_LIBRARIES is ${SDL_SOUND_LIBRARIES}")
+# MESSAGE("SDL_SOUND_LIBRARIES is ${SDL_SOUND_LIBRARIES}")
 
Index: Modules/FindSDL_ttf.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSDL_ttf.cmake,v
retrieving revision 1.3
diff -u -r1.3 FindSDL_ttf.cmake
--- Modules/FindSDL_ttf.cmake	28 Oct 2005 21:46:44 -0000	1.3
+++ Modules/FindSDL_ttf.cmake	29 Oct 2005 09:50:50 -0000
@@ -16,67 +16,67 @@
 # People will have to manually change the cache values of 
 # SDLTTF_LIBRARY to override this selection.
 FIND_PATH(SDLTTF_INCLUDE_DIR SDL_ttf.h
-  $ENV{SDLTTFDIR}/include
-  $ENV{SDLDIR}/include
-  ~/Library/Frameworks/SDL_ttf.framework/Headers
-  /Library/Frameworks/SDL_ttf.framework/Headers
-  /usr/local/include/SDL
-  /usr/include/SDL
-  /usr/local/include/SDL12
-  /usr/local/include/SDL11 # FreeBSD ports
-  /usr/include/SDL12
-  /usr/include/SDL11
-  /usr/local/include
-  /usr/include
-  /sw/include/SDL # Fink
-  /sw/include
-  /opt/local/include/SDL # DarwinPorts
-  /opt/local/include
-  /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
-  /opt/include/SDL
-  /opt/include
-  )
+	$ENV{SDLTTFDIR}/include
+	$ENV{SDLDIR}/include
+	~/Library/Frameworks/SDL_ttf.framework/Headers
+	/Library/Frameworks/SDL_ttf.framework/Headers
+	/usr/local/include/SDL
+	/usr/include/SDL
+	/usr/local/include/SDL12
+	/usr/local/include/SDL11 # FreeBSD ports
+	/usr/include/SDL12
+	/usr/include/SDL11
+	/usr/local/include
+	/usr/include
+	/sw/include/SDL # Fink
+	/sw/include
+	/opt/local/include/SDL # DarwinPorts
+	/opt/local/include
+	/opt/csw/include/SDL # Blastwave
+	/opt/csw/include 
+	/opt/include/SDL
+	/opt/include
+)
 # I'm not sure if I should do a special casing for Apple. It is 
 # unlikely that other Unix systems will find the framework path.
 # But if they do ([Next|Open|GNU]Step?), 
 # do they want the -framework option also?
 IF(${SDLTTF_INCLUDE_DIR} MATCHES ".framework")
-  # Extract the path the framework resides in so we can use it for the -F flag
-  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLTTF_FRAMEWORK_PATH_TEMP ${SDLTTF_INCLUDE_DIR})
-  IF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is in default search path, don't need to use -F
-    SET(SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
-  ELSE("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-      OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-      )
-    # String is not /Library/Frameworks, need to use -F
-    SET(SDLTTF_LIBRARY "-F${SDLTTF_FRAMEWORK_PATH_TEMP} -framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
-  ENDIF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
-    OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
-    )
-  # Clear the temp variable so nobody can see it
-  SET(SDLTTF_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+	# Extract the path the framework resides in so we can use it for the -F flag
+	STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDLTTF_FRAMEWORK_PATH_TEMP ${SDLTTF_INCLUDE_DIR})
+	IF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is in default search path, don't need to use -F
+		SET(SDLTTF_LIBRARY "-framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
+	ELSE("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+		# String is not /Library/Frameworks, need to use -F
+		SET(SDLTTF_LIBRARY "-F${SDLTTF_FRAMEWORK_PATH_TEMP} -framework SDL_ttf" CACHE STRING "SDL_ttf framework for OSX")
+	ENDIF("${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+		OR "${SDLTTF_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+	)
+	# Clear the temp variable so nobody can see it
+	SET(SDLTTF_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
 
 ELSE(${SDLTTF_INCLUDE_DIR} MATCHES ".framework")
-  FIND_LIBRARY(SDLTTF_LIBRARY 
-    NAMES SDL_ttf
-    PATHS
-    $ENV{SDLTTFDIR}/lib
-    $ENV{SDLDIR}/lib
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    )
+	FIND_LIBRARY(SDLTTF_LIBRARY 
+		NAMES SDL_ttf
+		PATHS
+		$ENV{SDLTTFDIR}/lib
+		$ENV{SDLDIR}/lib
+		/usr/local/lib
+		/usr/lib
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+	)
 ENDIF(${SDLTTF_INCLUDE_DIR} MATCHES ".framework")
 
 SET(SDLTTF_FOUND "NO")
 IF(SDLTTF_LIBRARY)
-  SET(SDLTTF_FOUND "YES")
+	SET(SDLTTF_FOUND "YES")
 ENDIF(SDLTTF_LIBRARY)