6892526 cmake upgrade to v2.8.6
authorApril Chin <april.chin@oracle.com>
Wed, 07 Dec 2011 14:04:51 -0800
changeset 614 db6c0cd206dd
parent 613 63178069308f
child 615 4a4ac540b603
6892526 cmake upgrade to v2.8.6 7085602 cmake needs license file update PSARC/2011/354 Update Cmake to 2.8.6
components/cmake/Makefile
components/cmake/cmake.license
components/cmake/cmake.p5m
components/cmake/patches-post-config/CmakeCache-txt.patch
components/cmake/patches/cmake-2.6.2.patch
components/cmake/patches/cmake-2.8.6.patch
--- a/components/cmake/Makefile	Wed Dec 07 11:40:18 2011 -0800
+++ b/components/cmake/Makefile	Wed Dec 07 14:04:51 2011 -0800
@@ -25,11 +25,11 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		cmake
-COMPONENT_VERSION=	2.6.2
+COMPONENT_VERSION=	2.8.6
 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_ARCHIVE_HASH=	sha1:7c2cbd42d27e26580cd4923892197b84b2a90675
+COMPONENT_ARCHIVE_URL=	http://www.cmake.org/files/v2.8/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=  http://www.cmake.org/
 
 include $(WS_TOP)/make-rules/prep.mk
@@ -50,11 +50,13 @@
 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 )
+# Use system-installed third-party libraries, rather than the private
+# copies in the cmake source.  Only libarchive will come from the cmake
+# source, since it is not currently part of Solaris.
+CONFIGURE_OPTIONS +=	--system-curl
+CONFIGURE_OPTIONS +=	--system-expat
+CONFIGURE_OPTIONS +=	--system-zlib
+CONFIGURE_OPTIONS +=	--system-bzip2
 
 COMPONENT_BUILD_ENV +=	CC="$(CC)"	
 COMPONENT_BUILD_ENV +=	CXX="$(CXX)"	
@@ -62,6 +64,10 @@
 COMPONENT_BUILD_ENV +=	MAKE="$(GMAKE)"	
 COMPONENT_BUILD_TARGETS =	all
 
+# Need C and C++ compiler locations for cmake tests
+COMPONENT_TEST_ENV += CC="$(CC)"
+COMPONENT_TEST_ENV += CXX="$(CXX)"
+
 COMPONENT_TEST_TARGETS =	test
 
 # common targets
@@ -70,7 +76,7 @@
 
 install:	$(INSTALL_32)
 
-# expected failures: curl, complex, complexOneConfig
+# expected failure: CTestTestUpload
 test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
--- a/components/cmake/cmake.license	Wed Dec 07 11:40:18 2011 -0800
+++ b/components/cmake/cmake.license	Wed Dec 07 14:04:51 2011 -0800
@@ -1,59 +1,480 @@
-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:
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+This package may include technology which may be subject to one or more of the
+following additional notices:
+
+----------------
+- CMAKE v2.8.6 -
+----------------
+Oracle Internal Tracking Number 6581
+
+========================================================================
+CMAKE BSD LICENSE:
+========================================================================
+CMake - Cross Platform Makefile Generator 
+Copyright 2000-2009 Kitware, Inc., Insight Software 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. 
+
+* Neither the names of Kitware, Inc., the Insight Software Consortium, 
+  nor the names of their contributors may be used to endorse or promote 
+  products derived from this software without specific prior written 
+  permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT 
+HOLDER 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. 
+
+------------------------------------------------------------------------------ 
+
+The above copyright and license notice applies to distributions of 
+CMake in source and binary form.  Some source files contain additional 
+notices of original copyright by their contributors; see each source 
+for details.  Third-party software packages supplied with CMake under 
+compatible licenses provide their own copyright notices documented in 
+corresponding subdirectories. 
+
+------------------------------------------------------------------------------ 
+
+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. 
+
+ADDITIONAL COPYRIGHT NOTICES PRESENT IN SOURCE FILES:
+
+COPYRIGHT AND PERMISSION NOTICE 
+
+Copyright (c) 1996 - 2009, Daniel Stenberg, <[email protected]>. 
+
+All rights reserved. 
+
+Permission to use, copy, modify, and distribute this software for any purpose 
+with or without fee is hereby granted, provided that the above copyright 
+notice and this permission notice appear in all copies. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN 
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE 
+OR OTHER DEALINGS IN THE SOFTWARE. 
+
+Except as contained in this notice, the name of a copyright holder shall not 
+be used in advertising or otherwise to promote the sale, use or other dealings 
+in this Software without prior written authorization of the copyright holder. 
+
+
+========================================================================
+Copyright (c) 2003 Peter Stuge <[email protected]>
+
+Permission to use, copy, modify, and distribute this software for any 
+purpose with or without fee is hereby granted, provided that the above 
+copyright notice and this permission notice appear in all copies. 
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+
+
+========================================================================
+
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd 
+                               and Clark Cooper 
+ 
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to 
+the following conditions: 
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+======================================================================== 
+THIS CODE IS SPECIFICALLY EXEMPTED FROM THE NCURSES PACKAGE COPYRIGHT. 
+You may freely copy it for use as a template for your own field types. 
+If you develop a field type that might be of general use, please send 
+it back to the ncurses maintainers for inclusion in the next version. 
+======================================================================== 
+Copyright (c) 1998 Free Software Foundation, Inc. 
+
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, distribute with modifications, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions: 
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+
+Except as contained in this notice, the name(s) of the above copyright 
+holders shall not be used in advertising or otherwise to promote the 
+sale, use or other dealings in this Software without prior written 
+authorization. 
+======================================================================== 
+  James Bigler, NVIDIA Corp (nvidia.com - jbigler)
+  Abe Stephens, SCI Institute -- http://www.sci.utah.edu/~abe/FindCuda.html
+
+  Copyright (c) 2008 - 2009 NVIDIA Corporation.  All rights reserved.
+
+  Copyright (c) 2007-2009
+  Scientific Computing and Imaging Institute, University of Utah
+
+The MIT License 
+
+License for the specific language governing rights and limitations under 
+Permission is hereby granted, free of charge, to any person obtaining a 
+copy of this software and associated documentation files (the "Software"), 
+to deal in the Software without restriction, including without limitation 
+the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+and/or sell copies of the Software, and to permit persons to whom the 
+Software is furnished to do so, subject to the following conditions: 
 
- * National Library of Medicine at the National Institutes of Health
-   as part of the Insight Segmentation and Registration Toolkit (ITK).
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+DEALINGS IN THE SOFTWARE. 
+
+======================================================================== 
+Copyright (C) 1991 Texas Instruments Incorporated. 
+
+Permission is granted to any individual or institution to use, copy, modify 
+and distribute this software, provided that this complete copyright and 
+permission notice is maintained, intact, in all copies and supporting 
+documentation. 
+
+Texas Instruments Incorporated provides this software "as is" without 
+express or implied warranty. 
+======================================================================== 
+Copyright (c) 1986 by University of Toronto. 
+Written by Henry Spencer.  Not derived from licensed software. 
+
+Permission is granted to anyone to use this software for any 
+purpose on any computer system, and to redistribute it freely, 
+subject to the following restrictions: 
+
+1. The author is not responsible for the consequences of use of 
+        this software, no matter how awful, even if they arise 
+        from defects in it. 
+
+2. The origin of this software must not be misrepresented, either 
+        by explicit claim or by omission. 
+
+3. Altered versions must be plainly marked as such, and must not 
+        be misrepresented as being the original software. 
+
+======================================================================== 
+Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 
+All rights reserved. 
+Contact: Nokia Corporation ([email protected]) 
 
- * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel 
-   Visualization Initiative.
+You may use this file under the terms of the BSD license as follows: 
+
+"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. 
+  * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor 
+    the names of its contributors may be used to endorse or promote 
+    products derived from this software without specific prior written 
+    permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT 
+OWNER 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." 
+======================================================================== 
+Please read and be aware of the following: 
+WARNING: 
+
+   This program and library (attempts to) compress data by 
+   performing several non-trivial transformations on it. 
+   Unless you are 100% familiar with *all* the algorithms 
+   contained herein, and with the consequences of modifying them, 
+   you should NOT meddle with the compression or decompression 
+   machinery.  Incorrect changes can and very likely *will* 
+   lead to disastrous loss of data. 
+
+DISCLAIMER: 
+
+   I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE 
+   USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED. 
 
- * 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.
+   Every compression of a file implies an assumption that the 
+   compressed file can be decompressed to reproduce the original. 
+   Great efforts in design, coding and testing have been made to 
+   ensure that this program works correctly.  However, the complexity 
+   of the algorithms, and, in particular, the presence of various 
+   special cases in the code which occur with very low but non-zero 
+   probability make it impossible to rule out the possibility of bugs 
+   remaining in the program.  DO NOT COMPRESS ANY DATA WITH THIS 
+   PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER 
+   SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. 
+
+   That is not to say this program is inherently unreliable. 
+   Indeed, I very much hope the opposite is true.  bzip2/libbzip2 
+   has been carefully constructed and extensively tested. 
+
+
+PATENTS: 
+
+   To the best of my knowledge, bzip2/libbzip2 does not use any 
+   patented algorithms.  However, I do not have the resources 
+   to carry out a patent search.  Therefore I cannot give any 
+   guarantee of the above statement. 
+
+Julian Seward 
[email protected] 
+Cambridge, UK. 
+
+This program, "bzip2", the associated library "libbzip2", and all 
+documentation, are copyright (C) 1996-2007 Julian R Seward.  All 
+rights reserved. 
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+
+2. The origin of this software must not be misrepresented; you must 
+   not claim that you wrote the original software.  If you use this 
+   software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required. 
+
+3. Altered source versions must be plainly marked as such, and must 
+   not be misrepresented as being the original software. 
 
- * Kitware, Inc.
+4. The name of the author may not be used to endorse or promote 
+   products derived from this software without specific prior written 
+   permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. 
+
+Julian Seward, [email protected] 
+bzip2/libbzip2 version 1.0.5 of 10 December 2007 
+
+======================================================================== 
+     Portions (C) International Organization for Standardization 1986 
+     Permission to copy in any form is granted for use with 
+     conforming SGML systems and applications as defined in 
+     ISO 8879, provided this notice is included in all copies. 
 
-The CMake copyright is as follows:
+======================================================================== 
+Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
+Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+This software is provided 'as-is', without any express or implied 
+warranty.  In no event will the authors be held liable for any damages 
+arising from the use of this software. 
+
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it 
+freely, subject to the following restrictions: 
 
-Copyright (c) 2002 Kitware, Inc., Insight Consortium
+1. The origin of this software must not be misrepresented; you must not 
+   claim that you wrote the original software. If you use this software 
+   in a product, an acknowledgment in the product documentation would be 
+   appreciated but is not required. 
+2. Altered source versions must be plainly marked as such, and must not be 
+   misrepresented as being the original software. 
+3. This notice may not be removed or altered from any source distribution. 
+
+
+======================================================================== 
+
+Copyright (c) 2003-2008 Tim Kientzle
+Copyright (c) 2009 Joerg  Sonnenberger
+Copyright (c) 2009 Michihiro NAKAJIMA
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+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.
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+2. 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. 
 
- * 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.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. 
+======================================================================== 
+Copyright (c) 2003-2009 Tim Kientzle
+Copyright (c) 2009 Chris Roberts
+Copyright (c) 2009 Michihiro NAKAJIMA
+Copyright (c) 2007 Kai Wang
+All rights reserved.
 
- * 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.
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer 
+   in this position and unchanged. 
+2. 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. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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 AUTHOR(S) 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. 
+
+======================================================================== 
+Copyright (c) 1989, 1990, 1993 
+    The Regents of the University of California.  All rights reserved. 
 
- * Modified source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+2. 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. 
+4. Neither the name of the University nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. 
+
+======================================================================== 
+Copyright (c) 1990, 1993 
+The Regents of the University of California.  All rights reserved. 
 
-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.
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+2. 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. 
+3. All advertising materials mentioning features or use of this software 
+   must display the following acknowledgement: 
+This product includes software developed by the University of 
+California, Berkeley and its contributors. 
+4. Neither the name of the University nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission. 
 
-See also the CMake web site: http://www.cmake.org for more information.
+THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 
+ABILITY, 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.
+
--- a/components/cmake/cmake.p5m	Wed Dec 07 11:40:18 2011 -0800
+++ b/components/cmake/cmake.p5m	Wed Dec 07 14:04:51 2011 -0800
@@ -26,8 +26,8 @@
 # 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>>
+# Get usr/share/cmake-2.8/doc files from usr/doc/cmake-2.8 in proto area
+<transform file path=usr/share/cmake-2.8/doc/(.+$) -> set action.hash usr/doc/cmake-2.8/%<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"
@@ -39,404 +39,629 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/614
+    value=PSARC/2011/354
 
 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/aclocal
+dir path=usr/share/cmake-2.8
+dir path=usr/share/cmake-2.8/Modules
+dir path=usr/share/cmake-2.8/Modules/Platform
+dir path=usr/share/cmake-2.8/Templates
+dir path=usr/share/cmake-2.8/doc
+dir path=usr/share/cmake-2.8/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/aclocal/cmake.m4
+file path=usr/share/cmake-2.8/Modules/AddFileDependencies.cmake
+file path=usr/share/cmake-2.8/Modules/AutomocInfo.cmake.in
+file path=usr/share/cmake-2.8/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+file path=usr/share/cmake-2.8/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+file path=usr/share/cmake-2.8/Modules/BundleUtilities.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCCompilerFlag.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCSourceCompiles.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCSourceRuns.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCXXCompilerFlag.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCXXSourceCompiles.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCXXSourceRuns.cmake
+file path=usr/share/cmake-2.8/Modules/CheckCXXSymbolExists.cmake
+file path=usr/share/cmake-2.8/Modules/CheckForPthreads.c
+file path=usr/share/cmake-2.8/Modules/CheckFortranFunctionExists.cmake
+file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.c
+file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.cmake
+file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.c.in
+file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cmake
+file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cxx.in
+file path=usr/share/cmake-2.8/Modules/CheckIncludeFileCXX.cmake
+file path=usr/share/cmake-2.8/Modules/CheckIncludeFiles.cmake
+file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.cmake
+file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.lists.in
+file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.c.in
+file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.cmake
+file path=usr/share/cmake-2.8/Modules/CheckSizeOf.cmake
+file path=usr/share/cmake-2.8/Modules/CheckStructHasMember.cmake
+file path=usr/share/cmake-2.8/Modules/CheckSymbolExists.cmake
+file path=usr/share/cmake-2.8/Modules/CheckTypeSize.c.in
+file path=usr/share/cmake-2.8/Modules/CheckTypeSize.cmake
+file path=usr/share/cmake-2.8/Modules/CheckTypeSizeMap.cmake.in
+file path=usr/share/cmake-2.8/Modules/CheckVariableExists.c
+file path=usr/share/cmake-2.8/Modules/CheckVariableExists.cmake
+file path=usr/share/cmake-2.8/Modules/CMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeAddNewLanguage.txt
+file path=usr/share/cmake-2.8/Modules/CMakeASM_MASMInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeASM_NASMInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeASM-ATTInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeASMCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeASMInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeBackwardCompatibilityC.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeBackwardCompatibilityCXX.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeBorlandFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeBuildSettings.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeCCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeCCompilerABI.c
+file path=usr/share/cmake-2.8/Modules/CMakeCCompilerId.c.in
+file path=usr/share/cmake-2.8/Modules/CMakeCInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeCompilerABI.h
+file path=usr/share/cmake-2.8/Modules/CMakeConfigurableFile.in
+file path=usr/share/cmake-2.8/Modules/CMakeCXXCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeCXXCompilerABI.cpp
+file path=usr/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in
+file path=usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDependentOption.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_MASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_NASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM-ATTCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineCCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineCompilerABI.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineCXXCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineFortranCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineJavaCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineRCCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineSystem.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeDetermineVSServicePack.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeExportBuildSettings.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindBinUtils.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindCodeBlocks.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindEclipseCDT4.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindFrameworks.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindKDevelop3.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindPackageMode.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindWMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFindXCode.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeForceCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeFortranCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeFortranCompilerABI.F
+file path=usr/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in
+file path=usr/share/cmake-2.8/Modules/CMakeFortranInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeImportBuildSettings.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeJavaCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeJavaInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeJOMFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeMinGWFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeMSYSFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeNMakeFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeParseArguments.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeParseImplicitLinkInfo.cmake
+file path=usr/share/cmake-2.8/Modules/CMakePlatformId.h.in
+file path=usr/share/cmake-2.8/Modules/CMakePrintSystemInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakePushCheckState.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeRCCompiler.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeRCInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeSystem.cmake.in
+file path=usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestASM_MASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestASM_NASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestASM-ATTCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestASMCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestCompilerCommon.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestCXXCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestForFreeVC.cxx
+file path=usr/share/cmake-2.8/Modules/CMakeTestFortranCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestGNU.c
+file path=usr/share/cmake-2.8/Modules/CMakeTestJavaCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestNMakeCLVersion.c
+file path=usr/share/cmake-2.8/Modules/CMakeTestRCCompiler.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeTestWatcomVersion.c
+file path=usr/share/cmake-2.8/Modules/CMakeUnixFindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVerifyManifest.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS10FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS11FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS6BackwardCompatibility.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS6FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS71FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS7BackwardCompatibility.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS7FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS8FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/CMakeVS9FindMake.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Absoft-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Clang-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Clang-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Cray-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Cray-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Cray-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/G95-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/GNU-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/HP-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/HP-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/HP-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/HP-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Intel-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Intel-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Intel-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/Intel-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/NAG-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PathScale.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PGI-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PGI-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PGI-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/PGI.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SCO-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SCO-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SCO.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/XL-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/XL-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Compiler/XL.cmake
+file path=usr/share/cmake-2.8/Modules/CPack.background.png.in
+file path=usr/share/cmake-2.8/Modules/CPack.cmake
+file path=usr/share/cmake-2.8/Modules/CPack.Description.plist.in
+file path=usr/share/cmake-2.8/Modules/CPack.distribution.dist.in
+file path=usr/share/cmake-2.8/Modules/CPack.DS_Store.in
+file path=usr/share/cmake-2.8/Modules/CPack.Info.plist.in
+file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.in
+file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.rsrc.in
+file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.Info.plist.in
+file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.main.scpt.in
+file path=usr/share/cmake-2.8/Modules/CPack.RuntimeScript.in
+file path=usr/share/cmake-2.8/Modules/CPack.STGZ_Header.sh.in
+file path=usr/share/cmake-2.8/Modules/CPack.VolumeIcon.icns.in
+file path=usr/share/cmake-2.8/Modules/CPackBundle.cmake
+file path=usr/share/cmake-2.8/Modules/CPackComponent.cmake
+file path=usr/share/cmake-2.8/Modules/CPackDeb.cmake
+file path=usr/share/cmake-2.8/Modules/CPackNSIS.cmake
+file path=usr/share/cmake-2.8/Modules/CPackRPM.cmake
+file path=usr/share/cmake-2.8/Modules/CPackZIP.cmake
+file path=usr/share/cmake-2.8/Modules/CTest.cmake
+file path=usr/share/cmake-2.8/Modules/CTestScriptMode.cmake
+file path=usr/share/cmake-2.8/Modules/CTestTargets.cmake
+file path=usr/share/cmake-2.8/Modules/Dart.cmake
+file path=usr/share/cmake-2.8/Modules/DartConfiguration.tcl.in
+file path=usr/share/cmake-2.8/Modules/Documentation.cmake
+file path=usr/share/cmake-2.8/Modules/DummyCXXFile.cxx
+file path=usr/share/cmake-2.8/Modules/ecos_clean.cmake
+file path=usr/share/cmake-2.8/Modules/exportheader.cmake.in
+file path=usr/share/cmake-2.8/Modules/ExternalProject.cmake
+file path=usr/share/cmake-2.8/Modules/FeatureSummary.cmake
+file path=usr/share/cmake-2.8/Modules/FindALSA.cmake
+file path=usr/share/cmake-2.8/Modules/FindArmadillo.cmake
+file path=usr/share/cmake-2.8/Modules/FindASPELL.cmake
+file path=usr/share/cmake-2.8/Modules/FindAVIFile.cmake
+file path=usr/share/cmake-2.8/Modules/FindBISON.cmake
+file path=usr/share/cmake-2.8/Modules/FindBLAS.cmake
+file path=usr/share/cmake-2.8/Modules/FindBoost.cmake
+file path=usr/share/cmake-2.8/Modules/FindBullet.cmake
+file path=usr/share/cmake-2.8/Modules/FindBZip2.cmake
+file path=usr/share/cmake-2.8/Modules/FindCABLE.cmake
+file path=usr/share/cmake-2.8/Modules/FindCoin3D.cmake
+file path=usr/share/cmake-2.8/Modules/FindCUDA.cmake
+file path=usr/share/cmake-2.8/Modules/FindCUDA/make2cmake.cmake
+file path=usr/share/cmake-2.8/Modules/FindCUDA/parse_cubin.cmake
+file path=usr/share/cmake-2.8/Modules/FindCUDA/run_nvcc.cmake
+file path=usr/share/cmake-2.8/Modules/FindCups.cmake
+file path=usr/share/cmake-2.8/Modules/FindCURL.cmake
+file path=usr/share/cmake-2.8/Modules/FindCurses.cmake
+file path=usr/share/cmake-2.8/Modules/FindCVS.cmake
+file path=usr/share/cmake-2.8/Modules/FindCxxTest.cmake
+file path=usr/share/cmake-2.8/Modules/FindCygwin.cmake
+file path=usr/share/cmake-2.8/Modules/FindDart.cmake
+file path=usr/share/cmake-2.8/Modules/FindDCMTK.cmake
+file path=usr/share/cmake-2.8/Modules/FindDevIL.cmake
+file path=usr/share/cmake-2.8/Modules/FindDoxygen.cmake
+file path=usr/share/cmake-2.8/Modules/FindEXPAT.cmake
+file path=usr/share/cmake-2.8/Modules/FindFLEX.cmake
+file path=usr/share/cmake-2.8/Modules/FindFLTK.cmake
+file path=usr/share/cmake-2.8/Modules/FindFLTK2.cmake
+file path=usr/share/cmake-2.8/Modules/FindFreetype.cmake
+file path=usr/share/cmake-2.8/Modules/FindGCCXML.cmake
+file path=usr/share/cmake-2.8/Modules/FindGDAL.cmake
+file path=usr/share/cmake-2.8/Modules/FindGettext.cmake
+file path=usr/share/cmake-2.8/Modules/FindGIF.cmake
+file path=usr/share/cmake-2.8/Modules/FindGit.cmake
+file path=usr/share/cmake-2.8/Modules/FindGLU.cmake
+file path=usr/share/cmake-2.8/Modules/FindGLUT.cmake
+file path=usr/share/cmake-2.8/Modules/FindGnuplot.cmake
+file path=usr/share/cmake-2.8/Modules/FindGnuTLS.cmake
+file path=usr/share/cmake-2.8/Modules/FindGTest.cmake
+file path=usr/share/cmake-2.8/Modules/FindGTK.cmake
+file path=usr/share/cmake-2.8/Modules/FindGTK2.cmake
+file path=usr/share/cmake-2.8/Modules/FindHDF5.cmake
+file path=usr/share/cmake-2.8/Modules/FindHSPELL.cmake
+file path=usr/share/cmake-2.8/Modules/FindHTMLHelp.cmake
+file path=usr/share/cmake-2.8/Modules/FindImageMagick.cmake
+file path=usr/share/cmake-2.8/Modules/FindITK.cmake
+file path=usr/share/cmake-2.8/Modules/FindJasper.cmake
+file path=usr/share/cmake-2.8/Modules/FindJava.cmake
+file path=usr/share/cmake-2.8/Modules/FindJNI.cmake
+file path=usr/share/cmake-2.8/Modules/FindJPEG.cmake
+file path=usr/share/cmake-2.8/Modules/FindKDE3.cmake
+file path=usr/share/cmake-2.8/Modules/FindKDE4.cmake
+file path=usr/share/cmake-2.8/Modules/FindLAPACK.cmake
+file path=usr/share/cmake-2.8/Modules/FindLATEX.cmake
+file path=usr/share/cmake-2.8/Modules/FindLibArchive.cmake
+file path=usr/share/cmake-2.8/Modules/FindLibXml2.cmake
+file path=usr/share/cmake-2.8/Modules/FindLibXslt.cmake
+file path=usr/share/cmake-2.8/Modules/FindLua50.cmake
+file path=usr/share/cmake-2.8/Modules/FindLua51.cmake
+file path=usr/share/cmake-2.8/Modules/FindMatlab.cmake
+file path=usr/share/cmake-2.8/Modules/FindMFC.cmake
+file path=usr/share/cmake-2.8/Modules/FindMotif.cmake
+file path=usr/share/cmake-2.8/Modules/FindMPEG.cmake
+file path=usr/share/cmake-2.8/Modules/FindMPEG2.cmake
+file path=usr/share/cmake-2.8/Modules/FindMPI.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenAL.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenGL.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenMP.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenSceneGraph.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenSSL.cmake
+file path=usr/share/cmake-2.8/Modules/FindOpenThreads.cmake
+file path=usr/share/cmake-2.8/Modules/Findosg_functions.cmake
+file path=usr/share/cmake-2.8/Modules/Findosg.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgAnimation.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgDB.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgFX.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgGA.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgIntrospection.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgManipulator.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgParticle.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgProducer.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgShadow.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgSim.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgTerrain.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgText.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgUtil.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgViewer.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgVolume.cmake
+file path=usr/share/cmake-2.8/Modules/FindosgWidget.cmake
+file path=usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake
+file path=usr/share/cmake-2.8/Modules/FindPackageMessage.cmake
+file path=usr/share/cmake-2.8/Modules/FindPerl.cmake
+file path=usr/share/cmake-2.8/Modules/FindPerlLibs.cmake
+file path=usr/share/cmake-2.8/Modules/FindPHP4.cmake
+file path=usr/share/cmake-2.8/Modules/FindPhysFS.cmake
+file path=usr/share/cmake-2.8/Modules/FindPike.cmake
+file path=usr/share/cmake-2.8/Modules/FindPkgConfig.cmake
+file path=usr/share/cmake-2.8/Modules/FindPNG.cmake
+file path=usr/share/cmake-2.8/Modules/FindPostgreSQL.cmake
+file path=usr/share/cmake-2.8/Modules/FindProducer.cmake
+file path=usr/share/cmake-2.8/Modules/FindProtobuf.cmake
+file path=usr/share/cmake-2.8/Modules/FindPythonInterp.cmake
+file path=usr/share/cmake-2.8/Modules/FindPythonLibs.cmake
+file path=usr/share/cmake-2.8/Modules/FindQt.cmake
+file path=usr/share/cmake-2.8/Modules/FindQt3.cmake
+file path=usr/share/cmake-2.8/Modules/FindQt4.cmake
+file path=usr/share/cmake-2.8/Modules/FindQuickTime.cmake
+file path=usr/share/cmake-2.8/Modules/FindRTI.cmake
+file path=usr/share/cmake-2.8/Modules/FindRuby.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL_image.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL_mixer.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL_net.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL_sound.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL_ttf.cmake
+file path=usr/share/cmake-2.8/Modules/FindSDL.cmake
+file path=usr/share/cmake-2.8/Modules/FindSelfPackers.cmake
+file path=usr/share/cmake-2.8/Modules/FindSquish.cmake
+file path=usr/share/cmake-2.8/Modules/FindSubversion.cmake
+file path=usr/share/cmake-2.8/Modules/FindSWIG.cmake
+file path=usr/share/cmake-2.8/Modules/FindTCL.cmake
+file path=usr/share/cmake-2.8/Modules/FindTclsh.cmake
+file path=usr/share/cmake-2.8/Modules/FindTclStub.cmake
+file path=usr/share/cmake-2.8/Modules/FindThreads.cmake
+file path=usr/share/cmake-2.8/Modules/FindTIFF.cmake
+file path=usr/share/cmake-2.8/Modules/FindUnixCommands.cmake
+file path=usr/share/cmake-2.8/Modules/FindVTK.cmake
+file path=usr/share/cmake-2.8/Modules/FindWget.cmake
+file path=usr/share/cmake-2.8/Modules/FindWish.cmake
+file path=usr/share/cmake-2.8/Modules/FindwxWidgets.cmake
+file path=usr/share/cmake-2.8/Modules/FindwxWindows.cmake
+file path=usr/share/cmake-2.8/Modules/FindX11.cmake
+file path=usr/share/cmake-2.8/Modules/FindXMLRPC.cmake
+file path=usr/share/cmake-2.8/Modules/FindZLIB.cmake
+file path=usr/share/cmake-2.8/Modules/FLTKCompatibility.cmake
+file path=usr/share/cmake-2.8/Modules/FortranCInterface.cmake
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_mod.f90
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_sub.f
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/CMakeLists.txt
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Detect.cmake
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Input.cmake.in
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Macro.h.in
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/main.F
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_module_.c
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_module.f90
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_sub.f
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/mymodule_.c
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/mymodule.f90
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/mysub.f
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Output.cmake.in
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/symbol.c.in
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/CMakeLists.txt
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/main.c
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyC.c
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyCXX.cxx
+file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyFortran.f
+file path=usr/share/cmake-2.8/Modules/GenerateExportHeader.cmake
+file path=usr/share/cmake-2.8/Modules/GetPrerequisites.cmake
+file path=usr/share/cmake-2.8/Modules/GNUInstallDirs.cmake
+file path=usr/share/cmake-2.8/Modules/InstallRequiredSystemLibraries.cmake
+file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/CMakeLists.txt
+file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/detect.cmake
+file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/hello.f
+file path=usr/share/cmake-2.8/Modules/ITKCompatibility.cmake
+file path=usr/share/cmake-2.8/Modules/kde3init_dummy.cpp.in
+file path=usr/share/cmake-2.8/Modules/KDE3Macros.cmake
+file path=usr/share/cmake-2.8/Modules/kde3uic.cmake
+file path=usr/share/cmake-2.8/Modules/MacOSXBundleInfo.plist.in
+file path=usr/share/cmake-2.8/Modules/MacOSXFrameworkInfo.plist.in
+file path=usr/share/cmake-2.8/Modules/MacroAddFileDependencies.cmake
+file path=usr/share/cmake-2.8/Modules/NSIS.InstallOptions.ini.in
+file path=usr/share/cmake-2.8/Modules/NSIS.template.in
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-VisualAge-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/AIX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BeOS.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneL.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-base.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-dynamic.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/BSDOS.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Catamount.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/cl.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-windres.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-Absoft-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icc.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icpc.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-NAG-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-VisualAge-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-VisualAge-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin-XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Darwin.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/DragonFly.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/eCos.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/FreeBSD.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/gas.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-Common.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic-SDCC-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Generic.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Haiku.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/HP-UX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/IRIX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/IRIX64.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/kFreeBSD.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Absoft-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Clang-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Clang-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-como.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-NAG-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-SunPro-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Linux.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/MP-RAS.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/NetBSD.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/OpenBSD.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/OpenVMS.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/OSF1.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/QNX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/RISCos.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SCO_SV.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SINIX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/SunOS.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/syllable.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Tru64.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/ULTRIX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/UNIX_SV.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/UnixWare.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-cl.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-cl.cmake.in
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-df.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-G95-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-ASM.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-C.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-CXX.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-Fortran.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-NMcl.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-wcl386.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows-windres.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Windows.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/WindowsPaths.cmake
+file path=usr/share/cmake-2.8/Modules/Platform/Xenix.cmake
+file path=usr/share/cmake-2.8/Modules/ProcessorCount.cmake
+file path=usr/share/cmake-2.8/Modules/Qt4ConfigDependentSettings.cmake
+file path=usr/share/cmake-2.8/Modules/Qt4Macros.cmake
+file path=usr/share/cmake-2.8/Modules/readme.txt
+file path=usr/share/cmake-2.8/Modules/RepositoryInfo.txt.in
+file path=usr/share/cmake-2.8/Modules/SelectLibraryConfigurations.cmake
+file path=usr/share/cmake-2.8/Modules/SquishRunTestCase.bat
+file path=usr/share/cmake-2.8/Modules/SquishRunTestCase.sh
+file path=usr/share/cmake-2.8/Modules/SquishTestScript.cmake
+file path=usr/share/cmake-2.8/Modules/SystemInformation.cmake
+file path=usr/share/cmake-2.8/Modules/SystemInformation.in
+file path=usr/share/cmake-2.8/Modules/TestBigEndian.cmake
+file path=usr/share/cmake-2.8/Modules/TestCXXAcceptsFlag.cmake
+file path=usr/share/cmake-2.8/Modules/TestEndianess.c.in
+file path=usr/share/cmake-2.8/Modules/TestForANSIForScope.cmake
+file path=usr/share/cmake-2.8/Modules/TestForAnsiForScope.cxx
+file path=usr/share/cmake-2.8/Modules/TestForANSIStreamHeaders.cmake
+file path=usr/share/cmake-2.8/Modules/TestForANSIStreamHeaders.cxx
+file path=usr/share/cmake-2.8/Modules/TestForSSTREAM.cmake
+file path=usr/share/cmake-2.8/Modules/TestForSSTREAM.cxx
+file path=usr/share/cmake-2.8/Modules/TestForSTDNamespace.cmake
+file path=usr/share/cmake-2.8/Modules/TestForSTDNamespace.cxx
+file path=usr/share/cmake-2.8/Modules/Use_wxWindows.cmake
+file path=usr/share/cmake-2.8/Modules/UseEcos.cmake
+file path=usr/share/cmake-2.8/Modules/UseJava.cmake
+file path=usr/share/cmake-2.8/Modules/UseJavaClassFilelist.cmake
+file path=usr/share/cmake-2.8/Modules/UseJavaSymlinks.cmake
+file path=usr/share/cmake-2.8/Modules/UsePkgConfig.cmake
+file path=usr/share/cmake-2.8/Modules/UseQt4.cmake
+file path=usr/share/cmake-2.8/Modules/UseSWIG.cmake
+file path=usr/share/cmake-2.8/Modules/UseVTK40.cmake
+file path=usr/share/cmake-2.8/Modules/UseVTKBuildSettings40.cmake
+file path=usr/share/cmake-2.8/Modules/UseVTKConfig40.cmake
+file path=usr/share/cmake-2.8/Modules/UsewxWidgets.cmake
+file path=usr/share/cmake-2.8/Modules/VTKCompatibility.cmake
+file path=usr/share/cmake-2.8/Modules/WriteBasicConfigVersionFile.cmake
+file path=usr/share/cmake-2.8/Templates/AppleInfo.plist
+file path=usr/share/cmake-2.8/Templates/CMakeVSMacros1.vsmacros
+file path=usr/share/cmake-2.8/Templates/CMakeVSMacros2.vsmacros
+file path=usr/share/cmake-2.8/Templates/CMakeVisualStudio6Configurations.cmake
+file path=usr/share/cmake-2.8/Templates/CPack.GenericDescription.txt
+file path=usr/share/cmake-2.8/Templates/CPack.GenericLicense.txt
+file path=usr/share/cmake-2.8/Templates/CPack.GenericWelcome.txt
+file path=usr/share/cmake-2.8/Templates/CPackConfig.cmake.in
+file path=usr/share/cmake-2.8/Templates/CTestScript.cmake.in
+file path=usr/share/cmake-2.8/Templates/DLLFooter.dsptemplate
+file path=usr/share/cmake-2.8/Templates/DLLHeader.dsptemplate
+file path=usr/share/cmake-2.8/Templates/EXEFooter.dsptemplate
+file path=usr/share/cmake-2.8/Templates/EXEHeader.dsptemplate
+file path=usr/share/cmake-2.8/Templates/EXEWinHeader.dsptemplate
+file path=usr/share/cmake-2.8/Templates/TestDriver.cxx.in
+file path=usr/share/cmake-2.8/Templates/UtilityFooter.dsptemplate
+file path=usr/share/cmake-2.8/Templates/UtilityHeader.dsptemplate
+file path=usr/share/cmake-2.8/Templates/cygwin-package.sh.in
+file path=usr/share/cmake-2.8/Templates/staticLibFooter.dsptemplate
+file path=usr/share/cmake-2.8/Templates/staticLibHeader.dsptemplate
+file path=usr/share/cmake-2.8/doc/ccmake.docbook
+file path=usr/share/cmake-2.8/doc/ccmake.html
+file path=usr/share/cmake-2.8/doc/ccmake.txt
+file path=usr/share/cmake-2.8/doc/cmake-commands.html
+file path=usr/share/cmake-2.8/doc/cmake-commands.txt
+file path=usr/share/cmake-2.8/doc/cmake-compatcommands.html
+file path=usr/share/cmake-2.8/doc/cmake-compatcommands.txt
+file path=usr/share/cmake-2.8/doc/cmake-modules.html
+file path=usr/share/cmake-2.8/doc/cmake-modules.txt
+file path=usr/share/cmake-2.8/doc/cmake-policies.html
+file path=usr/share/cmake-2.8/doc/cmake-policies.txt
+file path=usr/share/cmake-2.8/doc/cmake-properties.html
+file path=usr/share/cmake-2.8/doc/cmake-properties.txt
+file path=usr/share/cmake-2.8/doc/cmake-variables.html
+file path=usr/share/cmake-2.8/doc/cmake-variables.txt
+file path=usr/share/cmake-2.8/doc/cmake.docbook
+file path=usr/share/cmake-2.8/doc/cmake.html
+file path=usr/share/cmake-2.8/doc/cmake.txt
+file path=usr/share/cmake-2.8/doc/cpack.docbook
+file path=usr/share/cmake-2.8/doc/cpack.html
+file path=usr/share/cmake-2.8/doc/cpack.txt
+file path=usr/share/cmake-2.8/doc/ctest.docbook
+file path=usr/share/cmake-2.8/doc/ctest.html
+file path=usr/share/cmake-2.8/doc/ctest.txt
+file path=usr/share/cmake-2.8/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
--- a/components/cmake/patches-post-config/CmakeCache-txt.patch	Wed Dec 07 11:40:18 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-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
--- a/components/cmake/patches/cmake-2.6.2.patch	Wed Dec 07 11:40:18 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2085 +0,0 @@
-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/cmake/patches/cmake-2.8.6.patch	Wed Dec 07 14:04:51 2011 -0800
@@ -0,0 +1,1406 @@
+diff -ru cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake
+--- cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake	Mon Oct 10 13:44:03 2011
[email protected]@ -55,9 +55,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.8.6.org//Modules/CMakeDetermineSystem.cmake cmake-2.8.6/Modules/CMakeDetermineSystem.cmake
+--- cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/CMakeDetermineSystem.cmake	Mon Oct 10 13:47:49 2011
[email protected]@ -43,7 +43,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.8.6.org//Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake
+--- cmake-2.8.6.org//Modules/FindBLAS.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindBLAS.cmake	Mon Oct 10 16:55:05 2011
[email protected]@ -80,9 +80,13 @@
+   if (WIN32)
+     set(_libdir ENV LIB)
+   elseif (APPLE)
+-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
++    set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH)
++# Uncomment the following to enable /usr/local search
++#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
+   else ()
+-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
++    set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH)
++# Uncomment the following to enable /usr/local search
++#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
+   endif ()
+ endif ()
+ foreach(_library ${_list})
+diff -ru cmake-2.8.6.org//Modules/FindFLTK.cmake cmake-2.8.6/Modules/FindFLTK.cmake
+--- cmake-2.8.6.org//Modules/FindFLTK.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindFLTK.cmake	Tue Oct 11 11:54:22 2011
[email protected]@ -103,11 +103,15 @@
+     ${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]@ -221,7 +225,8 @@
+     ENDIF()
+ 
+     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
+       ${_FLTK_POSSIBLE_INCLUDE_DIRS}
+       )
[email protected]@ -242,7 +247,8 @@
+     ENDIF()
+ 
+     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
+       ${_FLTK_POSSIBLE_LIBRARY_DIR}
+diff -ru cmake-2.8.6.org//Modules/FindFLTK2.cmake cmake-2.8.6/Modules/FindFLTK2.cmake
+--- cmake-2.8.6.org//Modules/FindFLTK2.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindFLTK2.cmake	Mon Oct 10 16:48:15 2011
[email protected]@ -83,11 +83,15 @@
+     ${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]@ -193,9 +197,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]@ -203,8 +209,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.8.6.org//Modules/FindFreetype.cmake cmake-2.8.6/Modules/FindFreetype.cmake
+--- cmake-2.8.6.org//Modules/FindFreetype.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindFreetype.cmake	Mon Oct 10 16:50:47 2011
[email protected]@ -45,8 +45,9 @@
+   HINTS
+   $ENV{FREETYPE_DIR}
+   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/freeware/include
+ )
+ 
[email protected]@ -54,8 +55,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/freeware/include
+   PATH_SUFFIXES freetype2
+ )
[email protected]@ -66,8 +68,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/freeware
+ )
+ 
+diff -ru cmake-2.8.6.org//Modules/FindGDAL.cmake cmake-2.8.6/Modules/FindGDAL.cmake
+--- cmake-2.8.6.org//Modules/FindGDAL.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindGDAL.cmake	Mon Oct 10 16:52:52 2011
[email protected]@ -53,7 +53,8 @@
+       /Library/Frameworks/gdal.framework/Headers
+       /sw # Fink
+       /opt/local # DarwinPorts
+-      /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#      /opt/csw # Blastwave
+       /opt
+ )
+ 
[email protected]@ -70,7 +71,8 @@
+         PATHS
+             /sw # Fink
+             /opt/local # DarwinPorts
+-            /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#            /opt/csw # Blastwave
+             /opt
+     )
+ 
[email protected]@ -95,7 +97,8 @@
+   PATHS
+     /sw
+     /opt/local
+-    /opt/csw
++# Uncomment the following to enable /opt/csw search
++#    /opt/csw
+     /opt
+     /usr/freeware
+ )
+diff -ru cmake-2.8.6.org//Modules/FindGTK.cmake cmake-2.8.6/Modules/FindGTK.cmake
+--- cmake-2.8.6.org//Modules/FindGTK.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindGTK.cmake	Mon Oct 10 16:53:18 2011
[email protected]@ -36,9 +36,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.8.6.org//Modules/FindGTK2.cmake cmake-2.8.6/Modules/FindGTK2.cmake
+--- cmake-2.8.6.org//Modules/FindGTK2.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindGTK2.cmake	Mon Oct 10 16:53:36 2011
[email protected]@ -185,8 +185,9 @@
+ 
+     find_path(${_var} ${_hdr}
+         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
+             /opt/gnome/include
+diff -ru cmake-2.8.6.org//Modules/FindJNI.cmake cmake-2.8.6/Modules/FindJNI.cmake
+--- cmake-2.8.6.org//Modules/FindJNI.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindJNI.cmake	Mon Oct 10 16:54:47 2011
[email protected]@ -102,12 +102,14 @@
+   ${_JAVA_HOME}/lib
+   ${_JAVA_HOME}
+   /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/{libarch}
+   /usr/lib/jvm/jre/lib/{libarch}
+-  /usr/local/lib/java/jre/lib/{libarch}
+-  /usr/local/share/java/jre/lib/{libarch}
++# Uncomment the following to enable /usr/local search
++#  /usr/local/lib/java/jre/lib/{libarch}
++#  /usr/local/share/java/jre/lib/{libarch}
+   /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
+   /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
+   /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
[email protected]@ -139,15 +141,18 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+   ${_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/include
+   /usr/lib/jvm/java-1.5.0-sun/include
+   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
+   /usr/lib/jvm/java-6-openjdk/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.8.6.org//Modules/FindJava.cmake cmake-2.8.6/Modules/FindJava.cmake
+--- cmake-2.8.6.org//Modules/FindJava.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindJava.cmake	Mon Oct 10 16:54:01 2011
[email protected]@ -73,8 +73,9 @@
+ SET(_JAVA_PATHS
+   /usr/lib/java/bin
+   /usr/share/java/bin
+-  /usr/local/java/bin
+-  /usr/local/java/share/bin
++# Uncomment the following to enable /usr/local search
++#  /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.8.6.org//Modules/FindKDE3.cmake cmake-2.8.6/Modules/FindKDE3.cmake
+--- cmake-2.8.6.org//Modules/FindKDE3.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindKDE3.cmake	Mon Oct 10 16:55:28 2011
[email protected]@ -141,7 +141,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.8.6.org//Modules/FindLAPACK.cmake cmake-2.8.6/Modules/FindLAPACK.cmake
+--- cmake-2.8.6.org//Modules/FindLAPACK.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindLAPACK.cmake	Mon Oct 10 16:56:57 2011
[email protected]@ -69,9 +69,13 @@
+   if (WIN32)
+     set(_libdir ENV LIB)
+   elseif (APPLE)
+-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
++    set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH)
++# Uncomment the following to enable /usr/local search
++#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH)
+   else ()
+-    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
++    set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH)
++# Uncomment the following to enable /usr/local search
++#    set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH)
+   endif ()
+ endif ()
+ foreach(_library ${_list})
+diff -ru cmake-2.8.6.org//Modules/FindLua50.cmake cmake-2.8.6/Modules/FindLua50.cmake
+--- cmake-2.8.6.org//Modules/FindLua50.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindLua50.cmake	Tue Oct 11 11:01:21 2011
[email protected]@ -31,11 +31,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]@ -43,15 +45,17 @@
+   NAMES lua50 lua5.0 lua-5.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]@ -65,13 +69,15 @@
+     HINTS
+     $ENV{LUALIB_DIR}
+     $ENV{LUA_DIR}
+-    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
+   )
+   IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua)
+diff -ru cmake-2.8.6.org//Modules/FindLua51.cmake cmake-2.8.6/Modules/FindLua51.cmake
+--- cmake-2.8.6.org//Modules/FindLua51.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindLua51.cmake	Tue Oct 11 11:05:48 2011
[email protected]@ -31,11 +31,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]@ -43,15 +45,17 @@
+   NAMES lua51 lua5.1 lua-5.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.8.6.org//Modules/FindMatlab.cmake cmake-2.8.6/Modules/FindMatlab.cmake
+--- cmake-2.8.6.org//Modules/FindMatlab.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindMatlab.cmake	Mon Oct 10 17:00:16 2011
[email protected]@ -60,7 +60,8 @@
+   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+     # Regular x86
+     SET(MATLAB_ROOT
+-      /usr/local/matlab-7sp1/bin/glnx86/
++# Uncomment the following to enable /usr/local search
++#      /usr/local/matlab-7sp1/bin/glnx86/
+       /opt/matlab-7sp1/bin/glnx86/
+       $ENV{HOME}/matlab-7sp1/bin/glnx86/
+       $ENV{HOME}/redhat-matlab/bin/glnx86/
[email protected]@ -68,7 +69,8 @@
+   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
+     # AMD64:
+     SET(MATLAB_ROOT
+-      /usr/local/matlab-7sp1/bin/glnxa64/
++# Uncomment the following to enable /usr/local search
++#      /usr/local/matlab-7sp1/bin/glnxa64/
+       /opt/matlab-7sp1/bin/glnxa64/
+       $ENV{HOME}/matlab7_64/bin/glnxa64/
+       $ENV{HOME}/matlab-7sp1/bin/glnxa64/
[email protected]@ -89,7 +91,8 @@
+     )
+   FIND_PATH(MATLAB_INCLUDE_DIR
+     "mex.h"
+-    "/usr/local/matlab-7sp1/extern/include/"
++# Uncomment the following to enable /usr/local search
++#    "/usr/local/matlab-7sp1/extern/include/"
+     "/opt/matlab-7sp1/extern/include/"
+     "$ENV{HOME}/matlab-7sp1/extern/include/"
+     "$ENV{HOME}/redhat-matlab/extern/include/"
+diff -ru cmake-2.8.6.org//Modules/FindOpenAL.cmake cmake-2.8.6/Modules/FindOpenAL.cmake
+--- cmake-2.8.6.org//Modules/FindOpenAL.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindOpenAL.cmake	Tue Oct 11 11:06:21 2011
[email protected]@ -68,11 +68,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]@ -81,15 +83,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.8.6.org//Modules/FindOpenThreads.cmake cmake-2.8.6/Modules/FindOpenThreads.cmake
+--- cmake-2.8.6.org//Modules/FindOpenThreads.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindOpenThreads.cmake	Mon Oct 10 17:06:24 2011
[email protected]@ -64,7 +64,8 @@
+     PATHS
+         /sw # Fink
+         /opt/local # DarwinPorts
+-        /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#        /opt/csw # Blastwave
+         /opt
+         /usr/freeware
+     PATH_SUFFIXES include
[email protected]@ -84,7 +85,8 @@
+     PATHS
+         /sw
+         /opt/local
+-        /opt/csw
++# Uncomment the following to enable /opt/csw search
++#        /opt/csw
+         /opt
+         /usr/freeware
+     PATH_SUFFIXES lib64 lib
[email protected]@ -104,7 +106,8 @@
+     PATHS
+         /sw
+         /opt/local
+-        /opt/csw
++# Uncomment the following to enable /opt/csw search
++#        /opt/csw
+         /opt
+         /usr/freeware
+     PATH_SUFFIXES lib64 lib
+diff -ru cmake-2.8.6.org//Modules/FindPHP4.cmake cmake-2.8.6/Modules/FindPHP4.cmake
+--- cmake-2.8.6.org//Modules/FindPHP4.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindPHP4.cmake	Mon Oct 10 17:07:51 2011
[email protected]@ -22,10 +22,12 @@
+ 
+ SET(PHP4_POSSIBLE_INCLUDE_PATHS
+   /usr/include/php4
+-  /usr/local/include/php4
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/php4
+   /usr/include/php
+-  /usr/local/include/php
+-  /usr/local/apache/php
++# Uncomment the following to enable /usr/local search
++#  /usr/local/include/php
++#  /usr/local/apache/php
+   )
+ 
+ SET(PHP4_POSSIBLE_LIB_PATHS
+diff -ru cmake-2.8.6.org//Modules/FindPhysFS.cmake cmake-2.8.6/Modules/FindPhysFS.cmake
+--- cmake-2.8.6.org//Modules/FindPhysFS.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindPhysFS.cmake	Tue Oct 11 11:06:49 2011
[email protected]@ -30,7 +30,8 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /usr/local
++# Uncomment the following to enable /usr/local search
++#  /usr/local
+   /usr
+   /sw # Fink
+   /opt/local # DarwinPorts
[email protected]@ -42,11 +43,12 @@
+   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
+diff -ru cmake-2.8.6.org//Modules/FindPike.cmake cmake-2.8.6/Modules/FindPike.cmake
+--- cmake-2.8.6.org//Modules/FindPike.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindPike.cmake	Mon Oct 10 17:09:13 2011
[email protected]@ -22,7 +22,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.8.6.org//Modules/FindProducer.cmake cmake-2.8.6/Modules/FindProducer.cmake
+--- cmake-2.8.6.org//Modules/FindProducer.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindProducer.cmake	Tue Oct 11 11:07:52 2011
[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]@ -67,13 +69,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.8.6.org//Modules/FindQt.cmake cmake-2.8.6/Modules/FindQt.cmake
+--- cmake-2.8.6.org//Modules/FindQt.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindQt.cmake	Tue Oct 11 10:08:04 2011
[email protected]@ -82,8 +82,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]@ -101,8 +102,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.8.6.org//Modules/FindQt3.cmake cmake-2.8.6/Modules/FindQt3.cmake
+--- cmake-2.8.6.org//Modules/FindQt3.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindQt3.cmake	Tue Oct 11 10:08:58 2011
[email protected]@ -53,7 +53,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]@ -91,7 +92,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]@ -111,7 +113,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]@ -129,7 +132,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]@ -147,7 +151,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]@ -169,7 +174,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.8.6.org//Modules/FindSDL.cmake cmake-2.8.6/Modules/FindSDL.cmake
+--- cmake-2.8.6.org//Modules/FindSDL.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL.cmake	Tue Oct 11 10:09:48 2011
[email protected]@ -72,13 +72,15 @@
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-  /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
+   /sw # Fink
+   /opt/local # DarwinPorts
+-  /opt/csw # Blastwave
++# Uncomment the following to enable /usr/local search
++#  /opt/csw # Blastwave
+   /opt
+ )
+ #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
[email protected]@ -93,7 +95,8 @@
+   PATHS
+   /sw
+   /opt/local
+-  /opt/csw
++# Uncomment the following to enable /opt/csw search
++#  /opt/csw
+   /opt
+ )
+ 
[email protected]@ -113,7 +116,8 @@
+       PATHS
+       /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.8.6.org//Modules/FindSDL_image.cmake cmake-2.8.6/Modules/FindSDL_image.cmake
+--- cmake-2.8.6.org//Modules/FindSDL_image.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL_image.cmake	Tue Oct 11 10:10:36 2011
[email protected]@ -33,20 +33,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]@ -60,11 +64,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.8.6.org//Modules/FindSDL_mixer.cmake cmake-2.8.6/Modules/FindSDL_mixer.cmake
+--- cmake-2.8.6.org//Modules/FindSDL_mixer.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL_mixer.cmake	Tue Oct 11 11:09:06 2011
[email protected]@ -33,20 +33,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]@ -56,15 +60,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.8.6.org//Modules/FindSDL_net.cmake cmake-2.8.6/Modules/FindSDL_net.cmake
+--- cmake-2.8.6.org//Modules/FindSDL_net.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL_net.cmake	Tue Oct 11 11:10:06 2011
[email protected]@ -33,20 +33,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]@ -55,15 +59,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.8.6.org//Modules/FindSDL_sound.cmake cmake-2.8.6/Modules/FindSDL_sound.cmake
+--- cmake-2.8.6.org//Modules/FindSDL_sound.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL_sound.cmake	Tue Oct 11 10:15:08 2011
[email protected]@ -80,20 +80,24 @@
+   $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
++# 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]@ -106,11 +110,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]@ -223,11 +229,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]@ -246,11 +254,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]@ -272,11 +282,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]@ -294,11 +306,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]@ -318,11 +332,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]@ -342,11 +358,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]@ -369,11 +387,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]@ -396,11 +416,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.8.6.org//Modules/FindSDL_ttf.cmake cmake-2.8.6/Modules/FindSDL_ttf.cmake
+--- cmake-2.8.6.org//Modules/FindSDL_ttf.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSDL_ttf.cmake	Tue Oct 11 10:15:50 2011
[email protected]@ -33,20 +33,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]@ -59,11 +63,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.8.6.org//Modules/FindSelfPackers.cmake cmake-2.8.6/Modules/FindSelfPackers.cmake
+--- cmake-2.8.6.org//Modules/FindSelfPackers.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindSelfPackers.cmake	Tue Oct 11 10:16:10 2011
[email protected]@ -25,7 +25,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]@ -34,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
+ )
+ 
+diff -ru cmake-2.8.6.org//Modules/FindTCL.cmake cmake-2.8.6/Modules/FindTCL.cmake
+--- cmake-2.8.6.org//Modules/FindTCL.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindTCL.cmake	Tue Oct 11 10:17:12 2011
[email protected]@ -79,7 +79,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]@ -159,7 +160,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.8.6.org//Modules/FindTclStub.cmake cmake-2.8.6/Modules/FindTclStub.cmake
+--- cmake-2.8.6.org//Modules/FindTclStub.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindTclStub.cmake	Tue Oct 11 10:17:24 2011
[email protected]@ -67,7 +67,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.8.6.org//Modules/FindUnixCommands.cmake cmake-2.8.6/Modules/FindUnixCommands.cmake
+--- cmake-2.8.6.org//Modules/FindUnixCommands.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/FindUnixCommands.cmake	Tue Oct 11 10:17:56 2011
[email protected]@ -22,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]@ -34,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]@ -46,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]@ -58,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]@ -70,7 +74,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]@ -85,7 +90,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.8.6.org//Modules/Findosg_functions.cmake cmake-2.8.6/Modules/Findosg_functions.cmake
+--- cmake-2.8.6.org//Modules/Findosg_functions.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/Findosg_functions.cmake	Mon Oct 10 17:06:52 2011
[email protected]@ -34,7 +34,8 @@
+        PATHS
+             /sw # Fink
+             /opt/local # DarwinPorts
+-            /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#            /opt/csw # Blastwave
+             /opt
+             /usr/freeware
+    )
[email protected]@ -58,7 +59,8 @@
+        PATHS
+             /sw # Fink
+             /opt/local # DarwinPorts
+-            /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#            /opt/csw # Blastwave
+             /opt
+             /usr/freeware
+    )
[email protected]@ -74,7 +76,8 @@
+        PATHS
+             /sw # Fink
+             /opt/local # DarwinPorts
+-            /opt/csw # Blastwave
++# Uncomment the following to enable /opt/csw search
++#            /opt/csw # Blastwave
+             /opt
+             /usr/freeware
+     )
+diff -ru cmake-2.8.6.org//Modules/GetPrerequisites.cmake cmake-2.8.6/Modules/GetPrerequisites.cmake
+--- cmake-2.8.6.org//Modules/GetPrerequisites.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/GetPrerequisites.cmake	Tue Oct 11 10:18:31 2011
[email protected]@ -588,7 +588,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.8.6.org//Modules/UseJava.cmake cmake-2.8.6/Modules/UseJava.cmake
+--- cmake-2.8.6.org//Modules/UseJava.cmake	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Modules/UseJava.cmake	Tue Oct 11 10:22:41 2011
[email protected]@ -445,7 +445,8 @@
+     set(_jar_versions)
+     set(_jar_paths
+         /usr/share/java/
+-        /usr/local/share/java/
++# Uncomment the following to enable /usr/local search
++#        /usr/local/share/java/
+         ${Java_JAR_PATHS})
+     set(_jar_doc "NOTSET")
+ 
+diff -ru cmake-2.8.6.org//Source/cmDocumentation.cxx cmake-2.8.6/Source/cmDocumentation.cxx
+--- cmake-2.8.6.org//Source/cmDocumentation.cxx	Tue Oct  4 09:09:24 2011
++++ cmake-2.8.6/Source/cmDocumentation.cxx	Tue Oct 18 12:33:05 2011
[email protected]@ -1288,6 +1288,7 @@
+ bool cmDocumentation::PrintDocumentationUsage(std::ostream& os)
+ {
+   this->ClearSections();
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Usage");
+   this->AddSectionToPrint("Options");
+   if(this->ShowGenerators)
[email protected]@ -1314,6 +1315,7 @@
+   this->ClearSections();
+   this->CreateModulesSection();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Modules));
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Description");
+   this->AddSectionToPrint("Modules");
+   this->AddSectionToPrint("Copyright");
[email protected]@ -1330,6 +1332,7 @@
+   this->ClearSections();
+   this->CreateCustomModulesSection();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CustomModules));
++  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]@ -1347,6 +1350,7 @@
+ {
+   this->ClearSections();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Policies));
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Description");
+   this->AddSectionToPrint("Policies");
+   this->AddSectionToPrint("Copyright");
[email protected]@ -1363,6 +1367,7 @@
+ {
+   this->ClearSections();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Properties));
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Properties Description");
+   for (std::vector<std::string>::iterator i = 
+          this->PropertySections.begin();
[email protected]@ -1383,6 +1388,7 @@
+ {
+   this->ClearSections();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Variables));
++  this->AddSectionToPrint("Name");
+   for (std::vector<std::string>::iterator i = 
+          this->VariableSections.begin();
+        i != this->VariableSections.end(); ++i)
[email protected]@ -1402,6 +1408,7 @@
+ {
+   this->ClearSections();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Commands));
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Commands");
+   this->AddSectionToPrint("Copyright");
+   this->AddSectionToPrint("Standard See Also");
[email protected]@ -1416,6 +1423,7 @@
+ {
+   this->ClearSections();
+   this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CompatCommands));
++  this->AddSectionToPrint("Name");
+   this->AddSectionToPrint("Compatibility Commands Description");
+   this->AddSectionToPrint("Compatibility Commands");
+   this->AddSectionToPrint("Copyright");