Revision bump. Introduce some fixes. Remove old.

(Portage version: 2.2_rc26/cvs/Linux i686)

8 files changed, 141 insertions, 346 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index e7cb008458b8..8e20d1973a3a 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.88 2009/03/15 16:56:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.89 2009/04/04 12:39:26 scarabeus Exp $
+
+*cmake-2.6.3-r1 (04 Apr 2009)
+
+  04 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/cmake-2.0.6-rpath-fix.patch, -files/cmake-2.4.7-findkde4.patch,
+  -files/FindSWIG.cmake, +files/cmake-FindJNI.patch, -cmake-2.4.7-r1.ebuild,
+  -cmake-2.4.8.ebuild, -cmake-2.6.3.ebuild, +cmake-2.6.3-r1.ebuild:
+  Revision bump. Introduce some fixes. Remove old.
 
   15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> -cmake-2.4.6-r1.ebuild,
   -cmake-2.6.2.ebuild:
diff --git a/dev-util/cmake/cmake-2.4.7-r1.ebuild b/dev-util/cmake/cmake-2.4.7-r1.ebuild
deleted file mode 100644
index 5a554fec45e1..000000000000
--- a/dev-util/cmake/cmake-2.4.7-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r1.ebuild,v 1.4 2008/02/22 18:00:15 ingmar Exp $
-
-inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="emacs vim-syntax"
-
-DEPEND="emacs? ( virtual/emacs )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream patch to make sure KDE4 is found. cf. bug 191412.
-	epatch "${FILESDIR}/${P}-findkde4.patch"
-}
-
-src_compile() {
-	if [ "$(gcc-major-version)" -eq "3" ] ; then
-		append-flags "-fno-stack-protector"
-	fi
-
-	tc-export CC CXX LD
-	./bootstrap \
-		--prefix=/usr \
-		--docdir=/share/doc/${PN} \
-		--datadir=/share/${PN} \
-		--mandir=/share/man || die "./bootstrap failed"
-	emake || die
-	if use emacs; then
-		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
-	fi
-}
-
-src_test() {
-	einfo "Self tests broken"
-	make test || \
-		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	mv "${D}"usr/share/doc/cmake "${D}"usr/share/doc/${PF}
-	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/Docs/cmake-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins "${S}"/Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.4.8.ebuild b/dev-util/cmake/cmake-2.4.8.ebuild
deleted file mode 100644
index 0b601af04edf..000000000000
--- a/dev-util/cmake/cmake-2.4.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.8.ebuild,v 1.3 2009/01/21 22:16:15 maekke Exp $
-
-inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
-
-MY_PV="${PV/rc/RC-}"
-MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="emacs vim-syntax"
-
-DEPEND=">=net-misc/curl-7.16.4
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/libxml2-2.6.28
-	>=dev-libs/xmlrpc-c-1.06.09
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! built_with_use -o dev-libs/xmlrpc-c curl libwww; then
-		echo
-		eerror "${PN} requires dev-libs/xmlrpc-c to be built with either the 'libwww' or"
-		eerror "the 'curl' USE flag or both enabled."
-		eerror "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
-		echo
-		die "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream's version is broken. Reported in upstream bugs 3498, 3637, 4145.
-	# Fixed version kindly provided on 4145 by Axel Roebel.
-	cp "${FILESDIR}/FindSWIG.cmake" "${S}/Modules/"
-}
-
-src_compile() {
-	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
-		append-flags "-fno-stack-protector"
-	fi
-
-	tc-export CC CXX LD
-
-	./bootstrap \
-		--system-libs \
-		--prefix=/usr \
-		--docdir=/share/doc/${PN} \
-		--datadir=/share/${PN} \
-		--mandir=/share/man || die "./bootstrap failed"
-	emake || die "emake failed."
-	if use emacs; then
-		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
-	fi
-}
-
-src_test() {
-	emake test || \
-		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	mv "${D}usr/share/doc/cmake" "${D}usr/share/doc/${PF}"
-	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/Docs/cmake-syntax.vim
-
-		insinto /usr/share/vim/vimfiles/indent
-		doins "${S}"/Docs/cmake-indent.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}/${VIMFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.6.3.ebuild b/dev-util/cmake/cmake-2.6.3-r1.ebuild
index 74e888ccb322..87f55331b0f5 100644
--- a/dev-util/cmake/cmake-2.6.3.ebuild
+++ b/dev-util/cmake/cmake-2.6.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.3.ebuild,v 1.1 2009/03/01 13:13:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.3-r1.ebuild,v 1.1 2009/04/04 12:39:26 scarabeus Exp $
 
 EAPI="2"
 
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils
 
 MY_PV="${PV/rc/RC-}"
 MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
@@ -14,21 +14,24 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+SLOT="0"
 IUSE="emacs qt4 vim-syntax"
 
-DEPEND=">=net-misc/curl-7.16.4
+DEPEND="
+	>=net-misc/curl-7.16.4
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/libxml2-2.6.28
 	>=dev-libs/xmlrpc-c-1.06.09[curl]
 	emacs? ( virtual/emacs )
-	qt4? ( || ( ( x11-libs/qt-core:4
-			x11-libs/qt-gui:4 )
-		>=x11-libs/qt-4.3:4 ) )
-	vim-syntax? ( || (
-		app-editors/vim
-		app-editors/gvim ) )"
+	qt4? ( x11-libs/qt-gui:4 )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
 RDEPEND="${DEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
@@ -36,60 +39,73 @@ VIMFILE="${PN}.vim"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-FindPythonLibs.patch"
-	epatch "${FILESDIR}/${PN}-FindPythonInterp.patch"
-}
+CMAKE_IN_SOURCE_BUILD=1
 
