[78784] trunk/dports

[ryandesign at macports.org]

Revision: 78784
          http://trac.macports.org/changeset/78784
Author:   ryandesign at macports.org
Date:     2011-05-21 17:10:41 -0700 (Sat, 21 May 2011)
Log Message:
-----------
Check that jni.h is actually a file; some users report it being a directory; see #20849 and #29115

Modified Paths:
--------------
    trunk/dports/databases/db46/Portfile
    trunk/dports/databases/db47/Portfile
    trunk/dports/devel/soprano/Portfile
    trunk/dports/devel/subversion-javahlbindings/Portfile
    trunk/dports/java/commons-daemon/Portfile

Modified: trunk/dports/databases/db46/Portfile
===================================================================
--- trunk/dports/databases/db46/Portfile	2011-05-21 23:39:13 UTC (rev 78783)
+++ trunk/dports/databases/db46/Portfile	2011-05-22 00:10:41 UTC (rev 78784)
@@ -93,7 +93,7 @@
 
 platform macosx {
     pre-configure {
-        if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
+        if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
             ui_error "${name} requires the Java for Mac OS X development headers."
             if {${os.major} == 10} {
                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"

Modified: trunk/dports/databases/db47/Portfile
===================================================================
--- trunk/dports/databases/db47/Portfile	2011-05-21 23:39:13 UTC (rev 78783)
+++ trunk/dports/databases/db47/Portfile	2011-05-22 00:10:41 UTC (rev 78784)
@@ -91,7 +91,7 @@
 
 platform macosx {
     pre-configure {
-        if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
+        if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"] && ![variant_isset no_java]} {
             ui_error "${name} requires the Java for Mac OS X development headers."
             if {${os.major} == 10} {
                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"

Modified: trunk/dports/devel/soprano/Portfile
===================================================================
--- trunk/dports/devel/soprano/Portfile	2011-05-21 23:39:13 UTC (rev 78783)
+++ trunk/dports/devel/soprano/Portfile	2011-05-22 00:10:41 UTC (rev 78784)
@@ -26,7 +26,7 @@
 depends_run-append  port:virtuoso
 
 pre-configure {
-    if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+    if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
         ui_error "${name} requires the Java for Mac OS X development headers."
         if {${os.major} == 10} {
             ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"

Modified: trunk/dports/devel/subversion-javahlbindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-javahlbindings/Portfile	2011-05-21 23:39:13 UTC (rev 78783)
+++ trunk/dports/devel/subversion-javahlbindings/Portfile	2011-05-22 00:10:41 UTC (rev 78784)
@@ -71,14 +71,14 @@
 			}
 
 platform darwin  10	{	pre-fetch {
-					if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+					if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
 						return -code error "\n********************\n${name} requires the Java for Mac OS X Developer Package from Apple.\nPlease download and install this package:\nhttps://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719\n********************"
 					}
 				}
 			}
 
 platform darwin 9	{	pre-fetch {
-					if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+					if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
                                                 return -code error "\n********************\n${name} requires the Java for Mac OS X Developer Package from Apple.\nPlease download and install this package:\nhttps://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20720\n********************"
 					}
 				}

Modified: trunk/dports/java/commons-daemon/Portfile
===================================================================
--- trunk/dports/java/commons-daemon/Portfile	2011-05-21 23:39:13 UTC (rev 78783)
+++ trunk/dports/java/commons-daemon/Portfile	2011-05-22 00:10:41 UTC (rev 78784)
@@ -32,7 +32,7 @@
 
 platform macosx {
     pre-configure {
-        if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
+        if {![file isfile "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} {
             ui_error "${name} requires the Java for Mac OS X development headers."
             if {${os.major} == 10} {
                 ui_error "Download the Java Developer Package from: <https://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/wa/getSoftware?bundleID=20719>"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110521/74530749/attachment.html>