[21099] trunk/dports/java/tomcat5
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jan 1 08:45:02 PST 2007
Revision: 21099
http://trac.macosforge.org/projects/macports/changeset/21099
Author: jberry at macports.org
Date: 2007-01-01 08:45:02 -0800 (Mon, 01 Jan 2007)
Log Message:
-----------
Set JAVA_JVM_VERSION to an actual version number, rather than CurrentJDK, as jni doesn't like CurrentJDK as a version
Modified Paths:
--------------
trunk/dports/java/tomcat5/Portfile
trunk/dports/java/tomcat5/files/setenv.sh
Modified: trunk/dports/java/tomcat5/Portfile
===================================================================
--- trunk/dports/java/tomcat5/Portfile 2007-01-01 12:35:34 UTC (rev 21098)
+++ trunk/dports/java/tomcat5/Portfile 2007-01-01 16:45:02 UTC (rev 21099)
@@ -4,7 +4,7 @@
name tomcat5
version 5.5.20
-revision 2
+revision 3
categories java www
maintainers jberry at macports.org
Modified: trunk/dports/java/tomcat5/files/setenv.sh
===================================================================
--- trunk/dports/java/tomcat5/files/setenv.sh 2007-01-01 12:35:34 UTC (rev 21098)
+++ trunk/dports/java/tomcat5/files/setenv.sh 2007-01-01 16:45:02 UTC (rev 21099)
@@ -30,7 +30,14 @@
for jversion in $JAVA_JVM_VERSION CurrentJDK ; do
jhome="/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}/Home"
if [ -z "$JAVA_HOME" -a -d "${jhome}" ]; then
- export JAVA_JVM_VERSION=${jversion}
+ # Get the actual version that any symlink points to, since
+ # jni doesn't like JAVA_JVM_VERSION set to CurrentJDK
+ saved=`pwd`
+ cd "/System/Library/Frameworks/JavaVM.framework/Versions/${jversion}"
+ actualvers=$(basename $(pwd -P))
+ cd $saved
+
+ export JAVA_JVM_VERSION=${actualvers}
export JAVA_HOME=${jhome}
fi
done
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070101/5f1260ee/attachment.html
More information about the macports-changes
mailing list