Ticket #19781: cmakeMods.txt

File cmakeMods.txt, 30.1 KB (added by dweber@…, 15 years ago)

diff -u on prefix changes to cmake module files

Line 
1--- /opt/local/share/cmake-2.6/Modules/CMakeDetermineJavaCompiler.cmake 2009-04-28 13:22:58.000000000 -0700
2+++ cmakeMods/CMakeDetermineJavaCompiler.cmake  2009-06-01 21:37:23.000000000 -0700
3@@ -41,8 +41,8 @@
4     /usr/bin
5     /usr/lib/java/bin
6     /usr/share/java/bin
7-    /usr/local/bin
8-    /usr/local/java/bin
9+    /opt/local/bin
10+    /opt/local/java/bin
11     /usr/java/j2sdk1.4.2_04
12     /usr/lib/j2sdk1.4-sun/bin
13     /usr/lib/j2sdk1.5-sun/bin
14--- /opt/local/share/cmake-2.6/Modules/CMakeDetermineSystem.cmake       2009-04-28 13:22:58.000000000 -0700
15+++ cmakeMods/CMakeDetermineSystem.cmake        2009-06-01 21:37:23.000000000 -0700
16@@ -29,7 +29,7 @@
17 
18 # find out on which system cmake runs
19 IF(CMAKE_HOST_UNIX)
20-  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
21+  FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /opt/local/bin )
22   IF(CMAKE_UNAME)
23     EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
24     EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
25--- /opt/local/share/cmake-2.6/Modules/CMakeGenericSystem.cmake 2009-04-28 13:22:58.000000000 -0700
26+++ cmakeMods/CMakeGenericSystem.cmake  2009-06-01 21:37:23.000000000 -0700
27@@ -45,7 +45,7 @@
28 
29 # Choose a default install prefix for this platform.
30 IF(CMAKE_HOST_UNIX)
31-  SET(CMAKE_INSTALL_PREFIX "/usr/local"
32+  SET(CMAKE_INSTALL_PREFIX "/opt/local"
33     CACHE PATH "Install path prefix, prepended onto install directories.")
34 ELSE(CMAKE_HOST_UNIX)
35   IF("$ENV{ProgramFiles}" MATCHES "^$")
36--- /opt/local/share/cmake-2.6/Modules/FindAVIFile.cmake        2009-04-28 13:22:59.000000000 -0700
37+++ cmakeMods/FindAVIFile.cmake 2009-06-01 21:37:23.000000000 -0700
38@@ -12,14 +12,14 @@
39 IF (UNIX)
40 
41   FIND_PATH(AVIFILE_INCLUDE_DIR avifile.h
42-    /usr/local/avifile/include
43-    /usr/local/include/avifile
44+    /opt/local/avifile/include
45+    /opt/local/include/avifile
46     /usr/include
47   )
48 
49   FIND_LIBRARY(AVIFILE_AVIPLAY_LIBRARY aviplay
50-    /usr/local/avifile/lib
51-    /usr/local/lib
52+    /opt/local/avifile/lib
53+    /opt/local/lib
54     /usr/lib
55   )
56 
57--- /opt/local/share/cmake-2.6/Modules/FindBLAS.cmake   2009-04-28 13:22:59.000000000 -0700
58+++ cmakeMods/FindBLAS.cmake    2009-06-01 21:37:23.000000000 -0700
59@@ -72,7 +72,7 @@
60     endif(BLA_STATIC)
61     find_library(${_prefix}_${_library}_LIBRARY
62     NAMES ${_library}
63-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
64+    PATHS /opt/local/lib /usr/lib /opt/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
65     )
66 
67    else ( APPLE )
68@@ -81,7 +81,7 @@
69     endif(BLA_STATIC)
70     find_library(${_prefix}_${_library}_LIBRARY
71     NAMES ${_library}
72-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
73+    PATHS /opt/local/lib /usr/lib /opt/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
74     )
75    endif( APPLE )
76     mark_as_advanced(${_prefix}_${_library}_LIBRARY)
77--- /opt/local/share/cmake-2.6/Modules/FindFLTK.cmake   2009-04-28 13:22:59.000000000 -0700
78+++ cmakeMods/FindFLTK.cmake    2009-06-01 21:37:23.000000000 -0700
79@@ -95,11 +95,11 @@
80     ${FLTK_DIR_SEARCH}
81 
82     # Look in standard UNIX install locations.
83-    /usr/local/lib/fltk
84+    /opt/local/lib/fltk
85     /usr/lib/fltk
86-    /usr/local/include
87+    /opt/local/include
88     /usr/include
89-    /usr/local/fltk
90+    /opt/local/fltk
91     /usr/X11R6/include
92 
93     # Read from the CMakeSetup registry entries.  It is likely that
94@@ -213,7 +213,7 @@
95     ENDIF()
96 
97     SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
98-      /usr/local/fltk
99+      /opt/local/fltk
100       /usr/X11R6/include
101       ${_FLTK_POSSIBLE_INCLUDE_DIRS}
102       )
103@@ -234,7 +234,7 @@
104     ENDIF()
105 
106     SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
107-      /usr/local/fltk/lib
108+      /opt/local/fltk/lib
109       /usr/X11R6/lib
110       ${FLTK_INCLUDE_DIR}/lib
111       ${_FLTK_POSSIBLE_LIBRARY_DIR}
112--- /opt/local/share/cmake-2.6/Modules/FindFLTK2.cmake  2009-04-28 13:22:59.000000000 -0700
113+++ cmakeMods/FindFLTK2.cmake   2009-06-01 21:37:23.000000000 -0700
114@@ -74,11 +74,11 @@
115     ${FLTK2_DIR_SEARCH}
116 
117     # Look in standard UNIX install locations.
118-    /usr/local/lib/fltk2
119+    /opt/local/lib/fltk2
120     /usr/lib/fltk2
121-    /usr/local/include
122+    /opt/local/include
123     /usr/include
124-    /usr/local/fltk2
125+    /opt/local/fltk2
126     /usr/X11R6/include
127 
128     # Read from the CMakeSetup registry entries.  It is likely that
129@@ -184,9 +184,9 @@
130     ENDIF(FLTK2_FLUID_EXECUTABLE)
131 
132     SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH}
133-      /usr/local/include
134+      /opt/local/include
135       /usr/include
136-      /usr/local/fltk2
137+      /opt/local/fltk2
138       /usr/X11R6/include
139       )
140 
141@@ -194,8 +194,8 @@
142 
143     SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH}
144       /usr/lib
145-      /usr/local/lib
146-      /usr/local/fltk2/lib
147+      /opt/local/lib
148+      /opt/local/fltk2/lib
149       /usr/X11R6/lib
150       ${FLTK2_INCLUDE_DIR}/lib
151       )
152--- /opt/local/share/cmake-2.6/Modules/FindFreetype.cmake       2009-04-28 13:22:59.000000000 -0700
153+++ cmakeMods/FindFreetype.cmake        2009-06-01 21:37:23.000000000 -0700
154@@ -33,8 +33,8 @@
155   $ENV{FREETYPE_DIR}
156   PATH_SUFFIXES include
157   PATHS
158-  /usr/local/X11R6/include
159-  /usr/local/X11/include
160+  /opt/local/X11R6/include
161+  /opt/local/X11/include
162   /usr/X11/include
163   /sw/include
164   /opt/local/include
165@@ -45,8 +45,8 @@
166   HINTS
167   $ENV{FREETYPE_DIR}/include/freetype2
168   PATHS
169-  /usr/local/X11R6/include
170-  /usr/local/X11/include
171+  /opt/local/X11R6/include
172+  /opt/local/X11/include
173   /usr/X11/include
174   /sw/include
175   /opt/local/include
176@@ -60,8 +60,8 @@
177   $ENV{FREETYPE_DIR}
178   PATH_SUFFIXES lib64 lib
179   PATHS
180-  /usr/local/X11R6
181-  /usr/local/X11
182+  /opt/local/X11R6
183+  /opt/local/X11
184   /usr/X11
185   /sw
186   /usr/freeware
187--- /opt/local/share/cmake-2.6/Modules/FindGIF.cmake    2009-04-28 13:22:59.000000000 -0700
188+++ cmakeMods/FindGIF.cmake     2009-06-01 21:37:23.000000000 -0700
189@@ -32,7 +32,7 @@
190   PATHS
191   ~/Library/Frameworks
192   /Library/Frameworks
193-  /usr/local
194+  /opt/local
195   /usr
196   /sw
197   /opt/local
198--- /opt/local/share/cmake-2.6/Modules/FindGTK.cmake    2009-04-28 13:22:59.000000000 -0700
199+++ cmakeMods/FindGTK.cmake     2009-06-01 21:37:23.000000000 -0700
200@@ -23,9 +23,9 @@
201   FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h
202     PATHS
203     /usr/openwin/share/include
204-    /usr/local/include/glib12
205+    /opt/local/include/glib12
206     /usr/lib/glib/include
207-    /usr/local/lib/glib/include
208+    /opt/local/lib/glib/include
209     /opt/gnome/include
210     /opt/gnome/lib/glib/include
211   )
212--- /opt/local/share/cmake-2.6/Modules/FindITK-3.12.cmake       2009-05-29 16:41:04.000000000 -0700
213+++ cmakeMods/FindITK-3.12.cmake        2009-06-01 21:37:23.000000000 -0700
214@@ -52,7 +52,7 @@
215     # Look in standard UNIX install locations.
216     /opt/local/lib/InsightToolkit-3.12
217     /opt/local/lib/InsightToolkit
218-    /usr/local/lib/InsightToolkit
219+    /opt/local/lib/InsightToolkit
220     /usr/lib/InsightToolkit
221 
222     # Read from the CMakeSetup registry entries.  It is likely that
223--- /opt/local/share/cmake-2.6/Modules/FindITK.cmake    2009-05-28 11:19:41.000000000 -0700
224+++ cmakeMods/FindITK.cmake     2009-06-01 21:37:23.000000000 -0700
225@@ -51,7 +51,7 @@
226 
227     # Look in standard UNIX install locations.
228     /opt/local/lib/InsightToolkit
229-    /usr/local/lib/InsightToolkit
230+    /opt/local/lib/InsightToolkit
231     /usr/lib/InsightToolkit
232 
233     # Read from the CMakeSetup registry entries.  It is likely that
234--- /opt/local/share/cmake-2.6/Modules/FindJNI.cmake    2009-04-28 13:22:59.000000000 -0700
235+++ cmakeMods/FindJNI.cmake     2009-06-01 21:37:23.000000000 -0700
236@@ -23,23 +23,23 @@
237   $ENV{JAVA_HOME}/jre/lib/amd64
238   $ENV{JAVA_HOME}/jre/lib/ppc
239   /usr/lib
240-  /usr/local/lib
241+  /opt/local/lib
242   /usr/lib/jvm/java/lib
243   /usr/lib/java/jre/lib/i386
244-  /usr/local/lib/java/jre/lib/i386
245-  /usr/local/share/java/jre/lib/i386
246+  /opt/local/lib/java/jre/lib/i386
247+  /opt/local/share/java/jre/lib/i386
248   /usr/lib/j2sdk1.4-sun/jre/lib/i386
249   /usr/lib/j2sdk1.5-sun/jre/lib/i386
250   /opt/sun-jdk-1.5.0.04/jre/lib/amd64
251   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64
252   /usr/lib/java/jre/lib/amd64
253-  /usr/local/lib/java/jre/lib/amd64
254-  /usr/local/share/java/jre/lib/amd64
255+  /opt/local/lib/java/jre/lib/amd64
256+  /opt/local/share/java/jre/lib/amd64
257   /usr/lib/j2sdk1.4-sun/jre/lib/amd64
258   /usr/lib/j2sdk1.5-sun/jre/lib/amd64
259   /usr/lib/java/jre/lib/ppc
260-  /usr/local/lib/java/jre/lib/ppc
261-  /usr/local/share/java/jre/lib/ppc
262+  /opt/local/lib/java/jre/lib/ppc
263+  /opt/local/share/java/jre/lib/ppc
264   /usr/lib/j2sdk1.4-sun/jre/lib/ppc
265   /usr/lib/j2sdk1.5-sun/jre/lib/ppc
266   )
267@@ -61,12 +61,12 @@
268   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
269   $ENV{JAVA_HOME}/include
270   /usr/include
271-  /usr/local/include
272+  /opt/local/include
273   /usr/lib/java/include
274-  /usr/local/lib/java/include
275+  /opt/local/lib/java/include
276   /usr/lib/jvm/java/include
277   /usr/lib/jvm/java-6-sun-1.6.0.00/include
278-  /usr/local/share/java/include
279+  /opt/local/share/java/include
280   /usr/lib/j2sdk1.4-sun/include
281   /usr/lib/j2sdk1.5-sun/include
282   /opt/sun-jdk-1.5.0.04/include
283--- /opt/local/share/cmake-2.6/Modules/FindJava.cmake   2009-04-28 13:22:59.000000000 -0700
284+++ cmakeMods/FindJava.cmake    2009-06-01 21:37:23.000000000 -0700
285@@ -20,9 +20,9 @@
286   /usr/bin
287   /usr/lib/java/bin
288   /usr/share/java/bin
289-  /usr/local/bin
290-  /usr/local/java/bin
291-  /usr/local/java/share/bin
292+  /opt/local/bin
293+  /opt/local/java/bin
294+  /opt/local/java/share/bin
295   /usr/java/j2sdk1.4.2_04
296   /usr/lib/j2sdk1.4-sun/bin
297   /usr/java/j2sdk1.4.2_09/bin
298--- /opt/local/share/cmake-2.6/Modules/FindKDE3.cmake   2009-04-28 13:22:59.000000000 -0700
299+++ cmakeMods/FindKDE3.cmake    2009-06-01 21:37:23.000000000 -0700
300@@ -127,7 +127,7 @@
301   /opt/kde3/include
302   /opt/kde/include
303   /usr/include/kde
304-  /usr/local/include/kde
305+  /opt/local/include/kde
306   )
307 
308 #now the KDE library directory
309--- /opt/local/share/cmake-2.6/Modules/FindLAPACK.cmake 2009-04-28 13:22:59.000000000 -0700
310+++ cmakeMods/FindLAPACK.cmake  2009-06-01 21:37:23.000000000 -0700
311@@ -72,7 +72,7 @@
312     endif(BLA_STATIC)
313     find_library(${_prefix}_${_library}_LIBRARY
314     NAMES ${_library}
315-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
316+    PATHS /opt/local/lib /usr/lib /opt/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
317     )
318     else(APPLE)
319     if(BLA_STATIC)
320@@ -80,7 +80,7 @@
321     endif(BLA_STATIC)
322     find_library(${_prefix}_${_library}_LIBRARY
323     NAMES ${_library}
324-    PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
325+    PATHS /opt/local/lib /usr/lib /opt/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
326     )
327     endif(APPLE)
328 
329--- /opt/local/share/cmake-2.6/Modules/FindLua50.cmake  2009-04-28 13:22:59.000000000 -0700
330+++ cmakeMods/FindLua50.cmake   2009-06-01 21:37:23.000000000 -0700
331@@ -19,7 +19,7 @@
332   PATHS
333   ~/Library/Frameworks
334   /Library/Frameworks
335-  /usr/local
336+  /opt/local
337   /usr
338   /sw # Fink
339   /opt/local # DarwinPorts
340@@ -35,7 +35,7 @@
341   PATHS
342   ~/Library/Frameworks
343   /Library/Frameworks
344-  /usr/local
345+  /opt/local
346   /usr
347   /sw
348   /opt/local
349@@ -55,7 +55,7 @@
350     $ENV{LUA_DIR}
351     PATH_SUFFIXES lib64 lib
352     PATHS
353-    /usr/local
354+    /opt/local
355     /usr
356     /sw
357     /opt/local
358--- /opt/local/share/cmake-2.6/Modules/FindLua51.cmake  2009-04-28 13:22:59.000000000 -0700
359+++ cmakeMods/FindLua51.cmake   2009-06-01 21:37:23.000000000 -0700
360@@ -19,7 +19,7 @@
361   PATHS
362   ~/Library/Frameworks
363   /Library/Frameworks
364-  /usr/local
365+  /opt/local
366   /usr
367   /sw # Fink
368   /opt/local # DarwinPorts
369@@ -35,7 +35,7 @@
370   PATHS
371   ~/Library/Frameworks
372   /Library/Frameworks
373-  /usr/local
374+  /opt/local
375   /usr
376   /sw
377   /opt/local
378--- /opt/local/share/cmake-2.6/Modules/FindMPEG.cmake   2009-04-28 13:22:59.000000000 -0700
379+++ cmakeMods/FindMPEG.cmake    2009-06-01 21:37:23.000000000 -0700
380@@ -8,15 +8,15 @@
381 #  MPEG_vo_LIBRARY, where to find the vo library.
382 
383 FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
384-  /usr/local/livid
385+  /opt/local/livid
386 )
387 
388 FIND_LIBRARY(MPEG_mpeg2_LIBRARY mpeg2
389-  /usr/local/livid/mpeg2dec/libmpeg2/.libs
390+  /opt/local/livid/mpeg2dec/libmpeg2/.libs
391 )
392 
393 FIND_LIBRARY( MPEG_vo_LIBRARY vo
394-  /usr/local/livid/mpeg2dec/libvo/.libs
395+  /opt/local/livid/mpeg2dec/libvo/.libs
396 )
397 
398 # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
399--- /opt/local/share/cmake-2.6/Modules/FindMPEG2.cmake  2009-04-28 13:22:59.000000000 -0700
400+++ cmakeMods/FindMPEG2.cmake   2009-06-01 21:37:23.000000000 -0700
401@@ -8,15 +8,15 @@
402 #  MPEG2_vo_LIBRARY, where to find the vo library.
403 
404 FIND_PATH(MPEG2_INCLUDE_DIR mpeg2.h
405-  /usr/local/livid
406+  /opt/local/livid
407 )
408 
409 FIND_LIBRARY(MPEG2_mpeg2_LIBRARY mpeg2
410-  /usr/local/livid/mpeg2dec/libmpeg2/.libs
411+  /opt/local/livid/mpeg2dec/libmpeg2/.libs
412 )
413 
414 FIND_LIBRARY( MPEG2_vo_LIBRARY vo
415-  /usr/local/livid/mpeg2dec/libvo/.libs
416+  /opt/local/livid/mpeg2dec/libvo/.libs
417 )
418 
419 
420--- /opt/local/share/cmake-2.6/Modules/FindMPI.cmake    2009-04-28 13:22:59.000000000 -0700
421+++ cmakeMods/FindMPI.cmake     2009-06-01 21:37:23.000000000 -0700
422@@ -243,10 +243,10 @@
423   set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
424 else (MPI_COMPILE_CMDLINE)
425   find_path(MPI_INCLUDE_PATH mpi.h
426-    /usr/local/include
427+    /opt/local/include
428     /usr/include
429     /usr/include/mpi
430-    /usr/local/mpi/include
431+    /opt/local/mpi/include
432     "C:/Program Files/MPICH/SDK/Include"
433     "$ENV{SystemDrive}/Program Files/MPICH2/include"
434     "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
435@@ -261,7 +261,7 @@
436   
437   find_library(MPI_LIBRARY
438     NAMES mpi mpich msmpi
439-    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
440+    PATHS /usr/lib /opt/local/lib /opt/local/mpi/lib
441     "C:/Program Files/MPICH/SDK/Lib"
442     "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
443     "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
444@@ -273,7 +273,7 @@
445 
446   find_library(MPI_EXTRA_LIBRARY
447     NAMES mpi++
448-    PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
449+    PATHS /usr/lib /opt/local/lib /opt/local/mpi/lib
450     "C:/Program Files/MPICH/SDK/Lib"
451     DOC "Extra MPI libraries to link against.")
452 
453--- /opt/local/share/cmake-2.6/Modules/FindMatlab.cmake 2009-04-28 13:22:59.000000000 -0700
454+++ cmakeMods/FindMatlab.cmake  2009-06-01 21:37:23.000000000 -0700
455@@ -48,7 +48,7 @@
456   IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
457     # Regular x86
458     SET(MATLAB_ROOT
459-      /usr/local/matlab-7sp1/bin/glnx86/
460+      /opt/local/matlab-7sp1/bin/glnx86/
461       /opt/matlab-7sp1/bin/glnx86/
462       $ENV{HOME}/matlab-7sp1/bin/glnx86/
463       $ENV{HOME}/redhat-matlab/bin/glnx86/
464@@ -56,7 +56,7 @@
465   ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
466     # AMD64:
467     SET(MATLAB_ROOT
468-      /usr/local/matlab-7sp1/bin/glnxa64/
469+      /opt/local/matlab-7sp1/bin/glnxa64/
470       /opt/matlab-7sp1/bin/glnxa64/
471       $ENV{HOME}/matlab7_64/bin/glnxa64/
472       $ENV{HOME}/matlab-7sp1/bin/glnxa64/
473@@ -77,7 +77,7 @@
474     )
475   FIND_PATH(MATLAB_INCLUDE_DIR
476     "mex.h"
477-    "/usr/local/matlab-7sp1/extern/include/"
478+    "/opt/local/matlab-7sp1/extern/include/"
479     "/opt/matlab-7sp1/extern/include/"
480     "$ENV{HOME}/matlab-7sp1/extern/include/"
481     "$ENV{HOME}/redhat-matlab/extern/include/"
482--- /opt/local/share/cmake-2.6/Modules/FindOpenAL.cmake 2009-04-28 13:22:59.000000000 -0700
483+++ cmakeMods/FindOpenAL.cmake  2009-06-01 21:37:23.000000000 -0700
484@@ -55,7 +55,7 @@
485   PATHS
486   ~/Library/Frameworks
487   /Library/Frameworks
488-  /usr/local
489+  /opt/local
490   /usr
491   /sw # Fink
492   /opt/local # DarwinPorts
493@@ -72,7 +72,7 @@
494   PATHS
495   ~/Library/Frameworks
496   /Library/Frameworks
497-  /usr/local
498+  /opt/local
499   /usr
500   /sw
501   /opt/local
502--- /opt/local/share/cmake-2.6/Modules/FindPHP4.cmake   2009-04-28 13:22:59.000000000 -0700
503+++ cmakeMods/FindPHP4.cmake    2009-06-01 21:37:23.000000000 -0700
504@@ -9,10 +9,10 @@
505 
506 SET(PHP4_POSSIBLE_INCLUDE_PATHS
507   /usr/include/php4
508-  /usr/local/include/php4
509+  /opt/local/include/php4
510   /usr/include/php
511-  /usr/local/include/php
512-  /usr/local/apache/php
513+  /opt/local/include/php
514+  /opt/local/apache/php
515   )
516 
517 SET(PHP4_POSSIBLE_LIB_PATHS
518--- /opt/local/share/cmake-2.6/Modules/FindPNG.cmake    2009-04-28 13:22:59.000000000 -0700
519+++ cmakeMods/FindPNG.cmake     2009-06-01 21:37:23.000000000 -0700
520@@ -13,7 +13,7 @@
521 
522 IF(ZLIB_FOUND)
523   FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
524-  /usr/local/include/libpng             # OpenBSD
525+  /opt/local/include/libpng             # OpenBSD
526   )
527 
528   SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
529--- /opt/local/share/cmake-2.6/Modules/FindPhysFS.cmake 2009-04-28 13:22:59.000000000 -0700
530+++ cmakeMods/FindPhysFS.cmake  2009-06-01 21:37:23.000000000 -0700
531@@ -17,7 +17,7 @@
532   PATHS
533   ~/Library/Frameworks
534   /Library/Frameworks
535-  /usr/local
536+  /opt/local
537   /usr
538   /sw # Fink
539   /opt/local # DarwinPorts
540@@ -33,7 +33,7 @@
541   PATHS
542   ~/Library/Frameworks
543   /Library/Frameworks
544-  /usr/local
545+  /opt/local
546   /usr
547   /sw
548   /opt/local
549--- /opt/local/share/cmake-2.6/Modules/FindPike.cmake   2009-04-28 13:22:59.000000000 -0700
550+++ cmakeMods/FindPike.cmake    2009-06-01 21:37:23.000000000 -0700
551@@ -9,7 +9,7 @@
552 
553 FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS
554   /usr/include/pike/*
555-  /usr/local/include/pike/*)
556+  /opt/local/include/pike/*)
557 
558 FIND_PATH(PIKE_INCLUDE_PATH program.h
559   ${PIKE_POSSIBLE_INCLUDE_PATHS})
560--- /opt/local/share/cmake-2.6/Modules/FindProducer.cmake       2009-04-28 13:22:59.000000000 -0700
561+++ cmakeMods/FindProducer.cmake        2009-06-01 21:37:23.000000000 -0700
562@@ -38,7 +38,7 @@
563   PATHS
564     ~/Library/Frameworks
565     /Library/Frameworks
566-    /usr/local/include
567+    /opt/local/include
568     /usr/include
569     /sw/include # Fink
570     /opt/local/include # DarwinPorts
571@@ -56,7 +56,7 @@
572   $ENV{OSGDIR}
573   PATH_SUFFIXES lib64 lib
574   PATHS
575-  /usr/local
576+  /opt/local
577   /usr
578   /sw
579   /opt/local
580--- /opt/local/share/cmake-2.6/Modules/FindQt.cmake     2009-04-28 13:22:59.000000000 -0700
581+++ cmakeMods/FindQt.cmake      2009-06-01 21:37:23.000000000 -0700
582@@ -25,20 +25,20 @@
583 ENDIF(GLOB_TEMP_VAR)
584 SET(GLOB_TEMP_VAR)
585 
586-FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/bin/qmake)
587+FILE(GLOB GLOB_TEMP_VAR /opt/local/qt-x11-commercial-3*/bin/qmake)
588 IF(GLOB_TEMP_VAR)
589   SET(QT3_INSTALLED TRUE)
590 ENDIF(GLOB_TEMP_VAR)
591 SET(GLOB_TEMP_VAR)
592 
593 # look for qt4 installations
594-FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
595+FILE(GLOB GLOB_TEMP_VAR /opt/local/qt-x11-commercial-4*/bin/qmake)
596 IF(GLOB_TEMP_VAR)
597   SET(QT4_INSTALLED TRUE)
598 ENDIF(GLOB_TEMP_VAR)
599 SET(GLOB_TEMP_VAR)
600 
601-FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/bin/qmake)
602+FILE(GLOB GLOB_TEMP_VAR /opt/local/Trolltech/Qt-4*/bin/qmake)
603 IF(GLOB_TEMP_VAR)
604   SET(QT4_INSTALLED TRUE)
605 ENDIF(GLOB_TEMP_VAR)
606@@ -70,8 +70,8 @@
607   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt"
608   ${qt_headers}/Qt
609   $ENV{QTDIR}/include/Qt
610-  /usr/local/qt/include/Qt
611-  /usr/local/include/Qt
612+  /opt/local/qt/include/Qt
613+  /opt/local/include/Qt
614   /usr/lib/qt/include/Qt
615   /usr/include/Qt
616   /usr/share/qt4/include/Qt
617@@ -89,8 +89,8 @@
618   C:/Qt/3.3.3Educational/include
619   $ENV{QTDIR}/include
620   /usr/include/qt3/Qt
621-  /usr/local/qt/include
622-  /usr/local/include
623+  /opt/local/qt/include
624+  /opt/local/include
625   /usr/lib/qt/include
626   /usr/include
627   /usr/share/qt3/include
628--- /opt/local/share/cmake-2.6/Modules/FindQt3.cmake    2009-04-28 13:22:59.000000000 -0700
629+++ cmakeMods/FindQt3.cmake     2009-06-01 21:37:23.000000000 -0700
630@@ -40,7 +40,7 @@
631   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
632   $ENV{QTDIR}/include
633   ${GLOB_PATHS_BIN}
634-  /usr/local/qt/include
635+  /opt/local/qt/include
636   /usr/lib/qt/include
637   /usr/lib/qt3/include
638   /usr/include/qt
639@@ -78,7 +78,7 @@
640   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
641     $ENV{QTDIR}/lib
642     ${GLOB_PATHS_LIB}
643-    /usr/local/qt/lib
644+    /opt/local/qt/lib
645     /usr/lib/qt/lib
646     /usr/lib/qt3/lib
647     /usr/lib/qt3/lib64
648@@ -98,7 +98,7 @@
649     "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
650     $ENV{QTDIR}/lib
651     ${GLOB_PATHS_LIB}
652-    /usr/local/qt/lib
653+    /opt/local/qt/lib
654     /usr/lib/qt/lib
655     /usr/lib/qt3/lib
656     /usr/lib/qt3/lib64
657@@ -116,7 +116,7 @@
658   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
659   $ENV{QTDIR}/lib
660   ${GLOB_PATHS_LIB}
661-  /usr/local/qt/lib
662+  /opt/local/qt/lib
663   /usr/lib/qt3/lib
664   /usr/lib/qt3/lib64
665   /usr/share/qt3/lib
666@@ -134,7 +134,7 @@
667   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
668   $ENV{QTDIR}/bin
669   ${GLOB_PATHS_BIN}
670-  /usr/local/qt/bin
671+  /opt/local/qt/bin
672   /usr/lib/qt/bin
673   /usr/lib/qt3/bin
674   /usr/share/qt3/bin
675@@ -155,7 +155,7 @@
676   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
677   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
678   ${GLOB_PATHS_BIN}
679-  /usr/local/qt/bin
680+  /opt/local/qt/bin
681   /usr/lib/qt/bin
682   /usr/lib/qt3/bin
683   /usr/share/qt3/bin
684--- /opt/local/share/cmake-2.6/Modules/FindSDL.cmake    2009-04-28 13:22:59.000000000 -0700
685+++ cmakeMods/FindSDL.cmake     2009-06-01 21:37:23.000000000 -0700
686@@ -59,13 +59,13 @@
687   PATHS
688   ~/Library/Frameworks
689   /Library/Frameworks
690-  /usr/local/include/SDL
691+  /opt/local/include/SDL
692   /usr/include/SDL
693-  /usr/local/include/SDL12
694-  /usr/local/include/SDL11 # FreeBSD ports
695+  /opt/local/include/SDL12
696+  /opt/local/include/SDL11 # FreeBSD ports
697   /usr/include/SDL12
698   /usr/include/SDL11
699-  /usr/local/include
700+  /opt/local/include
701   /usr/include
702   /sw/include/SDL # Fink
703   /sw/include
704@@ -86,7 +86,7 @@
705   $ENV{SDLDIR}
706   PATH_SUFFIXES lib64 lib
707   PATHS
708-  /usr/local
709+  /opt/local
710   /usr
711   /sw
712   /opt/local
713@@ -108,7 +108,7 @@
714       $ENV{SDLDIR}
715       PATH_SUFFIXES lib64 lib
716       PATHS
717-      /usr/local
718+      /opt/local
719       /usr
720       /sw
721       /opt/local
722--- /opt/local/share/cmake-2.6/Modules/FindSDL_image.cmake      2009-04-28 13:22:59.000000000 -0700
723+++ cmakeMods/FindSDL_image.cmake       2009-06-01 21:37:23.000000000 -0700
724@@ -20,13 +20,13 @@
725   PATHS
726   ~/Library/Frameworks
727   /Library/Frameworks
728-  /usr/local/include/SDL
729+  /opt/local/include/SDL
730   /usr/include/SDL
731-  /usr/local/include/SDL12
732-  /usr/local/include/SDL11 # FreeBSD ports
733+  /opt/local/include/SDL12
734+  /opt/local/include/SDL11 # FreeBSD ports
735   /usr/include/SDL12
736   /usr/include/SDL11
737-  /usr/local/include
738+  /opt/local/include
739   /usr/include
740   /sw/include/SDL # Fink
741   /sw/include
742@@ -47,7 +47,7 @@
743   PATHS
744   ~/Library/Frameworks
745   /Library/Frameworks
746-  /usr/local
747+  /opt/local
748   /usr
749   /sw
750   /opt/local
751--- /opt/local/share/cmake-2.6/Modules/FindSDL_mixer.cmake      2009-04-28 13:22:59.000000000 -0700
752+++ cmakeMods/FindSDL_mixer.cmake       2009-06-01 21:37:23.000000000 -0700
753@@ -20,13 +20,13 @@
754   PATHS
755   ~/Library/Frameworks
756   /Library/Frameworks
757-  /usr/local/include/SDL
758+  /opt/local/include/SDL
759   /usr/include/SDL
760-  /usr/local/include/SDL12
761-  /usr/local/include/SDL11 # FreeBSD ports
762+  /opt/local/include/SDL12
763+  /opt/local/include/SDL11 # FreeBSD ports
764   /usr/include/SDL12
765   /usr/include/SDL11
766-  /usr/local/include
767+  /opt/local/include
768   /usr/include
769   /sw/include/SDL # Fink
770   /sw/include
771@@ -47,7 +47,7 @@
772   PATHS
773   ~/Library/Frameworks
774   /Library/Frameworks
775-  /usr/local
776+  /opt/local
777   /usr
778   /sw
779   /opt/local
780--- /opt/local/share/cmake-2.6/Modules/FindSDL_net.cmake        2009-04-28 13:22:59.000000000 -0700
781+++ cmakeMods/FindSDL_net.cmake 2009-06-01 21:37:23.000000000 -0700
782@@ -21,13 +21,13 @@
783   PATHS
784   ~/Library/Frameworks
785   /Library/Frameworks
786-  /usr/local/include/SDL
787+  /opt/local/include/SDL
788   /usr/include/SDL
789-  /usr/local/include/SDL12
790-  /usr/local/include/SDL11 # FreeBSD ports
791+  /opt/local/include/SDL12
792+  /opt/local/include/SDL11 # FreeBSD ports
793   /usr/include/SDL12
794   /usr/include/SDL11
795-  /usr/local/include
796+  /opt/local/include
797   /usr/include
798   /sw/include/SDL # Fink
799   /sw/include
800@@ -47,7 +47,7 @@
801   PATHS
802   ~/Library/Frameworks
803   /Library/Frameworks
804-  /usr/local
805+  /opt/local
806   /usr
807   /sw
808   /opt/local
809--- /opt/local/share/cmake-2.6/Modules/FindSDL_sound.cmake      2009-04-28 13:22:59.000000000 -0700
810+++ cmakeMods/FindSDL_sound.cmake       2009-06-01 21:37:23.000000000 -0700
811@@ -68,13 +68,13 @@
812   $ENV{SDLDIR}/include
813   $ENV{SDLDIR}
814   PATHS
815-  /usr/local/include/SDL
816+  /opt/local/include/SDL
817   /usr/include/SDL
818-  /usr/local/include/SDL12
819-  /usr/local/include/SDL11 # FreeBSD ports
820+  /opt/local/include/SDL12
821+  /opt/local/include/SDL11 # FreeBSD ports
822   /usr/include/SDL12
823   /usr/include/SDL11
824-  /usr/local/include
825+  /opt/local/include
826   /usr/include
827   /sw/include/SDL # Fink
828   /sw/include
829@@ -94,7 +94,7 @@
830   $ENV{SDLDIR}/lib
831   $ENV{SDLDIR}
832   PATHS
833-  /usr/local/lib
834+  /opt/local/lib
835   /usr/lib
836   /sw/lib
837   /opt/local/lib
838@@ -211,7 +211,7 @@
839          $ENV{SDLSOUNDDIR}
840          $ENV{SDLDIR}/lib
841          $ENV{SDLDIR}
842-         /usr/local/lib
843+         /opt/local/lib
844          /usr/lib
845          /sw/lib
846          /opt/local/lib
847@@ -234,7 +234,7 @@
848          $ENV{SDLSOUNDDIR}
849          $ENV{SDLDIR}/lib
850          $ENV{SDLDIR}
851-         /usr/local/lib
852+         /opt/local/lib
853          /usr/lib
854          /sw/lib
855          /opt/local/lib
856@@ -260,7 +260,7 @@
857          $ENV{SDLSOUNDDIR}
858          $ENV{SDLDIR}/lib
859          $ENV{SDLDIR}
860-         /usr/local/lib
861+         /opt/local/lib
862          /usr/lib
863          /sw/lib
864          /opt/local/lib
865@@ -282,7 +282,7 @@
866          $ENV{SDLSOUNDDIR}
867          $ENV{SDLDIR}/lib
868          $ENV{SDLDIR}
869-         /usr/local/lib
870+         /opt/local/lib
871          /usr/lib
872          /sw/lib
873          /opt/local/lib
874@@ -306,7 +306,7 @@
875          $ENV{SDLSOUNDDIR}
876          $ENV{SDLDIR}/lib
877          $ENV{SDLDIR}
878-         /usr/local/lib
879+         /opt/local/lib
880          /usr/lib
881          /sw/lib
882          /opt/local/lib
883@@ -330,7 +330,7 @@
884          $ENV{SDLSOUNDDIR}
885          $ENV{SDLDIR}/lib
886          $ENV{SDLDIR}
887-         /usr/local/lib
888+         /opt/local/lib
889          /usr/lib
890          /sw/lib
891          /opt/local/lib
892@@ -357,7 +357,7 @@
893          $ENV{SDLSOUNDDIR}
894          $ENV{SDLDIR}/lib
895          $ENV{SDLDIR}
896-         /usr/local/lib
897+         /opt/local/lib
898          /usr/lib
899          /sw/lib
900          /opt/local/lib
901@@ -384,7 +384,7 @@
902            $ENV{SDLSOUNDDIR}
903            $ENV{SDLDIR}/lib
904            $ENV{SDLDIR}
905-           /usr/local/lib
906+           /opt/local/lib
907            /usr/lib
908            /sw/lib
909            /opt/local/lib
910--- /opt/local/share/cmake-2.6/Modules/FindSDL_ttf.cmake        2009-04-28 13:22:59.000000000 -0700
911+++ cmakeMods/FindSDL_ttf.cmake 2009-06-01 21:37:23.000000000 -0700
912@@ -20,13 +20,13 @@
913   PATHS
914   ~/Library/Frameworks
915   /Library/Frameworks
916-  /usr/local/include/SDL
917+  /opt/local/include/SDL
918   /usr/include/SDL
919-  /usr/local/include/SDL12
920-  /usr/local/include/SDL11 # FreeBSD ports
921+  /opt/local/include/SDL12
922+  /opt/local/include/SDL11 # FreeBSD ports
923   /usr/include/SDL12
924   /usr/include/SDL11
925-  /usr/local/include
926+  /opt/local/include
927   /usr/include
928   /sw/include/SDL # Fink
929   /sw/include
930@@ -46,7 +46,7 @@
931   PATHS
932   ~/Library/Frameworks
933   /Library/Frameworks
934-  /usr/local
935+  /opt/local
936   /usr
937   /sw
938   /opt/local
939--- /opt/local/share/cmake-2.6/Modules/FindSelfPackers.cmake    2009-04-28 13:22:59.000000000 -0700
940+++ cmakeMods/FindSelfPackers.cmake     2009-06-01 21:37:23.000000000 -0700
941@@ -12,7 +12,7 @@
942   ${CYGWIN_INSTALL_PATH}/bin
943   /bin
944   /usr/bin
945-  /usr/local/bin
946+  /opt/local/bin
947   /sbin
948 )
949 
950@@ -21,7 +21,7 @@
951   ${CYGWIN_INSTALL_PATH}/bin
952   /bin
953   /usr/bin
954-  /usr/local/bin
955+  /opt/local/bin
956   /sbin
957 )
958 
959--- /opt/local/share/cmake-2.6/Modules/FindSquish.cmake 2009-04-28 13:22:59.000000000 -0700
960+++ cmakeMods/FindSquish.cmake  2009-06-01 21:37:23.000000000 -0700
961@@ -55,7 +55,7 @@
962     ${SQUISH_INSTALL_DIR_SEARCH}
963 
964     # Look in standard UNIX install locations.
965-    #/usr/local/squish
966+    #/opt/local/squish
967 
968     DOC "The ${SQUISH_INSTALL_DIR_STRING}"
969     )
970--- /opt/local/share/cmake-2.6/Modules/FindTCL.cmake    2009-04-28 13:22:59.000000000 -0700
971+++ cmakeMods/FindTCL.cmake     2009-06-01 21:37:23.000000000 -0700
972@@ -66,7 +66,7 @@
973   "${TCL_TCLSH_PATH_PARENT}/lib"
974   "${TK_WISH_PATH_PARENT}/lib"
975   /usr/lib
976-  /usr/local/lib
977+  /opt/local/lib
978   )
979 
980 IF(WIN32)
981@@ -146,7 +146,7 @@
982   "${TCL_TCLSH_PATH_PARENT}/include"
983   "${TK_WISH_PATH_PARENT}/include"
984   /usr/include
985-  /usr/local/include
986+  /opt/local/include
987   /usr/include/tcl${TK_LIBRARY_VERSION}
988   /usr/include/tcl${TCL_LIBRARY_VERSION}
989   /usr/include/tcl8.6
990--- /opt/local/share/cmake-2.6/Modules/FindTclStub.cmake        2009-04-28 13:22:59.000000000 -0700
991+++ cmakeMods/FindTclStub.cmake 2009-06-01 21:37:23.000000000 -0700
992@@ -54,7 +54,7 @@
993   "${TCL_TCLSH_PATH_PARENT}/lib"
994   "${TK_WISH_PATH_PARENT}/lib"
995   /usr/lib
996-  /usr/local/lib
997+  /opt/local/lib
998 )
999 
1000 IF(WIN32)
1001--- /opt/local/share/cmake-2.6/Modules/FindUnixCommands.cmake   2009-04-28 13:22:59.000000000 -0700
1002+++ cmakeMods/FindUnixCommands.cmake    2009-06-01 21:37:23.000000000 -0700
1003@@ -9,7 +9,7 @@
1004   ${CYGWIN_INSTALL_PATH}/bin
1005   /bin
1006   /usr/bin
1007-  /usr/local/bin
1008+  /opt/local/bin
1009   /sbin
1010 )
1011 MARK_AS_ADVANCED(
1012@@ -21,7 +21,7 @@
1013   ${CYGWIN_INSTALL_PATH}/bin
1014   /bin
1015   /usr/bin
1016-  /usr/local/bin
1017+  /opt/local/bin
1018   /sbin
1019 )
1020 MARK_AS_ADVANCED(
1021@@ -33,7 +33,7 @@
1022   ${CYGWIN_INSTALL_PATH}/bin
1023   /bin
1024   /usr/bin
1025-  /usr/local/bin
1026+  /opt/local/bin
1027   /sbin
1028 )
1029 MARK_AS_ADVANCED(
1030@@ -45,7 +45,7 @@
1031   ${CYGWIN_INSTALL_PATH}/bin
1032   /bin
1033   /usr/bin
1034-  /usr/local/bin
1035+  /opt/local/bin
1036   /sbin
1037 )
1038 MARK_AS_ADVANCED(
1039@@ -57,7 +57,7 @@
1040   ${CYGWIN_INSTALL_PATH}/bin
1041   /bin
1042   /usr/bin
1043-  /usr/local/bin
1044+  /opt/local/bin
1045   /sbin
1046 )
1047 MARK_AS_ADVANCED(
1048@@ -72,7 +72,7 @@
1049   ${CYGWIN_INSTALL_PATH}/bin
1050   /bin
1051   /usr/bin
1052-  /usr/local/bin
1053+  /opt/local/bin
1054   /sbin
1055 )
1056 MARK_AS_ADVANCED(
1057--- /opt/local/share/cmake-2.6/Modules/FindVTK.cmake    2009-05-28 11:19:41.000000000 -0700
1058+++ cmakeMods/FindVTK.cmake     2009-06-01 21:37:23.000000000 -0700
1059@@ -78,7 +78,7 @@
1060 
1061     # Look in standard UNIX install locations.
1062     /opt/local/lib/vtk
1063-    /usr/local/lib/vtk
1064+    /opt/local/lib/vtk
1065     /usr/lib/vtk
1066 
1067     # Read from the CMakeSetup registry entries.  It is likely that
1068--- /opt/local/share/cmake-2.6/Modules/GetPrerequisites.cmake   2009-04-28 13:22:59.000000000 -0700
1069+++ cmakeMods/GetPrerequisites.cmake    2009-06-01 21:37:23.000000000 -0700
1070@@ -448,7 +448,7 @@
1071     "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN"
1072     "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN"
1073     "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN"
1074-    "/usr/local/bin"
1075+    "/opt/local/bin"
1076     "/usr/bin"
1077     )
1078