Add a patch to disable looking for JAVA_HOME.

(Portage version: 2.1.2.3)

5 files changed, 264 insertions, 5 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 361927124c1e..4da7ea019bb9 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.15 2007/04/14 19:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.16 2007/04/14 21:05:31 nelchael Exp $
+
+  14 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mod_caucho-3.0.22-java.patch, +files/mod_caucho-3.1.0-java.patch,
+  mod_caucho-3.0.22.ebuild, mod_caucho-3.1.0.ebuild:
+  Add a patch to disable looking for JAVA_HOME.
 
   14 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   mod_caucho-3.0.22.ebuild, mod_caucho-3.1.0.ebuild:
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch
new file mode 100644
index 000000000000..953da239d9e5
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch
@@ -0,0 +1,126 @@
+--- resin-3.0.22.vanilla/configure.in	2007-04-14 22:51:15.000000000 +0200
++++ resin-3.0.22/configure.in	2007-04-14 22:54:46.000000000 +0200
+@@ -427,54 +427,6 @@
+   fi
+ fi
+ #
+-# --with-java-home
+-#
+-AC_ARG_WITH(java-home,
+-[  --with-java-home=DIR  java home
+-], [
+-JAVA_HOME=${withval}
+-])
+-
+-if test -z "$JAVA_HOME"; then
+-  java=`which java 2>/dev/null`
+-  if test $? = "0"; then
+-    while test -h "$java"
+-    do
+-      head=`dirname $java`
+-      tail=`/bin/ls -l $java | awk '{ print $NF; }'`
+-      if test -f "$tail"; then
+-        java=$tail
+-      else
+-        java=$head/$tail
+-      fi
+-    done
+-
+-    javabin=`dirname $java`
+-    JAVA_HOME=`cd $javabin/..; pwd`
+-
+-    # we're in $JAVA_HOME/jre
+-    if test -f "$JAVA_HOME/lib/rt.jar"; then
+-      JAVA_HOME=`cd $JAVA_HOME/..; pwd`
+-    elif test -d "/usr/java"; then
+-      JAVA_HOME=/usr/java
+-    elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+-      JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+-    fi
+-  elif test -d "/usr/java"; then
+-    JAVA_HOME=/usr/java
+-  elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+-    JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+-  fi
+-fi
+-
+-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
+-
+-if test ! -d "$JAVA_HOME"; then
+-  AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
+-fi
+-
+-AC_SUBST(JAVA_HOME)
+-#
+ # Resin home
+ #
+ resin_home=`pwd`
+@@ -870,68 +822,6 @@
+ AC_SUBST(SSL_LIBS)
+ 
+ #
+-# --with-jni-include
+-#
+-AC_ARG_WITH(jni-include,
+-[  --with-jni-include="-Idir -Idir"  jni include string
+-], [
+-JNI_INCLUDE=${withval}
+-JNI="yes"
+-])
+-
+-#
+-# --enable-jni
+-#
+-AC_ARG_ENABLE(jni,
+-[  --enable-jni    Turn on jni],
+-[case "${enableval}" in
+- yes) JNI=true ;;
+- no)  JNI="" ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
+- esac],[JNI=""])
+-
+-if test -n "$JNI_INCLUDE"; then
+-  JNI=yes
+-elif test -r "$JAVA_HOME/include/jni_md.h"; then
+-  JNI_INCLUDE="-I$JAVA_HOME/include"
+-  JNI=yes
+-  echo "checking for JNI in $JAVA_HOME/include ... found"
+-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
+-  JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
+-  JNI=yes
+-  echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
+-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
+-  # Darwin
+-  echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
+-  JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+-  JNI=yes
+-else
+-  JNI=""
+-  AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
+-fi
+-
+-if test -r "$JAVA_HOME/include/jvmti.h"; then
+-  echo "Using JVMTI for class reloading"
+-  
+-  CFLAGS="$CFLAGS -DHAS_JVMTI"
+-fi
+-
+-if test -r "$JAVA_HOME/include/jvmdi.h"; then
+-  echo "Using JVMDI for class reloading"
+-  
+-  CFLAGS="$CFLAGS -DHAS_JVMDI"
+-fi
+-	
+-if test -n "$JNI"; then
+-  plugins="$plugins $resin_plugin resin_os"
+-else  
+-  echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
+-fi
+-
+-AC_SUBST(JNI)
+-AC_SUBST(JNI_INCLUDE)
+-	
+-#
+ # --enable-ssl
+ #
+ AC_ARG_ENABLE(ssl,
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch
new file mode 100644
index 000000000000..a2e185157008
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch
@@ -0,0 +1,126 @@
+--- resin-3.1.0.vanilla/configure.in	2007-04-14 22:59:47.000000000 +0200
++++ resin-3.1.0/configure.in	2007-04-14 23:00:30.000000000 +0200
+@@ -434,54 +434,6 @@
+   fi
+ fi
+ #
+-# --with-java-home
+-#
+-AC_ARG_WITH(java-home,
+-[  --with-java-home=DIR  java home
+-], [
+-JAVA_HOME=${withval}
+-])
+-
+-if test -z "$JAVA_HOME"; then
+-  java=`which java 2>/dev/null`
+-  if test $? = "0"; then
+-    while test -h "$java"
+-    do
+-      head=`dirname $java`
+-      tail=`/bin/ls -l $java | awk '{ print $NF; }'`
+-      if test -f "$tail"; then
+-        java=$tail
+-      else
+-        java=$head/$tail
+-      fi
+-    done
+-
+-    javabin=`dirname $java`
+-    JAVA_HOME=`cd $javabin/..; pwd`
+-
+-    # we're in $JAVA_HOME/jre
+-    if test -f "$JAVA_HOME/lib/rt.jar"; then
+-      JAVA_HOME=`cd $JAVA_HOME/..; pwd`
+-    elif test -d "/usr/java"; then
+-      JAVA_HOME=/usr/java
+-    elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+-      JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+-    fi
+-  elif test -d "/usr/java"; then
+-    JAVA_HOME=/usr/java
+-  elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+-    JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+-  fi
+-fi
+-
+-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
+-
+-if test ! -d "$JAVA_HOME"; then
+-  AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
+-fi
+-
+-AC_SUBST(JAVA_HOME)
+-#
+ # Resin home
+ #
+ resin_home=`pwd`
+@@ -792,68 +744,6 @@
+ AC_SUBST(SSL_LIBS)
+ 
+ #
+-# --with-jni-include
+-#
+-AC_ARG_WITH(jni-include,
+-[  --with-jni-include="-Idir -Idir"  jni include string
+-], [
+-JNI_INCLUDE=${withval}
+-JNI="yes"
+-])
+-
+-#
+-# --enable-jni
+-#
+-AC_ARG_ENABLE(jni,
+-[  --enable-jni    Turn on jni],
+-[case "${enableval}" in
+- yes) JNI=true ;;
+- no)  JNI="" ;;
+- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
+- esac],[JNI=""])
+-
+-if test -n "$JNI_INCLUDE"; then
+-  JNI=yes
+-elif test -r "$JAVA_HOME/include/jni_md.h"; then
+-  JNI_INCLUDE="-I$JAVA_HOME/include"
+-  JNI=yes
+-  echo "checking for JNI in $JAVA_HOME/include ... found"
+-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
+-  JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
+-  JNI=yes
+-  echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
+-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
+-  # Darwin
+-  echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
+-  JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+-  JNI=yes
+-else
+-  JNI=""
+-  AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
+-fi
+-
+-if test -r "$JAVA_HOME/include/jvmti.h"; then
+-  echo "Using JVMTI for class reloading"
+-  
+-  CFLAGS="$CFLAGS -DHAS_JVMTI"
+-fi
+-
+-if test -r "$JAVA_HOME/include/jvmdi.h"; then
+-  echo "Using JVMDI for class reloading"
+-  
+-  CFLAGS="$CFLAGS -DHAS_JVMDI"
+-fi
+-	
+-if test -n "$JNI"; then
+-  plugins="$plugins $resin_plugin resin_os"
+-else  
+-  echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
+-fi
+-
+-AC_SUBST(JNI)
+-AC_SUBST(JNI_INCLUDE)
+-	
+-#
+ # --enable-ssl
+ #
+ AC_ARG_ENABLE(ssl,
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
index b167a8c196db..071559facf6f 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.7 2007/04/14 19:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.8 2007/04/14 21:05:31 nelchael Exp $
 
 inherit eutils apache-module autotools
 
@@ -27,12 +27,13 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-java.patch"
 	eautoreconf
 	chmod 755 ./configure
 }
 
 src_compile() {
-	econf --disable-jni --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS2} || die "econf failed"
 
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
index 29ef8f143a67..ac6f842ac1d1 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.5 2007/04/14 19:49:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.6 2007/04/14 21:05:31 nelchael Exp $
 
 inherit eutils apache-module autotools
 
@@ -30,12 +30,13 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-java.patch"
 	eautoreconf
 	chmod 755 ./configure
 }
 
 src_compile() {
-	econf --disable-jni --with-apxs=${APXS2} || die "econf failed"
+	econf --with-apxs=${APXS2} || die "econf failed"
 
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }