1 files changed, 131 insertions, 0 deletions
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch
new file mode 100644
index 000000000000..37fa05011260
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch
@@ -0,0 +1,131 @@
+diff -Nru resin-3.1.2.vanilla/configure.in resin-3.1.2/configure.in
+--- resin-3.1.2.vanilla/configure.in	2007-08-17 10:14:28.000000000 +0200
++++ resin-3.1.2/configure.in	2007-08-17 10:14:59.000000000 +0200
+@@ -442,54 +442,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`
+@@ -814,72 +766,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
+-elif test -r "$JAVA_HOME/include/jni.h"; then
+-  JNI_INCLUDE="-I$JAVA_HOME/include"
+-  JNI=yes
+-  echo "checking for JNI in $JAVA_HOME/include ... found"
+-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,