Index: patch-Modules_CMakeDetermineJavaCompiler_cmake
===================================================================
RCS file:
/cvs/ports/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake,v
retrieving revision 1.1
diff -u patch-Modules_CMakeDetermineJavaCompiler_cmake
--- patch-Modules_CMakeDetermineJavaCompiler_cmake 28 May 2010 20:21:48
-0000 1.1
+++ patch-Modules_CMakeDetermineJavaCompiler_cmake 30 Apr 2011 01:47:34
-0000
@@ -41,7 +41,7 @@
+ SET(Java_BIN_PATH /usr/local/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ SET(Java_BIN_PATH /usr/local/jdk-1.6.0/bin)
-+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
++ ELSE(MODJAVA_VER MATCHES "^1\\.7.*")
+ SET(Java_BIN_PATH /usr/local/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSE(MODJAVA_VER)
Index: patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.2
diff -u patch-Modules_FindJNI_cmake
--- patch-Modules_FindJNI_cmake 15 Nov 2010 11:39:09 -0000 1.2
+++ patch-Modules_FindJNI_cmake 30 Apr 2011 01:47:34 -0000
@@ -50,7 +50,7 @@
+ /usr/local/jdk-1.6.0/jre/lib/{libarch}
+ /usr/local/jre-1.6.0/lib/{libarch}
+ )
-+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
++ ELSE(MODJAVA_VER MATCHES "^1\\.7.*")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${JAVA_AWT_LIBRARY_DIRECTORIES}
+ /usr/local/jdk-1.7.0/jre/lib/{libarch}
@@ -100,7 +100,7 @@
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ /usr/local/jdk-1.6.0/include
+ )
-+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
++ ELSE(MODJAVA_VER MATCHES "^1\\.7.*")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ /usr/local/jdk-1.7.0/include
Index: patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.3
diff -u patch-Modules_FindJava_cmake
--- patch-Modules_FindJava_cmake 15 Nov 2010 11:39:09 -0000 1.3
+++ patch-Modules_FindJava_cmake 30 Apr 2011 01:47:34 -0000
@@ -32,7 +32,7 @@
+ SET(_JAVA_PATHS /usr/local/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ SET(_JAVA_PATHS /usr/local/jdk-1.6.0/bin)
-+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
++ ELSE(MODJAVA_VER MATCHES "^1\\.7.*")
+ SET(_JAVA_PATHS /usr/local/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ELSE(MODJAVA_VER)
