--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cmake/Makefile	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		cmake
+COMPONENT_VERSION=	2.6.2
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:48d33afaf23d40f2ea9aa2f5018c7213983222c2
+COMPONENT_ARCHIVE_URL=	http://www.cmake.org/files/v2.6/$(COMPONENT_ARCHIVE)
+COMPONENT_PROJECT_URL=  http://www.cmake.org/
+
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/configure.mk
+include $(WS_TOP)/make-rules/ips.mk
+
+# Need to remove this option from LD_OPTIONS (only affects sparc build);
+# it causes a SegFault failure in kwsys/testSystemInformation
+# when testing on sparc
+LD_MAP_NOEXBSS=
+
+LDFLAGS +=	$($(COMPILER)_NORUNPATH)
+
+# We need these in the environment, although they are already passed
+# as CONFIGURE_OPTIONS; otherwise the correct compilers are not used
+CONFIGURE_ENV +=	CC="$(CC)"	
+CONFIGURE_ENV +=	CXX="$(CXX)"	
+CONFIGURE_ENV +=	LDFLAGS="$(LDFLAGS)"	
+CONFIGURE_ENV +=	MAKE="$(GMAKE)"	
+
+# CmakeCache-txt is created by configure, so we need to patch
+# it after configure
+COMPONENT_POST_CONFIGURE_ACTION =	( cd $(BUILD_DIR_$(BITS)); \
+	$(GPATCH) $(GPATCH_FLAGS) < \
+	$(COMPONENT_DIR)/patches-post-config/CmakeCache-txt.patch )
+
+COMPONENT_BUILD_ENV +=	CC="$(CC)"	
+COMPONENT_BUILD_ENV +=	CXX="$(CXX)"	
+COMPONENT_BUILD_ENV +=	LDFLAGS="$(LDFLAGS)"	
+COMPONENT_BUILD_ENV +=	MAKE="$(GMAKE)"	
+COMPONENT_BUILD_TARGETS =	all
+
+COMPONENT_TEST_TARGETS =	test
+
+# common targets
+
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+# expected failures: curl, complex, complexOneConfig
+test:		$(TEST_32)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include $(WS_TOP)/make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cmake/cmake.license	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,59 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+-----------------------------------------------------------------------
+CMake was initially developed by Kitware with the following sponsorship:
+
+ * National Library of Medicine at the National Institutes of Health
+   as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+ * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel 
+   Visualization Initiative.
+
+ * National Alliance for Medical Image Computing (NAMIC) is funded by the
+   National Institutes of Health through the NIH Roadmap for Medical Research,
+   Grant U54 EB005149.
+
+ * Kitware, Inc.
+
+The CMake copyright is as follows:
+
+Copyright (c) 2002 Kitware, Inc., Insight Consortium
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * The names of Kitware, Inc., the Insight Consortium, or the names of
+   any consortium members, or of any contributors, may not be used to
+   endorse or promote products derived from this software without
+   specific prior written permission.
+
+ * Modified source versions must be plainly marked as such, and must
+   not be misrepresented as being the original software.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+See also the CMake web site: http://www.cmake.org for more information.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cmake/cmake.p5m	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,467 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+# Get manpages from usr/usr/share/man/man1 in proto area
+<transform file path=usr/share/man/man1/(.+$) -> set action.hash usr/usr/share/man/man1/%<1>>
+
+# Get usr/share/cmake-2.6/doc files from usr/doc/cmake-2.6 in proto area
+<transform file path=usr/share/cmake-2.6/doc/(.+$) -> set action.hash usr/doc/cmake-2.6/%<1>>
+
+set name=pkg.fmri value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A cross-platform, open-source make system"
+set name=pkg.description \
+    value="CMake is a family of tools designed to build, test and package software.  It is used to control the software compilation process using simple platform and compiler-independent configuration files.  CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. "
+set name=info.classification \
+	value="org.opensolaris.category.2008:Development/Distribution Tools"
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/614
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/cmake-2.6
+dir path=usr/share/cmake-2.6/Modules
+dir path=usr/share/cmake-2.6/Modules/Platform
+dir path=usr/share/cmake-2.6/Templates
+dir path=usr/share/cmake-2.6/doc
+dir path=usr/share/cmake-2.6/include
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/ccmake
+file path=usr/bin/cmake
+file path=usr/bin/cpack
+file path=usr/bin/ctest
+file path=usr/share/cmake-2.6/Modules/AddFileDependencies.cmake
+file path=usr/share/cmake-2.6/Modules/BundleUtilities.cmake
+file path=usr/share/cmake-2.6/Modules/CMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeASM-ATTInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeASMCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeASMInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeBackwardCompatibilityC.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeBackwardCompatibilityCXX.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeBorlandFindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeBuildSettings.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeCCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeCCompilerABI.c
+file path=usr/share/cmake-2.6/Modules/CMakeCCompilerId.c.in
+file path=usr/share/cmake-2.6/Modules/CMakeCInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeCXXCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeCXXCompilerABI.cpp
+file path=usr/share/cmake-2.6/Modules/CMakeCXXCompilerId.cpp.in
+file path=usr/share/cmake-2.6/Modules/CMakeCXXInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeCommonLanguageInclude.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeCompilerABI.h
+file path=usr/share/cmake-2.6/Modules/CMakeConfigurableFile.in
+file path=usr/share/cmake-2.6/Modules/CMakeDependentOption.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineASM-ATTCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineASMCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineCCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineCXXCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineCompilerABI.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineCompilerId.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineFortranCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineRCCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeExportBuildSettings.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeFindBinUtils.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeFindFrameworks.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeFindWMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeFindXCode.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeForceCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeFortranCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeFortranCompilerId.F90.in
+file path=usr/share/cmake-2.6/Modules/CMakeFortranInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeGenericSystem.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeImportBuildSettings.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeJavaCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeJavaInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeMSYSFindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeMinGWFindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeNMakeFindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakePlatformId.h.in
+file path=usr/share/cmake-2.6/Modules/CMakePrintSystemInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeRCCompiler.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeRCInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeSystem.cmake.in
+file path=usr/share/cmake-2.6/Modules/CMakeSystemSpecificInformation.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestASM-ATTCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestASMCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestCCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestCXXCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestForFreeVC.cxx
+file path=usr/share/cmake-2.6/Modules/CMakeTestFortranCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestGNU.c
+file path=usr/share/cmake-2.6/Modules/CMakeTestJavaCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeTestNMakeCLVersion.c
+file path=usr/share/cmake-2.6/Modules/CMakeTestRCCompiler.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeUnixFindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS6BackwardCompatibility.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS6FindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS71FindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS7BackwardCompatibility.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS7FindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS8FindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CMakeVS9FindMake.cmake
+file path=usr/share/cmake-2.6/Modules/CPack.DS_Store.in
+file path=usr/share/cmake-2.6/Modules/CPack.Description.plist.in
+file path=usr/share/cmake-2.6/Modules/CPack.Info.plist.in
+file path=usr/share/cmake-2.6/Modules/CPack.OSXScriptLauncher.in
+file path=usr/share/cmake-2.6/Modules/CPack.OSXX11.Info.plist.in
+file path=usr/share/cmake-2.6/Modules/CPack.RuntimeScript.in
+file path=usr/share/cmake-2.6/Modules/CPack.STGZ_Header.sh.in
+file path=usr/share/cmake-2.6/Modules/CPack.VolumeIcon.icns.in
+file path=usr/share/cmake-2.6/Modules/CPack.background.png.in
+file path=usr/share/cmake-2.6/Modules/CPack.cmake
+file path=usr/share/cmake-2.6/Modules/CPack.distribution.dist.in
+file path=usr/share/cmake-2.6/Modules/CPackDeb.cmake
+file path=usr/share/cmake-2.6/Modules/CPackRPM.cmake
+file path=usr/share/cmake-2.6/Modules/CPackZIP.cmake
+file path=usr/share/cmake-2.6/Modules/CTest.cmake
+file path=usr/share/cmake-2.6/Modules/CTestTargets.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCCompilerFlag.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCSourceCompiles.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCSourceRuns.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCXXCompilerFlag.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCXXSourceCompiles.cmake
+file path=usr/share/cmake-2.6/Modules/CheckCXXSourceRuns.cmake
+file path=usr/share/cmake-2.6/Modules/CheckForPthreads.c
+file path=usr/share/cmake-2.6/Modules/CheckFortranFunctionExists.cmake
+file path=usr/share/cmake-2.6/Modules/CheckFunctionExists.c
+file path=usr/share/cmake-2.6/Modules/CheckFunctionExists.cmake
+file path=usr/share/cmake-2.6/Modules/CheckIncludeFile.c.in
+file path=usr/share/cmake-2.6/Modules/CheckIncludeFile.cmake
+file path=usr/share/cmake-2.6/Modules/CheckIncludeFile.cxx.in
+file path=usr/share/cmake-2.6/Modules/CheckIncludeFileCXX.cmake
+file path=usr/share/cmake-2.6/Modules/CheckIncludeFiles.cmake
+file path=usr/share/cmake-2.6/Modules/CheckLibraryExists.cmake
+file path=usr/share/cmake-2.6/Modules/CheckLibraryExists.lists.in
+file path=usr/share/cmake-2.6/Modules/CheckSizeOf.cmake
+file path=usr/share/cmake-2.6/Modules/CheckStructHasMember.cmake
+file path=usr/share/cmake-2.6/Modules/CheckSymbolExists.cmake
+file path=usr/share/cmake-2.6/Modules/CheckTypeSize.cmake
+file path=usr/share/cmake-2.6/Modules/CheckTypeSizeC.c.in
+file path=usr/share/cmake-2.6/Modules/CheckVariableExists.c
+file path=usr/share/cmake-2.6/Modules/CheckVariableExists.cmake
+file path=usr/share/cmake-2.6/Modules/Dart.cmake
+file path=usr/share/cmake-2.6/Modules/DartConfiguration.tcl.in
+file path=usr/share/cmake-2.6/Modules/Documentation.cmake
+file path=usr/share/cmake-2.6/Modules/DummyCXXFile.cxx
+file path=usr/share/cmake-2.6/Modules/FLTKCompatibility.cmake
+file path=usr/share/cmake-2.6/Modules/FeatureSummary.cmake
+file path=usr/share/cmake-2.6/Modules/FindASPELL.cmake
+file path=usr/share/cmake-2.6/Modules/FindAVIFile.cmake
+file path=usr/share/cmake-2.6/Modules/FindBLAS.cmake
+file path=usr/share/cmake-2.6/Modules/FindBZip2.cmake
+file path=usr/share/cmake-2.6/Modules/FindBoost.cmake
+file path=usr/share/cmake-2.6/Modules/FindCABLE.cmake
+file path=usr/share/cmake-2.6/Modules/FindCURL.cmake
+file path=usr/share/cmake-2.6/Modules/FindCVS.cmake
+file path=usr/share/cmake-2.6/Modules/FindCups.cmake
+file path=usr/share/cmake-2.6/Modules/FindCurses.cmake
+file path=usr/share/cmake-2.6/Modules/FindCygwin.cmake
+file path=usr/share/cmake-2.6/Modules/FindDCMTK.cmake
+file path=usr/share/cmake-2.6/Modules/FindDart.cmake
+file path=usr/share/cmake-2.6/Modules/FindDoxygen.cmake
+file path=usr/share/cmake-2.6/Modules/FindEXPAT.cmake
+file path=usr/share/cmake-2.6/Modules/FindFLTK.cmake
+file path=usr/share/cmake-2.6/Modules/FindFLTK2.cmake
+file path=usr/share/cmake-2.6/Modules/FindFreetype.cmake
+file path=usr/share/cmake-2.6/Modules/FindGCCXML.cmake
+file path=usr/share/cmake-2.6/Modules/FindGDAL.cmake
+file path=usr/share/cmake-2.6/Modules/FindGIF.cmake
+file path=usr/share/cmake-2.6/Modules/FindGLU.cmake
+file path=usr/share/cmake-2.6/Modules/FindGLUT.cmake
+file path=usr/share/cmake-2.6/Modules/FindGTK.cmake
+file path=usr/share/cmake-2.6/Modules/FindGettext.cmake
+file path=usr/share/cmake-2.6/Modules/FindGnuplot.cmake
+file path=usr/share/cmake-2.6/Modules/FindHSPELL.cmake
+file path=usr/share/cmake-2.6/Modules/FindHTMLHelp.cmake
+file path=usr/share/cmake-2.6/Modules/FindITK.cmake
+file path=usr/share/cmake-2.6/Modules/FindImageMagick.cmake
+file path=usr/share/cmake-2.6/Modules/FindJNI.cmake
+file path=usr/share/cmake-2.6/Modules/FindJPEG.cmake
+file path=usr/share/cmake-2.6/Modules/FindJasper.cmake
+file path=usr/share/cmake-2.6/Modules/FindJava.cmake
+file path=usr/share/cmake-2.6/Modules/FindKDE3.cmake
+file path=usr/share/cmake-2.6/Modules/FindKDE4.cmake
+file path=usr/share/cmake-2.6/Modules/FindLAPACK.cmake
+file path=usr/share/cmake-2.6/Modules/FindLATEX.cmake
+file path=usr/share/cmake-2.6/Modules/FindLibXml2.cmake
+file path=usr/share/cmake-2.6/Modules/FindLibXslt.cmake
+file path=usr/share/cmake-2.6/Modules/FindLua50.cmake
+file path=usr/share/cmake-2.6/Modules/FindLua51.cmake
+file path=usr/share/cmake-2.6/Modules/FindMFC.cmake
+file path=usr/share/cmake-2.6/Modules/FindMPEG.cmake
+file path=usr/share/cmake-2.6/Modules/FindMPEG2.cmake
+file path=usr/share/cmake-2.6/Modules/FindMPI.cmake
+file path=usr/share/cmake-2.6/Modules/FindMatlab.cmake
+file path=usr/share/cmake-2.6/Modules/FindMotif.cmake
+file path=usr/share/cmake-2.6/Modules/FindOpenAL.cmake
+file path=usr/share/cmake-2.6/Modules/FindOpenGL.cmake
+file path=usr/share/cmake-2.6/Modules/FindOpenSSL.cmake
+file path=usr/share/cmake-2.6/Modules/FindOpenThreads.cmake
+file path=usr/share/cmake-2.6/Modules/FindPHP4.cmake
+file path=usr/share/cmake-2.6/Modules/FindPNG.cmake
+file path=usr/share/cmake-2.6/Modules/FindPackageHandleStandardArgs.cmake
+file path=usr/share/cmake-2.6/Modules/FindPackageMessage.cmake
+file path=usr/share/cmake-2.6/Modules/FindPerl.cmake
+file path=usr/share/cmake-2.6/Modules/FindPerlLibs.cmake
+file path=usr/share/cmake-2.6/Modules/FindPhysFS.cmake
+file path=usr/share/cmake-2.6/Modules/FindPike.cmake
+file path=usr/share/cmake-2.6/Modules/FindPkgConfig.cmake
+file path=usr/share/cmake-2.6/Modules/FindProducer.cmake
+file path=usr/share/cmake-2.6/Modules/FindPythonInterp.cmake
+file path=usr/share/cmake-2.6/Modules/FindPythonLibs.cmake
+file path=usr/share/cmake-2.6/Modules/FindQt.cmake
+file path=usr/share/cmake-2.6/Modules/FindQt3.cmake
+file path=usr/share/cmake-2.6/Modules/FindQt4.cmake
+file path=usr/share/cmake-2.6/Modules/FindQuickTime.cmake
+file path=usr/share/cmake-2.6/Modules/FindRuby.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL_image.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL_mixer.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL_net.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL_sound.cmake
+file path=usr/share/cmake-2.6/Modules/FindSDL_ttf.cmake
+file path=usr/share/cmake-2.6/Modules/FindSWIG.cmake
+file path=usr/share/cmake-2.6/Modules/FindSelfPackers.cmake
+file path=usr/share/cmake-2.6/Modules/FindSubversion.cmake
+file path=usr/share/cmake-2.6/Modules/FindTCL.cmake
+file path=usr/share/cmake-2.6/Modules/FindTIFF.cmake
+file path=usr/share/cmake-2.6/Modules/FindTclStub.cmake
+file path=usr/share/cmake-2.6/Modules/FindTclsh.cmake
+file path=usr/share/cmake-2.6/Modules/FindThreads.cmake
+file path=usr/share/cmake-2.6/Modules/FindUnixCommands.cmake
+file path=usr/share/cmake-2.6/Modules/FindVTK.cmake
+file path=usr/share/cmake-2.6/Modules/FindWget.cmake
+file path=usr/share/cmake-2.6/Modules/FindWish.cmake
+file path=usr/share/cmake-2.6/Modules/FindX11.cmake
+file path=usr/share/cmake-2.6/Modules/FindXMLRPC.cmake
+file path=usr/share/cmake-2.6/Modules/FindZLIB.cmake
+file path=usr/share/cmake-2.6/Modules/Findosg.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgDB.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgFX.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgGA.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgIntrospection.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgManipulator.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgParticle.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgProducer.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgShadow.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgSim.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgTerrain.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgText.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgUtil.cmake
+file path=usr/share/cmake-2.6/Modules/FindosgViewer.cmake
+file path=usr/share/cmake-2.6/Modules/FindwxWidgets.cmake
+file path=usr/share/cmake-2.6/Modules/FindwxWindows.cmake
+file path=usr/share/cmake-2.6/Modules/GetPrerequisites.cmake
+file path=usr/share/cmake-2.6/Modules/ITKCompatibility.cmake
+file path=usr/share/cmake-2.6/Modules/InstallRequiredSystemLibraries.cmake
+file path=usr/share/cmake-2.6/Modules/KDE3Macros.cmake
+file path=usr/share/cmake-2.6/Modules/MacOSXBundleInfo.plist.in
+file path=usr/share/cmake-2.6/Modules/MacOSXFrameworkInfo.plist.in
+file path=usr/share/cmake-2.6/Modules/MacroAddFileDependencies.cmake
+file path=usr/share/cmake-2.6/Modules/NSIS.InstallOptions.ini.in
+file path=usr/share/cmake-2.6/Modules/NSIS.template.in
+file path=usr/share/cmake-2.6/Modules/Platform/AIX-VisualAge-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/AIX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/BSDOS.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/BeOS.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/BlueGeneL.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/CYGWIN-g77.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/CYGWIN.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Catamount.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Darwin-icc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Darwin-icpc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Darwin-xlc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Darwin.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/DragonFly.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/FreeBSD.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/GNU.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-ASM.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-CXX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic-ADSP-Common.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic-SDCC-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Generic.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/HP-UX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/IRIX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/IRIX64.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-GNU-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-Intel-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-Intel-CXX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-Intel-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-PGI-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-PGI-CXX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-PGI-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-CXX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-SunPro-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-VisualAge-C.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-VisualAge-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-como.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-icpc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux-ifort.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Linux.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/MP-RAS.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/NetBSD.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/OSF1.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/OpenBSD.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/QNX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/RISCos.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/SCO_SV.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/SINIX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/SunOS-SunPro-Fortran.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/SunOS.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Tru64.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/ULTRIX.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/UNIX_SV.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/UnixPaths.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/UnixWare.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-bcc32.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-cl.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-cl.cmake.in
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-df.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-g++.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-g77.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-gcc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-icl.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-ifort.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows-wcl386.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Windows.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/WindowsPaths.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/Xenix.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/cl.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/eCos.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/g77.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/gas.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/gcc.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/kFreeBSD.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/syllable.cmake
+file path=usr/share/cmake-2.6/Modules/Platform/xlf.cmake
+file path=usr/share/cmake-2.6/Modules/SystemInformation.cmake
+file path=usr/share/cmake-2.6/Modules/SystemInformation.in
+file path=usr/share/cmake-2.6/Modules/TestBigEndian.cmake
+file path=usr/share/cmake-2.6/Modules/TestCXXAcceptsFlag.cmake
+file path=usr/share/cmake-2.6/Modules/TestEndianess.c.in
+file path=usr/share/cmake-2.6/Modules/TestForANSIForScope.cmake
+file path=usr/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cmake
+file path=usr/share/cmake-2.6/Modules/TestForANSIStreamHeaders.cxx
+file path=usr/share/cmake-2.6/Modules/TestForAnsiForScope.cxx
+file path=usr/share/cmake-2.6/Modules/TestForSSTREAM.cmake
+file path=usr/share/cmake-2.6/Modules/TestForSSTREAM.cxx
+file path=usr/share/cmake-2.6/Modules/TestForSTDNamespace.cmake
+file path=usr/share/cmake-2.6/Modules/TestForSTDNamespace.cxx
+file path=usr/share/cmake-2.6/Modules/UseEcos.cmake
+file path=usr/share/cmake-2.6/Modules/UsePkgConfig.cmake
+file path=usr/share/cmake-2.6/Modules/UseQt4.cmake
+file path=usr/share/cmake-2.6/Modules/UseSWIG.cmake
+file path=usr/share/cmake-2.6/Modules/UseVTK40.cmake
+file path=usr/share/cmake-2.6/Modules/UseVTKBuildSettings40.cmake
+file path=usr/share/cmake-2.6/Modules/UseVTKConfig40.cmake
+file path=usr/share/cmake-2.6/Modules/Use_wxWindows.cmake
+file path=usr/share/cmake-2.6/Modules/UsewxWidgets.cmake
+file path=usr/share/cmake-2.6/Modules/VTKCompatibility.cmake
+file path=usr/share/cmake-2.6/Modules/ecos_clean.cmake
+file path=usr/share/cmake-2.6/Modules/kde3init_dummy.cpp.in
+file path=usr/share/cmake-2.6/Modules/kde3uic.cmake
+file path=usr/share/cmake-2.6/Modules/readme.txt
+file path=usr/share/cmake-2.6/Templates/CMakeLists.txt
+file path=usr/share/cmake-2.6/Templates/CMakeVSMacros1.vsmacros
+file path=usr/share/cmake-2.6/Templates/CMakeVSMacros2.vsmacros
+file path=usr/share/cmake-2.6/Templates/CMakeVisualStudio6Configurations.cmake
+file path=usr/share/cmake-2.6/Templates/CPack.GenericDescription.txt
+file path=usr/share/cmake-2.6/Templates/CPack.GenericLicense.txt
+file path=usr/share/cmake-2.6/Templates/CPack.GenericWelcome.txt
+file path=usr/share/cmake-2.6/Templates/CPackConfig.cmake.in
+file path=usr/share/cmake-2.6/Templates/CTestScript.cmake.in
+file path=usr/share/cmake-2.6/Templates/DLLFooter.dsptemplate
+file path=usr/share/cmake-2.6/Templates/DLLHeader.dsptemplate
+file path=usr/share/cmake-2.6/Templates/EXEFooter.dsptemplate
+file path=usr/share/cmake-2.6/Templates/EXEHeader.dsptemplate
+file path=usr/share/cmake-2.6/Templates/EXEWinHeader.dsptemplate
+file path=usr/share/cmake-2.6/Templates/TestDriver.cxx.in
+file path=usr/share/cmake-2.6/Templates/UtilityFooter.dsptemplate
+file path=usr/share/cmake-2.6/Templates/UtilityHeader.dsptemplate
+file path=usr/share/cmake-2.6/Templates/cygwin-package.sh.in
+file path=usr/share/cmake-2.6/Templates/staticLibFooter.dsptemplate
+file path=usr/share/cmake-2.6/Templates/staticLibHeader.dsptemplate
+file path=usr/share/cmake-2.6/doc/ccmake.docbook
+file path=usr/share/cmake-2.6/doc/ccmake.html
+file path=usr/share/cmake-2.6/doc/ccmake.txt
+file path=usr/share/cmake-2.6/doc/cmake-commands.html
+file path=usr/share/cmake-2.6/doc/cmake-commands.txt
+file path=usr/share/cmake-2.6/doc/cmake-compatcommands.html
+file path=usr/share/cmake-2.6/doc/cmake-compatcommands.txt
+file path=usr/share/cmake-2.6/doc/cmake-modules.html
+file path=usr/share/cmake-2.6/doc/cmake-modules.txt
+file path=usr/share/cmake-2.6/doc/cmake-policies.html
+file path=usr/share/cmake-2.6/doc/cmake-policies.txt
+file path=usr/share/cmake-2.6/doc/cmake-properties.html
+file path=usr/share/cmake-2.6/doc/cmake-properties.txt
+file path=usr/share/cmake-2.6/doc/cmake-variables.html
+file path=usr/share/cmake-2.6/doc/cmake-variables.txt
+file path=usr/share/cmake-2.6/doc/cmake.docbook
+file path=usr/share/cmake-2.6/doc/cmake.html
+file path=usr/share/cmake-2.6/doc/cmake.txt
+file path=usr/share/cmake-2.6/doc/cpack.docbook
+file path=usr/share/cmake-2.6/doc/cpack.html
+file path=usr/share/cmake-2.6/doc/cpack.txt
+file path=usr/share/cmake-2.6/doc/ctest.docbook
+file path=usr/share/cmake-2.6/doc/ctest.html
+file path=usr/share/cmake-2.6/doc/ctest.txt
+file path=usr/share/cmake-2.6/include/cmCPluginAPI.h
+file path=usr/share/man/man1/ccmake.1
+file path=usr/share/man/man1/cmake.1
+file path=usr/share/man/man1/cmakecommands.1
+file path=usr/share/man/man1/cmakecompat.1
+file path=usr/share/man/man1/cmakemodules.1
+file path=usr/share/man/man1/cmakepolicies.1
+file path=usr/share/man/man1/cmakeprops.1
+file path=usr/share/man/man1/cmakevars.1
+file path=usr/share/man/man1/cpack.1
+file path=usr/share/man/man1/ctest.1
+
+license cmake.license license="BSD, MIT, GPLv2, Curl, PD"
+
+legacy pkg=SUNWcmake \
+    desc="CMake - A cross-platform, open-source make system (2.6.2)" \
+    name="CMake - A cross-platform, open-source make system."
+
+# pkgdepend should have picked up these dependencies;
+# these explicit depend actions can be removed if pkgdepend is fixed later
+depend fmri=__TBD \
+    pkg.debug.depend.file=usr/lib/libm.so.2 \
+    pkg.debug.reason=usr/bin/cmake \
+    type=require
+
+depend fmri=__TBD \
+    pkg.debug.depend.file=usr/bin/sh \
+    pkg.debug.reason=usr/share/cmake-2.6/Modules/CPack.RuntimeScript.in \
+    type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cmake/patches-post-config/CmakeCache-txt.patch	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,101 @@
+diff -u ./CMakeCache.txt ./CMakeCache.txt
+--- ./CMakeCache.txt	Wed Jun  1 11:23:27 2011
++++ ./CMakeCache.txt.new	Wed Jun  1 11:23:28 2011
[email protected]@ -435,7 +435,7 @@
+ cmcompress_LIB_DEPENDS:STATIC=
+ 
+ //Dependencies for the target
+-cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;crypto;general;ssl;general;idn;general;cmzlib;
++cmcurl_LIB_DEPENDS:STATIC=general;dl;general;socket;general;nsl;general;idn;general;cmzlib;
+ 
+ //Dependencies for target
+ cmexpat_LIB_DEPENDS:STATIC=
[email protected]@ -720,7 +720,7 @@
+ //Result of TRY_COMPILE
+ HAVE_CMEXPAT_BIGENDIAN:INTERNAL=TRUE
+ //Have symbol CRYPTO_cleanup_all_ex_data
+-HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=1
++HAVE_CRYPTO_CLEANUP_ALL_EX_DATA:INTERNAL=
+ //Have include HAVE_CTYPE_H
+ HAVE_CTYPE_H:INTERNAL=1
+ //Have include HAVE_DIRENT_H
[email protected]@ -729,7 +729,7 @@
+ HAVE_DIRNAME:INTERNAL=1
+ //Have include HAVE_DLFCN_H
+ HAVE_DLFCN_H:INTERNAL=1
+-//Have library dl;socket;nsl;crypto;ssl;idn
++//Have library dl;socket;nsl;idn
+ HAVE_DLOPEN:INTERNAL=1
+ //Have include elf.h
+ HAVE_ELF_H:INTERNAL=1
[email protected]@ -852,19 +852,19 @@
+ //Have symbol lchown
+ HAVE_LCHOWN:INTERNAL=1
+ //Have library crypto;dl;socket;nsl
+-HAVE_LIBCRYPTO:INTERNAL=1
++HAVE_LIBCRYPTO:INTERNAL=
+ //Have library dl;
+ HAVE_LIBDL:INTERNAL=1
+ //Have include HAVE_LIBGEN_H
+ HAVE_LIBGEN_H:INTERNAL=1
+-//Have library idn;dl;socket;nsl;crypto;ssl
++//Have library idn;dl;socket;nsl
+ HAVE_LIBIDN:INTERNAL=1
+ //Have library nsl;dl;socket
+ HAVE_LIBNSL:INTERNAL=1
+ //Have library socket;dl
+ HAVE_LIBSOCKET:INTERNAL=1
+-//Have library ssl;dl;socket;nsl;crypto
+-HAVE_LIBSSL:INTERNAL=1
++//Have library ssl;dl;socket;nsl
++HAVE_LIBSSL:INTERNAL=
+ //Have library winmm;dl;socket;nsl
+ HAVE_LIBWINMM:INTERNAL=
+ //Have library ws2_32;dl;socket;nsl
[email protected]@ -898,23 +898,23 @@
+ //Have include HAVE_NET_IF_H
+ HAVE_NET_IF_H:INTERNAL=1
+ //Have include HAVE_OPENSSL_CRYPTO_H
+-HAVE_OPENSSL_CRYPTO_H:INTERNAL=1
++HAVE_OPENSSL_CRYPTO_H:INTERNAL=
+ //Have include HAVE_OPENSSL_ENGINE_H
+-HAVE_OPENSSL_ENGINE_H:INTERNAL=1
++HAVE_OPENSSL_ENGINE_H:INTERNAL=
+ //Have include HAVE_OPENSSL_ERR_H
+-HAVE_OPENSSL_ERR_H:INTERNAL=1
++HAVE_OPENSSL_ERR_H:INTERNAL=
+ //Have include HAVE_OPENSSL_PEM_H
+-HAVE_OPENSSL_PEM_H:INTERNAL=1
++HAVE_OPENSSL_PEM_H:INTERNAL=
+ //Have include HAVE_OPENSSL_PKCS12_H
+-HAVE_OPENSSL_PKCS12_H:INTERNAL=1
++HAVE_OPENSSL_PKCS12_H:INTERNAL=
+ //Have include HAVE_OPENSSL_RAND_H
+-HAVE_OPENSSL_RAND_H:INTERNAL=1
++HAVE_OPENSSL_RAND_H:INTERNAL=
+ //Have include HAVE_OPENSSL_RSA_H
+-HAVE_OPENSSL_RSA_H:INTERNAL=1
++HAVE_OPENSSL_RSA_H:INTERNAL=
+ //Have include HAVE_OPENSSL_SSL_H
+-HAVE_OPENSSL_SSL_H:INTERNAL=1
++HAVE_OPENSSL_SSL_H:INTERNAL=
+ //Have include HAVE_OPENSSL_X509_H
+-HAVE_OPENSSL_X509_H:INTERNAL=1
++HAVE_OPENSSL_X509_H:INTERNAL=
+ //Curl test 
+ HAVE_O_NONBLOCK:INTERNAL=1
+ //Curl test 
[email protected]@ -938,11 +938,11 @@
+ //Have include HAVE_PWD_H
+ HAVE_PWD_H:INTERNAL=1
+ //Have symbol RAND_egd
+-HAVE_RAND_EGD:INTERNAL=1
++HAVE_RAND_EGD:INTERNAL=
+ //Have symbol RAND_screen
+ HAVE_RAND_SCREEN:INTERNAL=
+ //Have symbol RAND_status
+-HAVE_RAND_STATUS:INTERNAL=1
++HAVE_RAND_STATUS:INTERNAL=
+ //Have symbol select
+ HAVE_SELECT:INTERNAL=1
+ //Have symbol setgroups

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/cmake/patches/cmake-2.6.2.patch	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,2085 @@
+diff -ru cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake
+--- cmake-2.6.2.org//Modules/CMakeDetermineJavaCompiler.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/CMakeDetermineJavaCompiler.cmake	Thu May 21 16:21:06 2009
[email protected]@ -41,8 +41,9 @@
+     /usr/bin
+     /usr/lib/java/bin
+     /usr/share/java/bin
+-    /usr/local/bin
+-    /usr/local/java/bin
++# Uncomment the following to enable /usr/local search
++#    /usr/local/bin
++#    /usr/local/java/bin
+     /usr/java/j2sdk1.4.2_04
+     /usr/lib/j2sdk1.4-sun/bin
+     /usr/lib/j2sdk1.5-sun/bin
+diff -ru cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake cmake-2.6.2/Modules/CMakeDetermineSystem.cmake
+--- cmake-2.6.2.org//Modules/CMakeDetermineSystem.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/CMakeDetermineSystem.cmake	Thu May 21 16:21:06 2009
[email protected]@ -29,7 +29,9 @@
+ 
+ # find out on which system cmake runs
+ IF(CMAKE_HOST_UNIX)
+-  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
++  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin )
++# Uncomment the following to enable /usr/local search
++#  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+   IF(CMAKE_UNAME)
+     EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
+     EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
+diff -ru cmake-2.6.2.org//Modules/FindAVIFile.cmake cmake-2.6.2/Modules/FindAVIFile.cmake
+--- cmake-2.6.2.org//Modules/FindAVIFile.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindAVIFile.cmake	Thu May 21 16:21:06 2009
[email protected]@ -12,14 +12,16 @@
+ IF (UNIX)
+ 
+   FIND_PATH(AVIFILE_INCLUDE_DIR avifile.h
+-    /usr/local/avifile/include
+-    /usr/local/include/avifile
++# Uncomment the following to enable /usr/local search
++#    /usr/local/avifile/include
++#    /usr/local/include/avifile
+     /usr/include
+   )
+ 
+   FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
+-    /usr/local/avifile/lib
+-    /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#    /usr/local/avifile/lib
++#    /usr/local/lib
+     /usr/lib
+   )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindBLAS.cmake cmake-2.6.2/Modules/FindBLAS.cmake
+--- cmake-2.6.2.org//Modules/FindBLAS.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindBLAS.cmake	Thu May 21 16:21:06 2009
[email protected]@ -72,7 +72,9 @@
+     endif(BLA_STATIC)
+     find_library(${_prefix}_${_library}_LIBRARY
+     NAMES ${_library}
+-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
++    PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV DYLD_LIBRARY_PATH
++# Uncomment the following to enable /usr/local search
++#    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
+     )
+ 
+    else ( APPLE )
[email protected]@ -81,7 +83,9 @@
+     endif(BLA_STATIC)
+     find_library(${_prefix}_${_library}_LIBRARY
+     NAMES ${_library}
+-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
++    PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
++# Uncomment the following to enable /usr/local search
++#    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
+     )
+    endif( APPLE )
+     mark_as_advanced(${_prefix}_${_library}_LIBRARY)
+diff -ru cmake-2.6.2.org//Modules/FindFLTK.cmake cmake-2.6.2/Modules/FindFLTK.cmake
+--- cmake-2.6.2.org//Modules/FindFLTK.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindFLTK.cmake	Thu May 21 16:21:06 2009
[email protected]@ -78,11 +78,14 @@
+     ${FLTK_DIR_SEARCH}
+ 
+     # Look in standard UNIX install locations.
+-    /usr/local/lib/fltk
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib/fltk
+     /usr/lib/fltk
+-    /usr/local/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include
+     /usr/include
+-    /usr/local/fltk
++# Uncomment the following to enable /usr/local search
++#    /usr/local/fltk
+     /usr/X11R6/include
+ 
+     # Read from the CMakeSetup registry entries.  It is likely that
[email protected]@ -173,7 +176,8 @@
+     ENDIF(FLTK_FLUID_EXECUTABLE)
+ 
+     SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
+-      /usr/local/fltk
++# Uncomment the following to enable /usr/local search
++#      /usr/local/fltk
+       /usr/X11R6/include
+       )
+ 
[email protected]@ -180,7 +184,8 @@
+     FIND_PATH(FLTK_INCLUDE_DIR FL/Fl.h ${FLTK_INCLUDE_SEARCH_PATH})
+ 
+     SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
+-      /usr/local/fltk/lib
++# Uncomment the following to enable /usr/local search
++#      /usr/local/fltk/lib
+       /usr/X11R6/lib
+       ${FLTK_INCLUDE_DIR}/lib
+       )
+diff -ru cmake-2.6.2.org//Modules/FindFLTK2.cmake cmake-2.6.2/Modules/FindFLTK2.cmake
+--- cmake-2.6.2.org//Modules/FindFLTK2.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindFLTK2.cmake	Thu May 21 16:21:07 2009
[email protected]@ -74,11 +74,14 @@
+     ${FLTK2_DIR_SEARCH}
+ 
+     # Look in standard UNIX install locations.
+-    /usr/local/lib/fltk2
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib/fltk2
+     /usr/lib/fltk2
+-    /usr/local/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include
+     /usr/include
+-    /usr/local/fltk2
++# Uncomment the following to enable /usr/local search
++#    /usr/local/fltk2
+     /usr/X11R6/include
+ 
+     # Read from the CMakeSetup registry entries.  It is likely that
[email protected]@ -184,9 +187,11 @@
+     ENDIF(FLTK2_FLUID_EXECUTABLE)
+ 
+     SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
+-      /usr/local/include
++# Uncomment the following to enable /usr/local search
++#      /usr/local/include
+       /usr/include
+-      /usr/local/fltk2
++# Uncomment the following to enable /usr/local search
++#      /usr/local/fltk2
+       /usr/X11R6/include
+       )
+ 
[email protected]@ -194,8 +199,9 @@
+ 
+     SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
+       /usr/lib
+-      /usr/local/lib
+-      /usr/local/fltk2/lib
++# Uncomment the following to enable /usr/local search
++#      /usr/local/lib
++#      /usr/local/fltk2/lib
+       /usr/X11R6/lib
+       ${FLTK2_INCLUDE_DIR}/lib
+       )
+diff -ru cmake-2.6.2.org//Modules/FindFreetype.cmake cmake-2.6.2/Modules/FindFreetype.cmake
+--- cmake-2.6.2.org//Modules/FindFreetype.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindFreetype.cmake	Thu May 21 16:21:07 2009
[email protected]@ -33,8 +33,9 @@
+   $ENV{FREETYPE_DIR}
+   PATH_SUFFIXES include
+   PATHS
+-  /usr/local/X11R6/include
+-  /usr/local/X11/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/X11R6/include
++#  /usr/local/X11/include
+   /usr/X11/include
+   /sw/include
+   /opt/local/include
[email protected]@ -45,8 +46,9 @@
+   HINTS
+   $ENV{FREETYPE_DIR}/include/freetype2
+   PATHS
+-  /usr/local/X11R6/include
+-  /usr/local/X11/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/X11R6/include
++#  /usr/local/X11/include
+   /usr/X11/include
+   /sw/include
+   /opt/local/include
[email protected]@ -60,8 +62,9 @@
+   $ENV{FREETYPE_DIR}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+-  /usr/local/X11R6
+-  /usr/local/X11
++# Uncomment the following to enable /usr/local search
++#  /usr/local/X11R6
++#  /usr/local/X11
+   /usr/X11
+   /sw
+   /usr/freeware
+diff -ru cmake-2.6.2.org//Modules/FindGDAL.cmake cmake-2.6.2/Modules/FindGDAL.cmake
+--- cmake-2.6.2.org//Modules/FindGDAL.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindGDAL.cmake	Thu May 21 16:21:07 2009
[email protected]@ -26,9 +26,10 @@
+   PATHS
+   ~/Library/Frameworks/gdal.framework/Headers
+   /Library/Frameworks/gdal.framework/Headers
+-  /usr/local/include/gdal
+-  /usr/local/include/GDAL
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/gdal
++#  /usr/local/include/GDAL
++#  /usr/local/include
+   /usr/include/gdal
+   /usr/include/GDAL
+   /usr/include
[email protected]@ -38,9 +39,10 @@
+   /opt/local/include/gdal
+   /opt/local/include/GDAL
+   /opt/local/include # DarwinPorts
+-  /opt/csw/include/gdal
+-  /opt/csw/include/GDAL
+-  /opt/csw/include # Blastwave
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/gdal
++#  /opt/csw/include/GDAL
++#  /opt/csw/include # Blastwave
+   /opt/include/gdal
+   /opt/include/GDAL
+   /opt/include
[email protected]@ -54,11 +56,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw
+     /opt/local
+-    /opt/csw
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw
+     /opt
+     /usr/freeware
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
+diff -ru cmake-2.6.2.org//Modules/FindGIF.cmake cmake-2.6.2/Modules/FindGIF.cmake
+--- cmake-2.6.2.org//Modules/FindGIF.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindGIF.cmake	Thu May 21 16:21:07 2009
[email protected]@ -32,11 +32,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+   [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
+   /usr/freeware
+diff -ru cmake-2.6.2.org//Modules/FindGTK.cmake cmake-2.6.2/Modules/FindGTK.cmake
+--- cmake-2.6.2.org//Modules/FindGTK.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindGTK.cmake	Thu May 21 16:21:07 2009
[email protected]@ -23,9 +23,11 @@
+   FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
+     PATHS
+     /usr/openwin/share/include
+-    /usr/local/include/glib12
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include/glib12
+     /usr/lib/glib/include
+-    /usr/local/lib/glib/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib/glib/include
+     /opt/gnome/include
+     /opt/gnome/lib/glib/include
+   )
+diff -ru cmake-2.6.2.org//Modules/FindITK.cmake cmake-2.6.2/Modules/FindITK.cmake
+--- cmake-2.6.2.org//Modules/FindITK.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindITK.cmake	Thu May 21 16:21:07 2009
[email protected]@ -50,7 +50,8 @@
+     ${ITK_DIR_SEARCH}
+ 
+     # Look in standard UNIX install locations.
+-    /usr/local/lib/InsightToolkit
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib/InsightToolkit
+     /usr/lib/InsightToolkit
+ 
+     # Read from the CMakeSetup registry entries.  It is likely that
+diff -ru cmake-2.6.2.org//Modules/FindJNI.cmake cmake-2.6.2/Modules/FindJNI.cmake
+--- cmake-2.6.2.org//Modules/FindJNI.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindJNI.cmake	Thu May 21 16:21:07 2009
[email protected]@ -23,23 +23,27 @@
+   $ENV{JAVA_HOME}/jre/lib/amd64
+   $ENV{JAVA_HOME}/jre/lib/ppc
+   /usr/lib
+-  /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib
+   /usr/lib/jvm/java/lib
+   /usr/lib/java/jre/lib/i386
+-  /usr/local/lib/java/jre/lib/i386
+-  /usr/local/share/java/jre/lib/i386
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib/java/jre/lib/i386
++#  /usr/local/share/java/jre/lib/i386
+   /usr/lib/j2sdk1.4-sun/jre/lib/i386
+   /usr/lib/j2sdk1.5-sun/jre/lib/i386
+   /opt/sun-jdk-1.5.0.04/jre/lib/amd64
+   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
+   /usr/lib/java/jre/lib/amd64
+-  /usr/local/lib/java/jre/lib/amd64
+-  /usr/local/share/java/jre/lib/amd64
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib/java/jre/lib/amd64
++#  /usr/local/share/java/jre/lib/amd64
+   /usr/lib/j2sdk1.4-sun/jre/lib/amd64
+   /usr/lib/j2sdk1.5-sun/jre/lib/amd64
+   /usr/lib/java/jre/lib/ppc
+-  /usr/local/lib/java/jre/lib/ppc
+-  /usr/local/share/java/jre/lib/ppc
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib/java/jre/lib/ppc
++#  /usr/local/share/java/jre/lib/ppc
+   /usr/lib/j2sdk1.4-sun/jre/lib/ppc
+   /usr/lib/j2sdk1.5-sun/jre/lib/ppc
+   )
[email protected]@ -61,12 +65,15 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+   /usr/include 
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include
+   /usr/lib/java/include
+-  /usr/local/lib/java/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib/java/include
+   /usr/lib/jvm/java/include
+   /usr/lib/jvm/java-6-sun-1.6.0.00/include
+-  /usr/local/share/java/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/share/java/include
+   /usr/lib/j2sdk1.4-sun/include
+   /usr/lib/j2sdk1.5-sun/include
+   /opt/sun-jdk-1.5.0.04/include
+diff -ru cmake-2.6.2.org//Modules/FindJava.cmake cmake-2.6.2/Modules/FindJava.cmake
+--- cmake-2.6.2.org//Modules/FindJava.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindJava.cmake	Thu May 21 16:21:07 2009
[email protected]@ -20,9 +20,10 @@
+   /usr/bin
+   /usr/lib/java/bin
+   /usr/share/java/bin
+-  /usr/local/bin
+-  /usr/local/java/bin
+-  /usr/local/java/share/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
++#  /usr/local/java/bin
++#  /usr/local/java/share/bin
+   /usr/java/j2sdk1.4.2_04
+   /usr/lib/j2sdk1.4-sun/bin
+   /usr/java/j2sdk1.4.2_09/bin
+diff -ru cmake-2.6.2.org//Modules/FindKDE3.cmake cmake-2.6.2/Modules/FindKDE3.cmake
+--- cmake-2.6.2.org//Modules/FindKDE3.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindKDE3.cmake	Thu May 21 16:21:07 2009
[email protected]@ -127,7 +127,8 @@
+   /opt/kde3/include
+   /opt/kde/include
+   /usr/include/kde
+-  /usr/local/include/kde
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/kde
+   )
+ 
+ #now the KDE library directory
+diff -ru cmake-2.6.2.org//Modules/FindLAPACK.cmake cmake-2.6.2/Modules/FindLAPACK.cmake
+--- cmake-2.6.2.org//Modules/FindLAPACK.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindLAPACK.cmake	Thu May 21 16:21:07 2009
[email protected]@ -80,7 +80,9 @@
+     endif(BLA_STATIC)
+     find_library(${_prefix}_${_library}_LIBRARY
+     NAMES ${_library}
+-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
++    PATHS /usr/lib /usr/lib/32 /usr/lib/64 ENV LD_LIBRARY_PATH
++# Uncomment the following to enable /usr/local search
++#    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
+     )
+     endif(APPLE)
+ 
+diff -ru cmake-2.6.2.org//Modules/FindLua50.cmake cmake-2.6.2/Modules/FindLua50.cmake
+--- cmake-2.6.2.org//Modules/FindLua50.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindLua50.cmake	Thu May 21 16:21:07 2009
[email protected]@ -19,11 +19,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw # Fink
+   /opt/local # DarwinPorts
+-  /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw # Blastwave
+   /opt
+ )
+ 
[email protected]@ -31,15 +33,17 @@
+   NAMES lua50 lua5.0 lua5 lua
+   HINTS
+   $ENV{LUA_DIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
[email protected]@ -55,11 +59,13 @@
+     $ENV{LUA_DIR}
+     PATH_SUFFIXES lib64 lib
+     PATHS
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw
+     /opt/local
+-    /opt/csw
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw
+     /opt
+   )
+   IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
+diff -ru cmake-2.6.2.org//Modules/FindLua51.cmake cmake-2.6.2/Modules/FindLua51.cmake
+--- cmake-2.6.2.org//Modules/FindLua51.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindLua51.cmake	Thu May 21 16:21:07 2009
[email protected]@ -19,11 +19,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw # Fink
+   /opt/local # DarwinPorts
+-  /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw # Blastwave
+   /opt
+ )
+ 
[email protected]@ -31,15 +33,17 @@
+   NAMES lua51 lua5.1 lua
+   HINTS
+   $ENV{LUA_DIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindMPI.cmake cmake-2.6.2/Modules/FindMPI.cmake
+--- cmake-2.6.2.org//Modules/FindMPI.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindMPI.cmake	Thu May 21 16:21:07 2009
[email protected]@ -243,10 +243,12 @@
+   set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
+ else (MPI_COMPILE_CMDLINE)
+   find_path(MPI_INCLUDE_PATH mpi.h 
+-    /usr/local/include 
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include 
+     /usr/include 
+     /usr/include/mpi
+-    /usr/local/mpi/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/mpi/include
+     "C:/Program Files/MPICH/SDK/Include" 
+     "$ENV{SystemDrive}/Program Files/MPICH2/include"
+     "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
[email protected]@ -261,7 +263,9 @@
+   
+   find_library(MPI_LIBRARY 
+     NAMES mpi mpich msmpi
+-    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
++    PATHS /usr/lib /usr/lib/32 /usr/lib/64
++# Uncomment the following to enable /usr/local search
++#    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+     "C:/Program Files/MPICH/SDK/Lib" 
+     "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
+     "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
[email protected]@ -273,7 +277,9 @@
+ 
+   find_library(MPI_EXTRA_LIBRARY 
+     NAMES mpi++
+-    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
++    PATHS /usr/lib /usr/lib/32 /usr/lib/64
++# Uncomment the following to enable /usr/local search
++#    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+     "C:/Program Files/MPICH/SDK/Lib" 
+     DOC "Extra MPI libraries to link against.")
+ 
+diff -ru cmake-2.6.2.org//Modules/FindOpenAL.cmake cmake-2.6.2/Modules/FindOpenAL.cmake
+--- cmake-2.6.2.org//Modules/FindOpenAL.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindOpenAL.cmake	Thu May 21 16:21:07 2009
[email protected]@ -55,11 +55,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw # Fink
+   /opt/local # DarwinPorts
+-  /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw # Blastwave
+   /opt
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+ )
[email protected]@ -68,15 +70,17 @@
+   NAMES OpenAL al openal OpenAL32
+   HINTS
+   $ENV{OPENALDIR}
+-  PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
++  PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir]
+ )
+diff -ru cmake-2.6.2.org//Modules/FindOpenThreads.cmake cmake-2.6.2/Modules/FindOpenThreads.cmake
+--- cmake-2.6.2.org//Modules/FindOpenThreads.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindOpenThreads.cmake	Thu May 21 16:21:07 2009
[email protected]@ -51,11 +51,13 @@
+     PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include
+     /usr/include
+     /sw/include # Fink
+     /opt/local/include # DarwinPorts
+-    /opt/csw/include # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw/include # Blastwave
+     /opt/include
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
[email protected]@ -79,16 +81,20 @@
+     PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local/lib64
+-    /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib64
++#    /usr/local/lib
+     /usr/lib64
+     /usr/lib
++    /usr/lib/32
++    /usr/lib/64
+     /sw/lib64
+     /sw/lib
+     /opt/local/lib64
+     /opt/local/lib
+-    /opt/csw/lib64
+-    /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw/lib64
++#    /opt/csw/lib
+     /opt/lib64
+     /opt/lib
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
[email protected]@ -112,16 +118,20 @@
+     $ENV{OSGDIR}/lib
+     $ENV{OSGDIR}
+     PATHS
+-    /usr/local/lib64
+-    /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib64
++#    /usr/local/lib
+     /usr/lib64
+     /usr/lib
++    /usr/lib/32
++    /usr/lib/64
+     /sw/lib64
+     /sw/lib
+     /opt/local/lib64
+     /opt/local/lib
+-    /opt/csw/lib64
+-    /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw/lib64
++#    /opt/csw/lib
+     /opt/lib64
+     /opt/lib
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+diff -ru cmake-2.6.2.org//Modules/FindPHP4.cmake cmake-2.6.2/Modules/FindPHP4.cmake
+--- cmake-2.6.2.org//Modules/FindPHP4.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindPHP4.cmake	Thu May 21 16:21:07 2009
[email protected]@ -9,10 +9,12 @@
+ 
+ SET(PHP4_POSSIBLE_INCLUDE_PATHS
+   /usr/include/php4
+-  /usr/local/include/php4
++  /usr/php4/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/php4
+   /usr/include/php
+-  /usr/local/include/php
+-  /usr/local/apache/php
++#  /usr/local/include/php
++#  /usr/local/apache/php
+   )
+ 
+ SET(PHP4_POSSIBLE_LIB_PATHS
+diff -ru cmake-2.6.2.org//Modules/FindPNG.cmake cmake-2.6.2/Modules/FindPNG.cmake
+--- cmake-2.6.2.org//Modules/FindPNG.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindPNG.cmake	Thu May 21 16:21:07 2009
[email protected]@ -13,7 +13,9 @@
+ 
+ IF(ZLIB_FOUND)
+   FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
+-  /usr/local/include/libpng             # OpenBSD
++   /usr/include/libpng
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/libpng             # OpenBSD
+   )
+ 
+   SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
+diff -ru cmake-2.6.2.org//Modules/FindPhysFS.cmake cmake-2.6.2/Modules/FindPhysFS.cmake
+--- cmake-2.6.2.org//Modules/FindPhysFS.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindPhysFS.cmake	Thu May 21 16:21:07 2009
[email protected]@ -17,11 +17,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw # Fink
+   /opt/local # DarwinPorts
+-  /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw # Blastwave
+   /opt
+ )
+ 
[email protected]@ -29,15 +31,17 @@
+   NAMES physfs
+   HINTS
+   $ENV{PHYSFSDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindPike.cmake cmake-2.6.2/Modules/FindPike.cmake
+--- cmake-2.6.2.org//Modules/FindPike.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindPike.cmake	Thu May 21 16:21:07 2009
[email protected]@ -9,7 +9,9 @@
+ 
+ FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS
+   /usr/include/pike/*
+-  /usr/local/include/pike/*)
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/pike/*
++  )
+ 
+ FIND_PATH(PIKE_INCLUDE_PATH program.h
+   ${PIKE_POSSIBLE_INCLUDE_PATHS})
+diff -ru cmake-2.6.2.org//Modules/FindProducer.cmake cmake-2.6.2/Modules/FindProducer.cmake
+--- cmake-2.6.2.org//Modules/FindProducer.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindProducer.cmake	Thu May 21 16:21:07 2009
[email protected]@ -38,11 +38,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local/include
++# Uncomment the following to enable /usr/local search
++#    /usr/local/include
+     /usr/include
+     /sw/include # Fink
+     /opt/local/include # DarwinPorts
+-    /opt/csw/include # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw/include # Blastwave
+     /opt/include
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
[email protected]@ -54,13 +56,15 @@
+   $ENV{PRODUCER_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindQt.cmake cmake-2.6.2/Modules/FindQt.cmake
+--- cmake-2.6.2.org//Modules/FindQt.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindQt.cmake	Thu May 21 16:21:07 2009
[email protected]@ -70,8 +70,9 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
+   ${qt_headers}/Qt
+   $ENV{QTDIR}/include/Qt
+-  /usr/local/qt/include/Qt
+-  /usr/local/include/Qt
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/include/Qt
++#  /usr/local/include/Qt
+   /usr/lib/qt/include/Qt
+   /usr/include/Qt
+   /usr/share/qt4/include/Qt
[email protected]@ -89,8 +90,9 @@
+   C:/Qt/3.3.3Educational/include
+   $ENV{QTDIR}/include
+   /usr/include/qt3/Qt
+-  /usr/local/qt/include
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/include
++#  /usr/local/include
+   /usr/lib/qt/include
+   /usr/include
+   /usr/share/qt3/include
+diff -ru cmake-2.6.2.org//Modules/FindQt3.cmake cmake-2.6.2/Modules/FindQt3.cmake
+--- cmake-2.6.2.org//Modules/FindQt3.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindQt3.cmake	Thu May 21 16:21:07 2009
[email protected]@ -40,7 +40,8 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+   $ENV{QTDIR}/include
+   ${GLOB_PATHS_BIN}
+-  /usr/local/qt/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/include
+   /usr/lib/qt/include
+   /usr/lib/qt3/include
+   /usr/include/qt
[email protected]@ -78,7 +79,8 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
+     $ENV{QTDIR}/lib
+     ${GLOB_PATHS_LIB}
+-    /usr/local/qt/lib
++# Uncomment the following to enable /usr/local search
++#    /usr/local/qt/lib
+     /usr/lib/qt/lib
+     /usr/lib/qt3/lib
+     /usr/lib/qt3/lib64
[email protected]@ -98,7 +100,8 @@
+     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
+     $ENV{QTDIR}/lib
+     ${GLOB_PATHS_LIB}
+-    /usr/local/qt/lib
++# Uncomment the following to enable /usr/local search
++#    /usr/local/qt/lib
+     /usr/lib/qt/lib
+     /usr/lib/qt3/lib
+     /usr/lib/qt3/lib64
[email protected]@ -116,7 +119,8 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
+   $ENV{QTDIR}/lib
+   ${GLOB_PATHS_LIB}
+-  /usr/local/qt/lib
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/lib
+   /usr/lib/qt3/lib
+   /usr/lib/qt3/lib64
+   /usr/share/qt3/lib
[email protected]@ -134,7 +138,8 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+   $ENV{QTDIR}/bin
+   ${GLOB_PATHS_BIN}
+-  /usr/local/qt/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/bin
+   /usr/lib/qt/bin
+   /usr/lib/qt3/bin
+   /usr/share/qt3/bin
[email protected]@ -155,7 +160,8 @@
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
+   ${GLOB_PATHS_BIN}
+-  /usr/local/qt/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/qt/bin
+   /usr/lib/qt/bin
+   /usr/lib/qt3/bin
+   /usr/share/qt3/bin
+diff -ru cmake-2.6.2.org//Modules/FindSDL.cmake cmake-2.6.2/Modules/FindSDL.cmake
+--- cmake-2.6.2.org//Modules/FindSDL.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL.cmake	Thu May 21 16:21:07 2009
[email protected]@ -59,20 +59,23 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+ )
[email protected]@ -86,11 +89,13 @@
+   $ENV{SDLDIR}
+   PATH_SUFFIXES lib64 lib
+   PATHS
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
[email protected]@ -108,11 +113,13 @@
+       $ENV{SDLDIR}
+       PATH_SUFFIXES lib64 lib
+       PATHS
+-      /usr/local
++# Uncomment the following to enable /usr/local search
++#      /usr/local
+       /usr
+       /sw
+       /opt/local
+-      /opt/csw
++# Uncomment the following to enable /opt/csw search
++#      /opt/csw
+       /opt
+     )
+   ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
+diff -ru cmake-2.6.2.org//Modules/FindSDL_image.cmake cmake-2.6.2/Modules/FindSDL_image.cmake
+--- cmake-2.6.2.org//Modules/FindSDL_image.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL_image.cmake	Thu May 21 16:21:07 2009
[email protected]@ -20,20 +20,24 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+ )
[email protected]@ -47,11 +51,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindSDL_mixer.cmake cmake-2.6.2/Modules/FindSDL_mixer.cmake
+--- cmake-2.6.2.org//Modules/FindSDL_mixer.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL_mixer.cmake	Thu May 21 16:21:07 2009
[email protected]@ -20,20 +20,24 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+ )
[email protected]@ -43,15 +47,17 @@
+   HINTS
+   $ENV{SDLMIXERDIR}
+   $ENV{SDLDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindSDL_net.cmake cmake-2.6.2/Modules/FindSDL_net.cmake
+--- cmake-2.6.2.org//Modules/FindSDL_net.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL_net.cmake	Thu May 21 16:21:07 2009
[email protected]@ -21,20 +21,22 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+ )
[email protected]@ -43,15 +45,17 @@
+   HINTS
+   $ENV{SDLNETDIR}
+   $ENV{SDLDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindSDL_sound.cmake cmake-2.6.2/Modules/FindSDL_sound.cmake
+--- cmake-2.6.2.org//Modules/FindSDL_sound.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL_sound.cmake	Thu May 21 16:21:07 2009
[email protected]@ -68,20 +68,22 @@
+   $ENV{SDLDIR}/include
+   $ENV{SDLDIR}
+   PATHS
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+   )
[email protected]@ -94,11 +96,13 @@
+   $ENV{SDLDIR}/lib
+   $ENV{SDLDIR}
+   PATHS
+-  /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib
+   /usr/lib
+   /sw/lib
+   /opt/local/lib
+-  /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/lib
+   /opt/lib
+   )
+ 
[email protected]@ -211,11 +215,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+        ) 
+        IF(MIKMOD_LIBRARY)
[email protected]@ -234,11 +240,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+        )
+        IF(MODPLUG_LIBRARY)
[email protected]@ -260,11 +268,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+          )
+        IF(VORBIS_LIBRARY)
[email protected]@ -282,11 +292,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+          )
+        IF(OGG_LIBRARY)
[email protected]@ -306,11 +318,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+          )
+        IF(SMPEG_LIBRARY)
[email protected]@ -330,11 +344,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+          )
+        IF(FLAC_LIBRARY)
[email protected]@ -357,11 +373,13 @@
+          $ENV{SDLSOUNDDIR}
+          $ENV{SDLDIR}/lib
+          $ENV{SDLDIR}
+-         /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#         /usr/local/lib
+          /usr/lib
+          /sw/lib
+          /opt/local/lib
+-         /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#         /opt/csw/lib
+        /opt/lib
+          )
+        IF(SPEEX_LIBRARY)
[email protected]@ -384,11 +402,13 @@
+            $ENV{SDLSOUNDDIR}
+            $ENV{SDLDIR}/lib
+            $ENV{SDLDIR}
+-           /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#           /usr/local/lib
+            /usr/lib
+            /sw/lib
+            /opt/local/lib
+-           /opt/csw/lib
++# Uncomment the following to enable /opt/csw search
++#           /opt/csw/lib
+          /opt/lib
+            )
+          IF(OGG_LIBRARY)
+diff -ru cmake-2.6.2.org//Modules/FindSDL_ttf.cmake cmake-2.6.2/Modules/FindSDL_ttf.cmake
+--- cmake-2.6.2.org//Modules/FindSDL_ttf.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSDL_ttf.cmake	Thu May 21 16:21:07 2009
[email protected]@ -20,20 +20,22 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local/include/SDL
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/SDL
+   /usr/include/SDL
+-  /usr/local/include/SDL12
+-  /usr/local/include/SDL11 # FreeBSD ports
++#  /usr/local/include/SDL12
++#  /usr/local/include/SDL11 # FreeBSD ports
+   /usr/include/SDL12
+   /usr/include/SDL11
+-  /usr/local/include
++#  /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 
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw/include/SDL # Blastwave
++#  /opt/csw/include 
+   /opt/include/SDL
+   /opt/include
+ )
[email protected]@ -46,11 +48,13 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+     PATH_SUFFIXES lib64 lib
+ )
+diff -ru cmake-2.6.2.org//Modules/FindSelfPackers.cmake cmake-2.6.2/Modules/FindSelfPackers.cmake
+--- cmake-2.6.2.org//Modules/FindSelfPackers.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindSelfPackers.cmake	Thu May 21 16:21:07 2009
[email protected]@ -12,7 +12,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ 
[email protected]@ -21,7 +22,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindTCL.cmake cmake-2.6.2/Modules/FindTCL.cmake
+--- cmake-2.6.2.org//Modules/FindTCL.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindTCL.cmake	Thu May 21 16:21:07 2009
[email protected]@ -66,7 +66,8 @@
+   "${TCL_TCLSH_PATH_PARENT}/lib"
+   "${TK_WISH_PATH_PARENT}/lib"
+   /usr/lib 
+-  /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib
+   )
+ 
+ IF(WIN32)
[email protected]@ -146,7 +147,8 @@
+   "${TCL_TCLSH_PATH_PARENT}/include"
+   "${TK_WISH_PATH_PARENT}/include"
+   /usr/include
+-  /usr/local/include
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include
+   /usr/include/tcl${TK_LIBRARY_VERSION}
+   /usr/include/tcl${TCL_LIBRARY_VERSION}
+   /usr/include/tcl8.6
+diff -ru cmake-2.6.2.org//Modules/FindTclStub.cmake cmake-2.6.2/Modules/FindTclStub.cmake
+--- cmake-2.6.2.org//Modules/FindTclStub.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindTclStub.cmake	Thu May 21 16:21:07 2009
[email protected]@ -53,7 +53,8 @@
+   "${TCL_TCLSH_PATH_PARENT}/lib"
+   "${TK_WISH_PATH_PARENT}/lib"
+   /usr/lib 
+-  /usr/local/lib
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib
+ )
+ 
+ IF(WIN32)
+diff -ru cmake-2.6.2.org//Modules/FindUnixCommands.cmake cmake-2.6.2/Modules/FindUnixCommands.cmake
+--- cmake-2.6.2.org//Modules/FindUnixCommands.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindUnixCommands.cmake	Thu May 21 16:21:07 2009
[email protected]@ -9,7 +9,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
[email protected]@ -21,7 +22,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
[email protected]@ -33,7 +35,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
[email protected]@ -45,7 +48,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
[email protected]@ -57,7 +61,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
[email protected]@ -72,7 +77,8 @@
+   ${CYGWIN_INSTALL_PATH}/bin
+   /bin
+   /usr/bin 
+-  /usr/local/bin
++# Uncomment the following to enable /usr/local search
++#  /usr/local/bin
+   /sbin
+ )
+ MARK_AS_ADVANCED(
+diff -ru cmake-2.6.2.org//Modules/FindVTK.cmake cmake-2.6.2/Modules/FindVTK.cmake
+--- cmake-2.6.2.org//Modules/FindVTK.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindVTK.cmake	Thu May 21 16:21:07 2009
[email protected]@ -77,7 +77,8 @@
+     ${VTK_DIR_SEARCH}
+ 
+     # Look in standard UNIX install locations.
+-    /usr/local/lib/vtk
++# Uncomment the following to enable /usr/local search
++#    /usr/local/lib/vtk
+     /usr/lib/vtk
+ 
+     # Read from the CMakeSetup registry entries.  It is likely that
+diff -ru cmake-2.6.2.org//Modules/Findosg.cmake cmake-2.6.2/Modules/Findosg.cmake
+--- cmake-2.6.2.org//Modules/Findosg.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/Findosg.cmake	Thu May 21 16:21:07 2009
[email protected]@ -34,11 +34,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -49,15 +51,17 @@
+   HINTS
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgDB.cmake cmake-2.6.2/Modules/FindosgDB.cmake
+--- cmake-2.6.2.org//Modules/FindosgDB.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgDB.cmake	Thu May 21 16:21:07 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGDB_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgFX.cmake cmake-2.6.2/Modules/FindosgFX.cmake
+--- cmake-2.6.2.org//Modules/FindosgFX.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgFX.cmake	Thu May 21 16:21:07 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGFX_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgGA.cmake cmake-2.6.2/Modules/FindosgGA.cmake
+--- cmake-2.6.2.org//Modules/FindosgGA.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgGA.cmake	Thu May 21 16:21:07 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGGA_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgIntrospection.cmake cmake-2.6.2/Modules/FindosgIntrospection.cmake
+--- cmake-2.6.2.org//Modules/FindosgIntrospection.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgIntrospection.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGINTROSPECTION_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgManipulator.cmake cmake-2.6.2/Modules/FindosgManipulator.cmake
+--- cmake-2.6.2.org//Modules/FindosgManipulator.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgManipulator.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGMANIPULATOR_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgParticle.cmake cmake-2.6.2/Modules/FindosgParticle.cmake
+--- cmake-2.6.2.org//Modules/FindosgParticle.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgParticle.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGPARTICLE_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgProducer.cmake cmake-2.6.2/Modules/FindosgProducer.cmake
+--- cmake-2.6.2.org//Modules/FindosgProducer.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgProducer.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGPRODUCER_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgShadow.cmake cmake-2.6.2/Modules/FindosgShadow.cmake
+--- cmake-2.6.2.org//Modules/FindosgShadow.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgShadow.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGSHADOW_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgSim.cmake cmake-2.6.2/Modules/FindosgSim.cmake
+--- cmake-2.6.2.org//Modules/FindosgSim.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgSim.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGSIM_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgTerrain.cmake cmake-2.6.2/Modules/FindosgTerrain.cmake
+--- cmake-2.6.2.org//Modules/FindosgTerrain.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgTerrain.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGTERRAIN_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgText.cmake cmake-2.6.2/Modules/FindosgText.cmake
+--- cmake-2.6.2.org//Modules/FindosgText.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgText.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGTEXT_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgUtil.cmake cmake-2.6.2/Modules/FindosgUtil.cmake
+--- cmake-2.6.2.org//Modules/FindosgUtil.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgUtil.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGUTIL_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/FindosgViewer.cmake cmake-2.6.2/Modules/FindosgViewer.cmake
+--- cmake-2.6.2.org//Modules/FindosgViewer.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/FindosgViewer.cmake	Thu May 21 16:21:08 2009
[email protected]@ -35,11 +35,13 @@
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-    /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+     /usr
+     /sw # Fink
+     /opt/local # DarwinPorts
+-    /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw # Blastwave
+     /opt
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]
+     [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
[email protected]@ -51,15 +53,17 @@
+   $ENV{OSGVIEWER_DIR}
+   $ENV{OSG_DIR}
+   $ENV{OSGDIR}
+-  PATH_SUFFIXES lib64 lib
++  PATH_SUFFIXES lib64 lib lib/32 lib/64
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#    /usr/local
+   /usr
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
+diff -ru cmake-2.6.2.org//Modules/GetPrerequisites.cmake cmake-2.6.2/Modules/GetPrerequisites.cmake
+--- cmake-2.6.2.org//Modules/GetPrerequisites.cmake	Wed Sep 24 11:34:34 2008
++++ cmake-2.6.2/Modules/GetPrerequisites.cmake	Thu May 21 16:21:08 2009
[email protected]@ -440,7 +440,8 @@
+     "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
+     "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
+     "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
+-    "/usr/local/bin"
++# Uncomment the following to enable /usr/local search
++#    "/usr/local/bin"
+     "/usr/bin"
+     )
+ 
+diff -ru cmake-2.6.2.org//Source/cmDocumentation.cxx cmake-2.6.2/Source/cmDocumentation.cxx
+--- cmake-2.6.2.org//Source/cmDocumentation.cxx	Wed Apr 15 20:35:21 2009
++++ cmake-2.6.2/Source/cmDocumentation.cxx	Thu May 21 16:14:19 2009
[email protected]@ -1222,6 +1222,7 @@
+ bool cmDocumentation::PrintDocumentationUsage(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Usage");
+   this->AddSectionToPrint("Options");
+   this->AddSectionToPrint("Generators");
[email protected]@ -1244,6 +1245,7 @@
+ {
+   this->ClearSections();
+   this->CreateModulesSection();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Description");
+   this->AddSectionToPrint("Modules");
+   this->AddSectionToPrint("Copyright");
[email protected]@ -1259,6 +1261,7 @@
+ {
+   this->ClearSections();
+   this->CreateCustomModulesSection();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Description");
+   this->AddSectionToPrint("Custom CMake Modules");
+ // the custom modules are most probably not under Kitware's copyright, Alex
[email protected]@ -1275,6 +1278,7 @@
+ bool cmDocumentation::PrintDocumentationPolicies(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Description");
+   this->AddSectionToPrint("Policies");
+   this->AddSectionToPrint("Copyright");
[email protected]@ -1290,6 +1294,7 @@
+ bool cmDocumentation::PrintDocumentationProperties(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Properties Description");
+   for (std::vector<std::string>::iterator i = 
+          this->PropertySections.begin();
[email protected]@ -1309,6 +1314,7 @@
+ bool cmDocumentation::PrintDocumentationVariables(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   for (std::vector<std::string>::iterator i = 
+          this->VariableSections.begin();
+        i != this->VariableSections.end(); ++i)
[email protected]@ -1327,6 +1333,7 @@
+ bool cmDocumentation::PrintDocumentationCurrentCommands(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Commands");
+   this->AddSectionToPrint("Copyright");
+   this->AddSectionToPrint("Standard See Also");
[email protected]@ -1340,6 +1347,7 @@
+ bool cmDocumentation::PrintDocumentationCompatCommands(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Compatibility Commands Description");
+   this->AddSectionToPrint("Compatibility Commands");
+   this->AddSectionToPrint("Copyright");
+diff -ru cmake-2.6.2.org//Source/cmGlobalGenerator.cxx cmake-2.6.2/Source/cmGlobalGenerator.cxx

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWcmake.p5m	Fri Jun 17 10:55:05 2011 -0700
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWcmake package
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=developer/build/[email protected] type=require