Revision

76628

Author

jmr@macports.org

Date

2011-03-02 21:25:16 -0800 (Wed, 02 Mar 2011)

Log Message

mod_jk, mod_jk2: don't prevent the portfile from being opened at all when a JAVA_HOME can't be found

Modified Paths

• trunk/dports/www/mod_jk/Portfile
• trunk/dports/www/mod_jk2/Portfile

Diff

--- trunk/dports/www/mod_jk/Portfile	2011-03-03 03:26:36 UTC (rev 76627)
+++ trunk/dports/www/mod_jk/Portfile	2011-03-03 05:25:16 UTC (rev 76628)
@@ -48,7 +48,9 @@
 	}
 }
 if { ![file isdirectory ${javahome}] } {
-	error "This port needs a reasonable value for JAVA_HOME, but couldn't automatically determine one: please set the environment variable."
+    pre-fetch {
+	    error "This port needs a reasonable value for JAVA_HOME, but couldn't automatically determine one: please set the environment variable."
+    }
 }
 
 variant jni description {Build jni_connect.so and enable jni_worker} {

--- trunk/dports/www/mod_jk2/Portfile	2011-03-03 03:26:36 UTC (rev 76627)
+++ trunk/dports/www/mod_jk2/Portfile	2011-03-03 05:25:16 UTC (rev 76628)
@@ -47,7 +47,9 @@
 	}
 }
 if { ![file isdirectory ${javahome}] } {
-	error "This port needs a reasonable value for JAVA_HOME, but couldn't automatically determine one: please set the environment variable."
+    pre-fetch {
+	    error "This port needs a reasonable value for JAVA_HOME, but couldn't automatically determine one: please set the environment variable."
+    }
 }