Ticket #20224: Portfile-tomcat6.diff

File Portfile-tomcat6.diff, 1.8 KB (added by Markus.Ueberall@…, 15 years ago)

Extendend diff (bumped version number, fixed reported version and pid filename)

  • java/tomcat6/Portfile 

    Only in build/svn/macports/macports-trunk/dports/java/tomcat6/: .svn
diff -r -U2 -x entries build/svn/macports/macports-trunk/dports/java/tomcat6/Portfile build/ports/java/tomcat6/Portfile
    old new  
    44
    55name                            tomcat6
    6 version                         6.0.18
     6version                         6.0.20
    77
    88categories                      java www
    … …  
    1919master_sites            apache:tomcat/tomcat-6/v${version}/src/
    2020
    21 checksums           md5     9bdbb1c1d79302c80057a70b18fe6721 \
    22                     sha1    9182b0d6b2d0cb2d60f04be6211f3b3516bc518e \
    23                     rmd160  ef85db0d65a4f3bdd3ca821420d06535050b6a93
    24 
     21checksums               md5     44f49e7e14028b6a53c3c346bd18c72f \
     22                        sha1    ab538484d8d05c83a69c70ab6bf07606282633d8 \
     23                        rmd160  65b1b56132c03855e352e44a24b761bccd65b90c
    2524                                       
    2625patchfiles                      patch-bin-catalina.sh   \
    … …  
    6463build.target            download
    6564set antArgs              [join "
     65                                        -Dversion=${version}
     66                                        -Dversion.build=[lindex [split ${version} .] 2]
    6667                                        -Dbase.path=${worksrcpath}/Repository
    6768                                        -Dnsis.exe=${worksrcpath}/.bogus

  • java/tomcat6/files/tomcatctl 

    diff -r -U2 -x entries build/svn/macports/macports-trunk/dports/java/tomcat6/files/tomcatctl build/ports/java/tomcat6/files/tomcatctl
    old new  
    5151[ -z "$CATALINA_TMPDIR" ]       && CATALINA_TMPDIR="${CATALINA_BASE}/temp"
    5252
    53 [ -z "$TOMCAT_PIDNAME" ]        && TOMCAT_PIDNAME="tomcat5.pid"
     53[ -z "$TOMCAT_PIDNAME" ]        && TOMCAT_PIDNAME="tomcat6.pid"
    5454[ -z "$TOMCAT_PIDFILE" ]        && TOMCAT_PIDFILE="${CATALINA_BASE}/logs/${TOMCAT_PIDNAME}"
    5555[ -z "$TOMCAT_USER" ]           && TOMCAT_USER=tomcat