[72798] trunk/dports/devel/subversion-javahlbindings/files/patch-configure. diff

[dluke at macports.org]

Revision: 72798
          http://trac.macports.org/changeset/72798
Author:   dluke at macports.org
Date:     2010-10-27 08:19:28 -0700 (Wed, 27 Oct 2010)
Log Message:
-----------
Patch subversions's configure script to let it find the java headers it needs. (fixes #26947)
 - no revbump as previous installs are fine

Modified Paths:
--------------
    trunk/dports/devel/subversion-javahlbindings/files/patch-configure.diff

Modified: trunk/dports/devel/subversion-javahlbindings/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/subversion-javahlbindings/files/patch-configure.diff	2010-10-27 12:19:07 UTC (rev 72797)
+++ trunk/dports/devel/subversion-javahlbindings/files/patch-configure.diff	2010-10-27 15:19:28 UTC (rev 72798)
@@ -1,7 +1,43 @@
---- configure.orig	2005-05-20 13:42:06.000000000 -0400
-+++ configure	2005-05-23 17:47:07.000000000 -0400
-@@ -24321,7 +24321,7 @@
+--- configure.orig	2010-10-27 10:51:14.000000000 -0400
++++ configure	2010-10-27 11:10:53.000000000 -0400
+@@ -23382,7 +23382,10 @@
+       JRE_LIB_DIR="$JDK/jre/lib"
+   fi
  
+-  if test -f "$JDK/include/jni.h"; then
++  if test "$os_arch" = "Darwin" && test "$JDK" = "/Library/Java/Home"; then
++        JNI_INCLUDEDIR="/System/Library/Frameworks/JavaVM.framework/Headers"
++        JDK_SUITABLE=yes
++  elif test -f "$JDK/include/jni.h"; then
+         JNI_INCLUDEDIR="$JDK/include"
+     JDK_SUITABLE=yes
+   else
+@@ -23505,7 +23508,10 @@
+       JRE_LIB_DIR="$JDK/jre/lib"
+   fi
+ 
+-  if test -f "$JDK/include/jni.h"; then
++  if test "$os_arch" = "Darwin" && test "$JDK" = "/Library/Java/Home"; then
++        JNI_INCLUDEDIR="/System/Library/Frameworks/JavaVM.framework/Headers"
++        JDK_SUITABLE=yes
++  elif test -f "$JDK/include/jni.h"; then
+         JNI_INCLUDEDIR="$JDK/include"
+     JDK_SUITABLE=yes
+   else
+@@ -23631,7 +23637,10 @@
+       JRE_LIB_DIR="$JDK/jre/lib"
+   fi
+ 
+-  if test -f "$JDK/include/jni.h"; then
++  if test "$os_arch" = "Darwin" && test "$JDK" = "/Library/Java/Home"; then
++        JNI_INCLUDEDIR="/System/Library/Frameworks/JavaVM.framework/Headers"
++        JDK_SUITABLE=yes
++  elif test -f "$JDK/include/jni.h"; then
+         JNI_INCLUDEDIR="$JDK/include"
+     JDK_SUITABLE=yes
+   else
+@@ -26195,7 +26204,7 @@
+ 
    os_arch=`uname`
    if test "$os_arch" = "Darwin"; then
 -        INSTALL_EXTRA_JAVAHL_LIB='ln -sf $(libdir)/libsvnjavahl-1.dylib $(libdir)/libsvnjavahl-1.jnilib'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101027/d21c346c/attachment.html>