Changeset 81450

Timestamp:

07/30/11 18:33:28 (4 years ago)

Author:

ryandesign@…

Message:

tomcat5: don't use .. components in patchfile; see #30451

Location:

trunk/dports/java/tomcat5

Files:

• Portfile (modified) (6 diffs)
• files/patch-catalina.sh (modified) (1 diff)

trunk/dports/java/tomcat5/Portfile

@@ -48 +48 @@
                         port:jaxen \
                         port:saxpath
-                                
-worksrcdir              ${distname}/build
 
 set javaLibs            ${prefix}/share/java
@@ -58 +56 @@
 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
@@ -84 +83 @@
                                 -Djaxen.jar=${javaLibs}/jaxen.jar
                                 -Dsaxpath.jar=${javaLibs}/saxpath.jar
-                                -Djasper.home=${worksrcpath}/../jasper
+                                -Djasper.home=${worksrcpath}/jasper
                                 "]
 #                               -Dstruts.lib=${javaLibs}/struts/lib
@@ -108 +107 @@
 
         # Make a bogus file to prevent nsis.exe from downloading
-        system "touch ${worksrcpath}/.bogus"
+        system "touch ${build.dir}/.bogus"
 }
 
@@ -126 +125 @@
         
         # 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}"
         }
         
@@ -194 +193 @@
         
         # Install the docs
-        file copy ${worksrcpath}/build/docs \
+        file copy ${destroot.dir}/build/docs \
                 ${destroot}${prefix}/share/doc/${name}
 }

trunk/dports/java/tomcat5/files/patch-catalina.sh

@@ -1 @@
---- ../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"