Modified: trunk/dports/java/tomcat5/Portfile (81449 => 81450)
--- trunk/dports/java/tomcat5/Portfile 2011-07-31 01:28:03 UTC (rev 81449)
+++ trunk/dports/java/tomcat5/Portfile 2011-07-31 01:33:28 UTC (rev 81450)
@@ -47,8 +47,6 @@
port:junit \
port:jaxen \
port:saxpath
-
-worksrcdir ${distname}/build
set javaLibs ${prefix}/share/java
set home share/java/tomcat5
@@ -57,11 +55,12 @@
use_configure no
+build.dir ${worksrcpath}/build
build.cmd ant
build.target download dist compat
build.args [join "
- -Dbase.path=${worksrcpath}/Repository
- -Dnsis.exe=${worksrcpath}/.bogus
+ -Dbase.path=${build.dir}/Repository
+ -Dnsis.exe=${build.dir}/.bogus
-Dcommons-beanutils.jar=${javaLibs}/commons-beanutils.jar
-Dcommons-collections.jar=${javaLibs}/commons-collections.jar
-Dcommons-launcher.jar=${javaLibs}/commons-launcher.jar
@@ -83,7 +82,7 @@
-Djunit.jar=${javaLibs}/junit.jar
-Djaxen.jar=${javaLibs}/jaxen.jar
-Dsaxpath.jar=${javaLibs}/saxpath.jar
- -Djasper.home=${worksrcpath}/../jasper
+ -Djasper.home=${worksrcpath}/jasper
"]
# -Dstruts.lib=${javaLibs}/struts/lib
@@ -107,7 +106,7 @@
}
# Make a bogus file to prevent nsis.exe from downloading
- system "touch ${worksrcpath}/.bogus"
+ system "touch ${build.dir}/.bogus"
}
destroot {
@@ -125,11 +124,11 @@
adduser ${tomcatuser} gid=${gid} realname=Web Server
# Install Tomcat
- file copy ${worksrcpath}/dist ${target}
+ file copy ${destroot.dir}/dist ${target}
# Add compat files as needed
if { ! [variant_isset nocompat] } {
- system "tar -cf - -C ${worksrcpath}/compat . | tar xpf - -C ${target}"
+ system "tar -cf - -C ${destroot.dir}/compat . | tar xpf - -C ${target}"
}
# Add the jstl libs to tomcat5/shared/lib so that they're available to all
@@ -193,7 +192,7 @@
${target}/work"
# Install the docs
- file copy ${worksrcpath}/build/docs \
+ file copy ${destroot.dir}/build/docs \
${destroot}${prefix}/share/doc/${name}
}
Modified: trunk/dports/java/tomcat5/files/patch-catalina.sh (81449 => 81450)
--- trunk/dports/java/tomcat5/files/patch-catalina.sh 2011-07-31 01:28:03 UTC (rev 81449)
+++ trunk/dports/java/tomcat5/files/patch-catalina.sh 2011-07-31 01:33:28 UTC (rev 81450)
@@ -1,5 +1,5 @@
---- ../container/catalina/src/bin/catalina.sh.orig 2005-09-23 06:45:08.000000000 -0700
-+++ ../container/catalina/src/bin/catalina.sh 2005-10-25 12:54:10.000000000 -0700
+--- container/catalina/src/bin/catalina.sh.orig 2005-09-23 06:45:08.000000000 -0700
++++ container/catalina/src/bin/catalina.sh 2005-10-25 12:54:10.000000000 -0700
@@ -146,6 +146,11 @@
JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
fi