<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127222] trunk/dports/www/mod_jk/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127222">127222</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-10-23 12:02:54 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_jk: whitespace only, conform to modeline</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwmod_jkPortfile">trunk/dports/www/mod_jk/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwmod_jkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/mod_jk/Portfile (127221 => 127222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/mod_jk/Portfile 2014-10-23 19:01:45 UTC (rev 127221)
+++ trunk/dports/www/mod_jk/Portfile 2014-10-23 19:02:54 UTC (rev 127222)
</span><span class="lines">@@ -3,50 +3,50 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name mod_jk
-version 1.2.40
</del><ins>+name mod_jk
+version 1.2.40
</ins><span class="cx">
</span><del>-categories www java
-license Apache-2 BSD
-maintainers FreeBSD.org:girgen
-platforms darwin
</del><ins>+categories www java
+license Apache-2 BSD
+maintainers FreeBSD.org:girgen
+platforms darwin
</ins><span class="cx">
</span><del>-description Apache mod_jk remote server connector
-long_description mod_jk is the connector supported by apache for communication between \
- the apache server and tomcat. mod_jk2, which had for some time superceeded mod_jk, \
- has now become officially 'unsupported' by the Apache group. \
- mod_jk allows apache to be used refer some request for processing by tomcat or any \
- other server that also supports the ajp13 protocol. \
- Apache 2.1 will contain a replacement for mod_jk(2) called mod_proxy_ajp. \
- At this time (this) mod_jk port supports only apache2, not apache 1.x.
-homepage http://tomcat.apache.org/connectors-doc/
</del><ins>+description Apache mod_jk remote server connector
+long_description mod_jk is the connector supported by apache for communication between \
+ the apache server and tomcat. mod_jk2, which had for some time superceeded mod_jk, \
+ has now become officially 'unsupported' by the Apache group. \
+ mod_jk allows apache to be used refer some request for processing by tomcat or any \
+ other server that also supports the ajp13 protocol. \
+ Apache 2.1 will contain a replacement for mod_jk(2) called mod_proxy_ajp. \
+ At this time (this) mod_jk port supports only apache2, not apache 1.x.
+homepage http://tomcat.apache.org/connectors-doc/
</ins><span class="cx">
</span><del>-distname tomcat-connectors-${version}-src
-master_sites apache:tomcat/tomcat-connectors/jk
</del><ins>+distname tomcat-connectors-${version}-src
+master_sites apache:tomcat/tomcat-connectors/jk
</ins><span class="cx">
</span><span class="cx"> checksums rmd160 7e5f8d48405239076b9ce0dc21978369e36fcd7a \
</span><del>- sha256 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d
</del><ins>+ sha256 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d
</ins><span class="cx">
</span><del>-depends_build path:apache2/bin/httpd:apache2
-worksrcdir ${distname}/native
</del><ins>+depends_build path:apache2/bin/httpd:apache2
+worksrcdir ${distname}/native
</ins><span class="cx">
</span><span class="cx">
</span><del>-configure.args --with-apxs=${prefix}/apache2/bin/apxs
</del><ins>+configure.args --with-apxs=${prefix}/apache2/bin/apxs
</ins><span class="cx">
</span><span class="cx"> set apachedir apache2
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><del>- # Check to be sure the apache2 port has been updated, and
- # warn the user if it hasn't been.
- # In port versions prior to 2.0.52_1, apxs didn't know where libdir was.
- # That information is needed by the jk configure script.
- set apxs ${prefix}/${apachedir}/bin/apxs
- if { [file executable ${apxs}] } {
- set libdir [exec ${apxs} -q LIBDIR]
- if { 0 == [string length ${libdir}] || ![file isdirectory ${libdir}] } {
- error "Your apache2 installation doesn't know where its library directory is. Please update your apache2 port."
- }
- }
</del><ins>+ # Check to be sure the apache2 port has been updated, and
+ # warn the user if it hasn't been.
+ # In port versions prior to 2.0.52_1, apxs didn't know where libdir was.
+ # That information is needed by the jk configure script.
+ set apxs ${prefix}/${apachedir}/bin/apxs
+ if { [file executable ${apxs}] } {
+ set libdir [exec ${apxs} -q LIBDIR]
+ if { 0 == [string length ${libdir}] || ![file isdirectory ${libdir}] } {
+ error "Your apache2 installation doesn't know where its library directory is. Please update your apache2 port."
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset universal]} {
</span><span class="lines">@@ -57,42 +57,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span><del>- # Install the connector for apache2
- xinstall -m 755 -d \
- ${destroot}${prefix}/${apachedir}/modules \
- ${destroot}${prefix}/${apachedir}/conf
-
- xinstall -m 644 \
- ${worksrcpath}/apache-2.0/mod_jk.so \
- ${destroot}${prefix}/${apachedir}/modules
-
- xinstall -m 644 ${worksrcpath}/../conf/workers.properties.minimal \
- ${destroot}${prefix}/${apachedir}/conf/workers.properties.sample
</del><ins>+ # Install the connector for apache2
+ xinstall -m 755 -d \
+ ${destroot}${prefix}/${apachedir}/modules \
+ ${destroot}${prefix}/${apachedir}/conf
+
+ xinstall -m 644 \
+ ${worksrcpath}/apache-2.0/mod_jk.so \
+ ${destroot}${prefix}/${apachedir}/modules
+
+ xinstall -m 644 ${worksrcpath}/../conf/workers.properties.minimal \
+ ${destroot}${prefix}/${apachedir}/conf/workers.properties.sample
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> post-install {
</span><del>- ui_msg "#"
- ui_msg "# Example file ${prefix}/${apachedir}/conf/workers.properties.sample has"
- ui_msg "# been installed to illustrate use of the jk connector between "
- ui_msg "# apache2 and tomcat."
- ui_msg "#"
- ui_msg "# You will want to create a working copy of this file as workers.properties"
- ui_msg "# and configure the uri mappings within it, or by using directives within httpd.conf."
- ui_msg "#"
- ui_msg "# Be sure to also add the following line to your httpd.conf:"
- ui_msg "#"
- ui_msg "# LoadModule jk_module modules/mod_jk.so"
- ui_msg "#"
</del><ins>+ ui_msg "#"
+ ui_msg "# Example file ${prefix}/${apachedir}/conf/workers.properties.sample has"
+ ui_msg "# been installed to illustrate use of the jk connector between "
+ ui_msg "# apache2 and tomcat."
+ ui_msg "#"
+ ui_msg "# You will want to create a working copy of this file as workers.properties"
+ ui_msg "# and configure the uri mappings within it, or by using directives within httpd.conf."
+ ui_msg "#"
+ ui_msg "# Be sure to also add the following line to your httpd.conf:"
+ ui_msg "#"
+ ui_msg "# LoadModule jk_module modules/mod_jk.so"
+ ui_msg "#"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant apache20 description "install for apache 2.0.x" {
</span><span class="cx"> global apachedir
</span><span class="cx"> set apachedir apache20
</span><del>- depends_build-delete path:apache2/bin/httpd:apache2
- depends_build-append path:apache20/bin/httpd:apache20
- configure.args-delete --with-apxs=${prefix}/apache2/bin/apxs
- configure.args-append --with-apxs=${prefix}/apache20/bin/apxs
</del><ins>+ depends_build-delete path:apache2/bin/httpd:apache2
+ depends_build-append path:apache20/bin/httpd:apache20
+ configure.args-delete --with-apxs=${prefix}/apache2/bin/apxs
+ configure.args-append --with-apxs=${prefix}/apache20/bin/apxs
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre>
</div>
</div>
</body>
</html>