[86716] trunk/dports/java/tomcat-native/Portfile

[jmr at macports.org]

Revision: 86716
          http://trac.macports.org/changeset/86716
Author:   jmr at macports.org
Date:     2011-11-01 14:16:20 -0700 (Tue, 01 Nov 2011)
Log Message:
-----------
tomcat-native: update to 1.1.22, fix build on 10.7 (#27830)

Modified Paths:
--------------
    trunk/dports/java/tomcat-native/Portfile

Modified: trunk/dports/java/tomcat-native/Portfile
===================================================================
--- trunk/dports/java/tomcat-native/Portfile	2011-11-01 20:52:55 UTC (rev 86715)
+++ trunk/dports/java/tomcat-native/Portfile	2011-11-01 21:16:20 UTC (rev 86716)
@@ -3,8 +3,7 @@
 PortSystem 1.0
 
 name				tomcat-native
-version				1.1.20
-revision        1
+version				1.1.22
 
 categories			java www
 maintainers			nomaintainer
@@ -16,8 +15,8 @@
 homepage			http://tomcat.apache.org/
 
 master_sites		apache:tomcat/tomcat-connectors/native/${version}/source/
-checksums			md5 fb2b9d073cb6575c2d0020eda266ca0c \
-					sha1 35a176f3eb6516d84a109514d6a8b7c0af91441a
+checksums			rmd160 d9b1bbfb58202e218f5fa6b89ed5a3bc9aee79e7 \
+					sha256 5e7beae371c2e5046f627a3ab3330a75f9457217ebc2587bf7fd3cbf2cd320a5
 
 distname			${name}-${version}-src
 worksrcdir			${distname}/jni/native
@@ -25,17 +24,16 @@
 depends_lib			port:apr \
 					port:openssl
 
-if { [llength [array get env "JAVA_HOME"]] > 0 } {
-	set javahome $env(JAVA_HOME)
-} else {
-	set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
-}
-
 configure.args		--with-apr=${prefix} \
 					--with-ssl=${prefix} \
-					--with-java-home=${javahome} \
 					--with-java-platform=2
 
+if {[info exists env(JAVA_HOME)]} {
+	configure.args-append --with-java-home="$env(JAVA_HOME)"
+} else {
+    configure.args-append --with-java-home="/System/Library/Frameworks/JavaVM.framework"
+}
+
 build.args			EXTRA_LDFLAGS="-shrext .jnilib"
 
 notes "
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111101/a19709ba/attachment-0001.html>