Ticket #41077: mod_jk-Portfile.diff

Portfile

@@ -4 +4 @@
 
 name                            mod_jk
 version                         1.2.27
+revision                        1
 
 categories                      www java
 license                         Apache-2 BSD
@@ -36 +37 @@
 set apachedir       apache2
 
 # Determine a valid value for javahome
-if { [llength [array get env "JAVA_HOME"]] > 0 } {
+variant jni description {Build jni_connect.so and enable jni_worker} {
+        if { [llength [array get env "JAVA_HOME"]] > 0 } {
         set javahome $env(JAVA_HOME)
-} else {
-        set javahome ""
-}
-if { ![file isdirectory ${javahome}] } {
+        } else {
+                set javahome [exec /usr/libexec/java_home]
+        }
+        if { ![file isdirectory ${javahome}] } {
         if { ${os.platform} == "darwin" } {
                 if { [file isdirectory "/System/Library/Frameworks/JavaVM.framework/Home"] } {
                         set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
                 }
         }
-}
-if { ![file isdirectory ${javahome}] } {
+        }
+        if { ![file isdirectory ${javahome}] } {
     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} {
         configure.args-append --with-java-home=${javahome} --enable-jni
 }
 
@@ -72 +73 @@
         }
 }
 
+patchfiles-append jk_map.c.patch
 if {[variant_isset universal]} {
     patchfiles-append   configure_universal.patch
     post-configure {