-src_configure() {
-	# due to bootstrap, everything is done in src_compile
-	true
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-FindJNI.patch"
+	"${FILESDIR}/${PN}-FindPythonLibs.patch"
+	"${FILESDIR}/${PN}-FindPythonInterp.patch"
+)
 
-src_compile() {
+src_configure() {
 	local qt_arg par_arg
+
 	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
 		append-flags "-fno-stack-protector"
 	fi
 
-	tc-export CC CXX LD
-
-	if use qt4; then
-		qt_arg="--qt-gui"
-	else
-		qt_arg="--no-qt-gui"
-	fi
-
-	echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-	if [ $? -eq 0 ]; then
-		par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
+	if ! has_version ">=dev-util/cmake-2.4.1" ; then
+		tc-export CC CXX LD
+
+		if use qt4; then
+			qt_arg="--qt-gui"
+		else
+			qt_arg="--no-qt-gui"
+		fi
+
+		echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+		if [ $? -eq 0 ]; then
+			par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+			par_arg="--parallel=${par_arg}"
+		else
+			par_arg="--parallel=1"
+		fi
+
+		./bootstrap \
+			--system-libs \
+			--prefix=/usr \
+			--docdir=/share/doc/${PF} \
+			--datadir=/share/${PN} \
+			--mandir=/share/man \
+			"$qt_arg" \
+			"$par_arg" || die "./bootstrap failed"
 	else
-		par_arg="--parallel=1"
+		# this is way much faster so we should preffer it if some cmake is
+		# around.
+		use qt4 && qt_arg="ON" || qt_arg="OFF"
+		mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+			-DCMAKE_DOC_DIR=/share/doc/${PF}
+			-DCMAKE_MAN_DIR=/share/man
+			-DCMAKE_DATA_DIR=/share/${PN}
+			-DBUILD_CursesDialog=ON
+			-DBUILD_QtDialog=${qt_arg}"
+		cmake-utils_src_configure
 	fi
+}
 
-	./bootstrap \
-		--system-libs \
-		--prefix=/usr \
-		--docdir=/share/doc/${PF} \
-		--datadir=/share/${PN} \
-		--mandir=/share/man \
-		"$qt_arg" \
-		"$par_arg" || die "./bootstrap failed"
-
-	emake || die "emake failed."
+src_compile() {
+	cmake-utils_src_compile
 	if use emacs; then
 		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
 	fi
 }
 
 src_test() {
-	emake test || \
-		einfo "note test failure on qtwrapping was expected - nature of portage rather than a true failure"
+	emake test
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
+	cmake-utils_src_install
 	if use emacs; then
 		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
diff --git a/dev-util/cmake/files/FindSWIG.cmake b/dev-util/cmake/files/FindSWIG.cmake
deleted file mode 100644
index a3b650eb7d0c..000000000000
--- a/dev-util/cmake/files/FindSWIG.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# - Find SWIG
-# This module finds an installed SWIG.  It sets the following variables:
-#  SWIG_FOUND - set to true if SWIG is found
-#  SWIG_DIR - the directory where swig is installed
-#  SWIG_EXECUTABLE - the path to the swig executable
-#  SWIG_VERSION   - the version number of the swig executable
-#
-# All informations are collected from the SWIG_EXECUTABLE so the
-# version to be found can be changed from the command line by
-# means of setting SWIG_EXECUTABLE
-#
-
-SET(SWIG_FOUND FALSE)
-
-FIND_PROGRAM(SWIG_EXECUTABLE swig)
-
-IF(SWIG_EXECUTABLE)
-  EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -swiglib
-    OUTPUT_VARIABLE SWIG_swiglib_output
-    ERROR_VARIABLE SWIG_swiglib_error
-    RESULT_VARIABLE SWIG_swiglib_result)
-
-  IF(SWIG_swiglib_result)
-    MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -swiglib\" failed with output:\n${SWIG_swiglib_error}")
-  ELSE(SWIG_swiglib_result)
-    STRING(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
-    # force the path to be computed each time in case SWIG_EXECUTABLE has changed.
-    SET(SWIG_DIR SWIG_DIR-NOTFOUND)
-    FIND_PATH(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
-    IF(SWIG_DIR)
-      SET(SWIG_FOUND 1)
-      SET(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
-      EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -version
-	OUTPUT_VARIABLE SWIG_version_output
-	ERROR_VARIABLE SWIG_version_output
-	RESULT_VARIABLE SWIG_version_result)
-      IF(SWIG_version_result)
-        MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -version\" failed with output:\n${SWIG_version_output}")
-      ELSE(SWIG_version_result)
-        STRING(REGEX REPLACE ".*SWIG Version[^0-9.]*\([0-9.]+\).*" "\\1"
-	  SWIG_version_output "${SWIG_version_output}")
-        SET(SWIG_VERSION ${SWIG_version_output} CACHE STRING "Swig version" FORCE)
-      ENDIF(SWIG_version_result)
-    ENDIF(SWIG_DIR)
-  ENDIF(SWIG_swiglib_result)
-ENDIF(SWIG_EXECUTABLE)
-
-IF(NOT SWIG_FOUND)
-  IF(NOT SWIG_FIND_QUIETLY)
-    IF(SWIG_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "SWIG was not found. Please specify Swig executable location")
-    ELSE(SWIG_FIND_REQUIRED)
-      MESSAGE(STATUS "SWIG was not found. Please specify Swig executable location")
-    ENDIF(SWIG_FIND_REQUIRED)
-  ENDIF(NOT SWIG_FIND_QUIETLY)
-ENDIF(NOT SWIG_FOUND)
diff --git a/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch b/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch
deleted file mode 100644
index 9cd3347015c8..000000000000
--- a/dev-util/cmake/files/cmake-2.0.6-rpath-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./cmake-2.0.6/Modules/CMakeSystemSpecificInformation.cmake.orig	2005-09-26 08:05:28.000000000 +1000
-+++ ./cmake-2.0.6/Modules/CMakeSystemSpecificInformation.cmake	2005-09-26 08:05:37.000000000 +1000
-@@ -34,7 +34,7 @@
- ENDIF(CMAKE_COMPILER_IS_GNUCXX)
- 
- 
--SET (CMAKE_SKIP_RPATH "NO" CACHE BOOL
-+SET (CMAKE_SKIP_RPATH "YES" CACHE BOOL
-      "If set, runtime paths are not added when using shared libraries.")
- MARK_AS_ADVANCED(CMAKE_SKIP_RPATH)
- # 2. now include SystemName.cmake file to set the system specific information
diff --git a/dev-util/cmake/files/cmake-2.4.7-findkde4.patch b/dev-util/cmake/files/cmake-2.4.7-findkde4.patch
deleted file mode 100644
index 2d52d89b430f..000000000000
--- a/dev-util/cmake/files/cmake-2.4.7-findkde4.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- Modules/FindKDE4.cmake.orig	2007-09-05 19:34:40.000000000 +0200
-+++ Modules/FindKDE4.cmake	2007-09-05 19:34:46.000000000 +0200
-@@ -1,9 +1,8 @@
- # Find KDE4 and provide all necessary variables and macros to compile software for it.
- # It looks for KDE 4 in the following directories in the given order:
--# - CMAKE_INSTALL_PREFIX
--# - KDEDIRS
--# - /opt/kde4
--# - /opt/kde
-+#  CMAKE_INSTALL_PREFIX
-+#  KDEDIRS
-+#  /opt/kde4
- #
- # Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
- # They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
-@@ -14,6 +13,7 @@
- 
- # For KDE4 kde-config has been renamed to kde4-config
- FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
-+   PATH_SUFFIXES bin               # the suffix is for the paths coming from KDEDIRS
-    PATHS
-    ${CMAKE_INSTALL_PREFIX}/bin
-    ${_KDEDIRS}
-@@ -21,14 +21,11 @@
-    NO_DEFAULT_PATH
-    )
- 
--
--IF (NOT KDE4_KDECONFIG_EXECUTABLE)
--   FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
--ENDIF (NOT KDE4_KDECONFIG_EXECUTABLE)
-+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
- 
- IF (KDE4_KDECONFIG_EXECUTABLE)
-    # then ask kde4-config for the kde data dirs
--   EXEC_PROGRAM(${KDE4_KDECONFIG_EXECUTABLE} ARGS --path data OUTPUT_VARIABLE _data_DIR )
-+   EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
-    FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
- 
-@@ -52,7 +49,7 @@
-       FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
-    ELSE (KDE4_DATA_DIR)
-       IF (KDE4_FIND_REQUIRED)
--      MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
-+         MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
-       ENDIF (KDE4_FIND_REQUIRED)
-    ENDIF (KDE4_DATA_DIR)
- 
diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch
new file mode 100644
index 000000000000..af723c52919f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-FindJNI.patch
@@ -0,0 +1,71 @@
+diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake
+--- ./Modules/FindJNI.cmake	2009-02-21 21:36:50.000000000 +0100
++++ ../a/Modules/FindJNI.cmake	2008-11-24 04:44:06.000000000 +0100
+@@ -2,7 +2,7 @@
+ # This module finds if Java is installed and determines where the
+ # include files and libraries are. It also determines what the name of
+ # the library is. This code sets the following variables:
+-#   
++#
+ #  JNI_INCLUDE_DIRS      = the include dirs to use
+ #  JNI_LIBRARIES         = the libraries to use
+ #  JAVA_AWT_LIBRARY      = the path to the jawt library
+@@ -51,6 +51,8 @@
+     "${dir}"
+     "${dir}/client"
+     "${dir}/server"
++    "${dir}/j9vm"
++    "${dir}/classic"
+     )
+ ENDFOREACH(dir)
+ 
+@@ -60,7 +62,7 @@
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+   $ENV{JAVA_HOME}/include
+-  /usr/include 
++  /usr/include
+   /usr/local/include
+   /usr/lib/java/include
+   /usr/local/lib/java/include
+@@ -126,7 +128,7 @@
+       )
+   ENDIF(JAVA_HAVE_FRAMEWORK)
+ ELSE(APPLE)
+-  FIND_LIBRARY(JAVA_AWT_LIBRARY jawt 
++  FIND_LIBRARY(JAVA_AWT_LIBRARY jawt
+     PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
+   )
+   FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM
+@@ -134,18 +136,23 @@
+   )
+ ENDIF(APPLE)
+ 
+-# add in the include path    
+-FIND_PATH(JAVA_INCLUDE_PATH jni.h 
++# add in the include path
++FIND_PATH(JAVA_INCLUDE_PATH jni.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+ )
+ 
+-FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h 
++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+   ${JAVA_INCLUDE_PATH}/win32
+   ${JAVA_INCLUDE_PATH}/linux
+   ${JAVA_INCLUDE_PATH}/freebsd
+ )
+ 
++FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h
++  ${JAVA_AWT_INCLUDE_DIRECTORIES}
++  ${JAVA_INCLUDE_PATH}
++)
++
+ FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h
+   ${JAVA_AWT_INCLUDE_DIRECTORIES}
+   ${JAVA_INCLUDE_PATH}
+@@ -169,4 +176,3 @@
+   ${JAVA_INCLUDE_PATH2}
+   ${JAVA_AWT_INCLUDE_PATH}
+ )
+-