[95514] trunk/dports/java/tomcat5/Portfile
blair at macports.org
blair at macports.org
Sat Jul 14 13:51:26 PDT 2012
Revision: 95514
https://trac.macports.org/changeset/95514
Author: blair at macports.org
Date: 2012-07-14 13:51:26 -0700 (Sat, 14 Jul 2012)
Log Message:
-----------
tomcat5: more whitespace changes.
Modified Paths:
--------------
trunk/dports/java/tomcat5/Portfile
Modified: trunk/dports/java/tomcat5/Portfile
===================================================================
--- trunk/dports/java/tomcat5/Portfile 2012-07-14 20:45:25 UTC (rev 95513)
+++ trunk/dports/java/tomcat5/Portfile 2012-07-14 20:51:26 UTC (rev 95514)
@@ -2,199 +2,200 @@
PortSystem 1.0
-name tomcat5
-version 5.5.25
-revision 2
-license Apache-2
+name tomcat5
+version 5.5.25
+revision 2
+license Apache-2
-categories java www
-maintainers nomaintainer
-platforms darwin
+categories java www
+maintainers nomaintainer
+platforms darwin
-description Tomcat 5 HTTP Server and Java Servlet Container.
-long_description Tomcat is the servlet container that is used in \
- the official Reference Implementation for the Java \
- Servlet and JavaServer Pages technologies.
-homepage http://tomcat.apache.org/
+description Tomcat 5 HTTP Server and Java Servlet Container.
+long_description \
+ Tomcat is the servlet container that is used in the official \
+ Reference Implementation for the Java Servlet and JavaServer Pages \
+ technologies.
+homepage http://tomcat.apache.org/
-distname apache-tomcat-${version}-src
-master_sites apache:tomcat/tomcat-5/v${version}/src/
-checksums md5 2d6cc9a16aceeef4ec3610cd782d5c9d \
- sha1 81ef41e25f805831aa63353f52e5b498c74a3414
+distname apache-tomcat-${version}-src
+master_sites apache:tomcat/tomcat-5/v${version}/src/
+checksums md5 2d6cc9a16aceeef4ec3610cd782d5c9d \
+ sha1 81ef41e25f805831aa63353f52e5b498c74a3414
-patchfiles patch-catalina.sh
+patchfiles patch-catalina.sh
-depends_build bin:ant:apache-ant
-depends_lib bin:java:kaffe \
- bin:jsvc:commons-daemon \
- port:jakarta-taglibs-standard-11 \
- port:commons-beanutils \
- port:commons-collections \
- port:commons-launcher \
- port:commons-daemon \
- port:commons-digester \
- port:commons-el \
- port:commons-logging \
- port:commons-modeler \
- port:commons-httpclient \
- port:commons-pool \
- port:commons-dbcp \
- port:commons-fileupload \
- port:commons-io \
- port:jakarta-regexp \
- port:xercesj \
- port:jakarta-log4j \
- port:mx4j \
- port:junit \
- port:jaxen \
- port:saxpath
+depends_build bin:ant:apache-ant
+depends_lib bin:java:kaffe \
+ bin:jsvc:commons-daemon \
+ port:jakarta-taglibs-standard-11 \
+ port:commons-beanutils \
+ port:commons-collections \
+ port:commons-launcher \
+ port:commons-daemon \
+ port:commons-digester \
+ port:commons-el \
+ port:commons-logging \
+ port:commons-modeler \
+ port:commons-httpclient \
+ port:commons-pool \
+ port:commons-dbcp \
+ port:commons-fileupload \
+ port:commons-io \
+ port:jakarta-regexp \
+ port:xercesj \
+ port:jakarta-log4j \
+ port:mx4j \
+ port:junit \
+ port:jaxen \
+ port:saxpath
-set javaLibs ${prefix}/share/java
-set home share/java/tomcat5
-set tomcatuser www
-set tomcatgroup www
+set javaLibs ${prefix}/share/java
+set home share/java/tomcat5
+set tomcatuser www
+set tomcatgroup www
-use_configure no
+use_configure no
-build.dir ${worksrcpath}/build
-build.cmd ant
-build.target download dist compat
-build.args [join "
- -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
- -Dcommons-daemon.jar=${javaLibs}/commons-daemon.jar
- -Dcommons-digester.jar=${javaLibs}/commons-digester.jar
- -Dcommons-el.jar=${javaLibs}/commons-el.jar
- -Dcommons-logging.jar=${javaLibs}/commons-logging.jar
- -Dcommons-logging-api.jar=${javaLibs}/commons-logging-api.jar
- -Dcommons-modeler.jar=${javaLibs}/commons-modeler.jar
- -Dcommons-httpclient.jar=${javaLibs}/commons-httpclient.jar
- -Dcommons-pool.jar=${javaLibs}/commons-pool.jar
- -Dcommons-dbcp.jar=${javaLibs}/commons-dbcp.jar
- -Dcommons-fileupload.jar=${javaLibs}/commons-fileupload.jar
- -Dregexp.jar=${javaLibs}/jakarta-regexp.jar
- -DxercesImpl.jar=${javaLibs}/xercesImpl.jar
- -Dxml-apis.jar=${javaLibs}/xml-apis.jar
- -Dlog4j.jar=${javaLibs}/jakarta-log4j.jar
- -Djmx.lib=${javaLibs}
- -Djunit.jar=${javaLibs}/junit.jar
- -Djaxen.jar=${javaLibs}/jaxen.jar
- -Dsaxpath.jar=${javaLibs}/saxpath.jar
- -Djasper.home=${worksrcpath}/jasper
- "]
-# -Dstruts.lib=${javaLibs}/struts/lib
+build.dir ${worksrcpath}/build
+build.cmd ant
+build.target download dist compat
+build.args [join "
+ -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
+ -Dcommons-daemon.jar=${javaLibs}/commons-daemon.jar
+ -Dcommons-digester.jar=${javaLibs}/commons-digester.jar
+ -Dcommons-el.jar=${javaLibs}/commons-el.jar
+ -Dcommons-logging.jar=${javaLibs}/commons-logging.jar
+ -Dcommons-logging-api.jar=${javaLibs}/commons-logging-api.jar
+ -Dcommons-modeler.jar=${javaLibs}/commons-modeler.jar
+ -Dcommons-httpclient.jar=${javaLibs}/commons-httpclient.jar
+ -Dcommons-pool.jar=${javaLibs}/commons-pool.jar
+ -Dcommons-dbcp.jar=${javaLibs}/commons-dbcp.jar
+ -Dcommons-fileupload.jar=${javaLibs}/commons-fileupload.jar
+ -Dregexp.jar=${javaLibs}/jakarta-regexp.jar
+ -DxercesImpl.jar=${javaLibs}/xercesImpl.jar
+ -Dxml-apis.jar=${javaLibs}/xml-apis.jar
+ -Dlog4j.jar=${javaLibs}/jakarta-log4j.jar
+ -Djmx.lib=${javaLibs}
+ -Djunit.jar=${javaLibs}/junit.jar
+ -Djaxen.jar=${javaLibs}/jaxen.jar
+ -Dsaxpath.jar=${javaLibs}/saxpath.jar
+ -Djasper.home=${worksrcpath}/jasper
+ "]
+# -Dstruts.lib=${javaLibs}/struts/lib
# Remove compatibility for pre-JRE 1.5 systems
variant nocompat description {do not build compat target} {
- build.target-delete compat
+ build.target-delete compat
}
pre-build {
- #
- # Tomcat in this version requires ant 1.6.2.
- # If the current version of ant is not at least 1.6.2 then
- # tell the user and fail.
- #
- if { [string length [auto_execok ant]] } {
- set verOutput [exec ant -version]
- regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
- if { [vercmp $antVersion "1.6.2"] < 0 } {
- return -code error "This version of tomcat requires ant version 1.6.2 or better. Please install a newer ant before proceeding."
- }
+ #
+ # Tomcat in this version requires ant 1.6.2.
+ # If the current version of ant is not at least 1.6.2 then
+ # tell the user and fail.
+ #
+ if { [string length [auto_execok ant]] } {
+ set verOutput [exec ant -version]
+ regexp {version (\d+(\.\d+)*)} $verOutput -> antVersion
+ if { [vercmp $antVersion "1.6.2"] < 0 } {
+ return -code error "This version of tomcat requires ant version 1.6.2 or better. Please install a newer ant before proceeding."
}
+ }
- # Make a bogus file to prevent nsis.exe from downloading
- system "touch ${build.dir}/.bogus"
+ # Make a bogus file to prevent nsis.exe from downloading
+ system "touch ${build.dir}/.bogus"
}
destroot {
- set target ${destroot}${prefix}/${home}
+ set target ${destroot}${prefix}/${home}
- # Ensure we've got needed directories
- xinstall -m 755 -d \
- ${destroot}${prefix}/share/java \
- ${destroot}${prefix}/share/doc \
- ${destroot}${prefix}/etc/rc.d
+ # Ensure we've got needed directories
+ xinstall -m 755 -d \
+ ${destroot}${prefix}/share/java \
+ ${destroot}${prefix}/share/doc \
+ ${destroot}${prefix}/etc/rc.d
- # Create the tomcat user
- addgroup ${tomcatgroup}
- set gid [existsgroup ${tomcatgroup}]
- add_users ${tomcatuser} gid=${gid} realname=Web Server
+ # Create the tomcat user
+ addgroup ${tomcatgroup}
+ set gid [existsgroup ${tomcatgroup}]
+ add_users ${tomcatuser} gid=${gid} realname=Web Server
- # Install Tomcat
- file copy ${destroot.dir}/dist ${target}
+ # Install Tomcat
+ file copy ${destroot.dir}/dist ${target}
- # Add compat files as needed
- if { ! [variant_isset nocompat] } {
- system "tar -cf - -C ${destroot.dir}/compat . | tar xpf - -C ${target}"
- }
+ # Add compat files as needed
+ if { ! [variant_isset nocompat] } {
+ 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
- xinstall -m 644 \
- ${prefix}/share/java/jstl.jar \
- ${prefix}/share/java/standard.jar \
- ${target}/shared/lib
+ # Add the jstl libs to tomcat5/shared/lib so that they're available to all
+ xinstall -m 644 \
+ ${prefix}/share/java/jstl.jar \
+ ${prefix}/share/java/standard.jar \
+ ${target}/shared/lib
- # Remove unwanted files
- foreach f [glob -directory ${target}/bin *.bat] { file delete $f }
+ # Remove unwanted files
+ foreach f [glob -directory ${target}/bin *.bat] { file delete $f }
- # Maintain empty directories
- destroot.keepdirs-append \
- ${target}/logs \
- ${target}/temp \
- ${target}/work \
- ${target}/shared/classes \
- ${target}/common/classes
+ # Maintain empty directories
+ destroot.keepdirs-append \
+ ${target}/logs \
+ ${target}/temp \
+ ${target}/work \
+ ${target}/shared/classes \
+ ${target}/common/classes
- # Install our scripts
- xinstall -m 755 \
- ${filespath}/tomcatctl \
- ${filespath}/conf_setup.sh \
- ${filespath}/setenv.sh \
- ${target}/bin
- xinstall -m 755 \
- ${filespath}/setenv.local \
- ${target}/conf
+ # Install our scripts
+ xinstall -m 755 \
+ ${filespath}/tomcatctl \
+ ${filespath}/conf_setup.sh \
+ ${filespath}/setenv.sh \
+ ${target}/bin
+ xinstall -m 755 \
+ ${filespath}/setenv.local \
+ ${target}/conf
- # Don't install startup script, as we're now generating a startupitem
- #xinstall -m 755 ${filespath}/tomcat5.sh \
- # ${destroot}${prefix}/etc/rc.d
- #reinplace s|TOMCATPREFIX=$|TOMCATPREFIX=${prefix}/${home}| ${destroot}${prefix}/etc/rc.d/tomcat5.sh
+ # Don't install startup script, as we're now generating a startupitem
+ #xinstall -m 755 ${filespath}/tomcat5.sh \
+ # ${destroot}${prefix}/etc/rc.d
+ #reinplace s|TOMCATPREFIX=$|TOMCATPREFIX=${prefix}/${home}| ${destroot}${prefix}/etc/rc.d/tomcat5.sh
- # Add a symlink from bin directory to tomcatctl
- system "cd ${destroot}${prefix}/bin && ln -s ../${home}/bin/tomcatctl"
+ # Add a symlink from bin directory to tomcatctl
+ system "cd ${destroot}${prefix}/bin && ln -s ../${home}/bin/tomcatctl"
- # Configure the scripts
- reinplace s|PREFIX=$|PREFIX=${prefix}| ${target}/bin/tomcatctl
- reinplace s|TOMCAT_USER=$|TOMCAT_USER=${tomcatuser}| ${target}/bin/tomcatctl
+ # Configure the scripts
+ reinplace s|PREFIX=$|PREFIX=${prefix}| ${target}/bin/tomcatctl
+ reinplace s|TOMCAT_USER=$|TOMCAT_USER=${tomcatuser}| ${target}/bin/tomcatctl
- # Rename certain files as .sample to avoid replacing them on update
- # These will be "repaired" by conf_setup.sh on first run
- foreach f "
- catalina.policy
- catalina.properties
- server.xml
- tomcat-users.xml
- web.xml
- setenv.local
- " {
- file rename ${target}/conf/${f} ${target}/conf/${f}.sample
- }
+ # Rename certain files as .sample to avoid replacing them on update
+ # These will be "repaired" by conf_setup.sh on first run
+ foreach f "
+ catalina.policy
+ catalina.properties
+ server.xml
+ tomcat-users.xml
+ web.xml
+ setenv.local
+ " {
+ file rename ${target}/conf/${f} ${target}/conf/${f}.sample
+ }
- # Fix ownership of some directories tomcat really needs to write to
- system "chown -R ${tomcatuser}:${tomcatgroup} \
- ${target}/conf \
- ${target}/logs \
- ${target}/temp \
- ${target}/webapps \
- ${target}/work"
+ # Fix ownership of some directories tomcat really needs to write to
+ system "chown -R ${tomcatuser}:${tomcatgroup} \
+ ${target}/conf \
+ ${target}/logs \
+ ${target}/temp \
+ ${target}/webapps \
+ ${target}/work"
- # Install the docs
- file copy ${destroot.dir}/build/docs \
- ${destroot}${prefix}/share/doc/${name}
+ # Install the docs
+ file copy ${destroot.dir}/build/docs \
+ ${destroot}${prefix}/share/doc/${name}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120714/8c30f238/attachment.html>
More information about the macports-changes
mailing list