Ticket #23023: mod_jk2.diff

File mod_jk2.diff, 4.5 KB (added by haraoka@…, 15 years ago)
  • mod_jk2/Portfile

    old new  
    33PortSystem 1.0
    44
    55name                            mod_jk2
    6 version                         5.5.4
     6version                         2.0.4
    77
    88categories                      www java
    99maintainers                     nomaintainer
    1010platforms                       darwin
    1111
    1212description                     Apache mod_jk2 remote server connector (from Tomcat).
    13 long_description        mod_jk2 provides a connection between apache2 and a remote \
     13long_description        mod_jk2 provides a connection between apache20 and a remote \
    1414                                        server. It passes incoming requests on to the remote server \
    1515                                        for handling. Configurations may be mixed such that each \
    1616                                        server handles a particular type of request. mod_jk2 comes \
     
    2121                                        core module, proxy_ajp, replaces mod_jk2.
    2222homepage                        http://jakarta.apache.org/tomcat/connectors-doc/
    2323
    24 distname                        jakarta-tomcat-${version}-src
    25 master_sites            apache:jakarta/tomcat-5/v${version}/src/
    26 checksums                       md5 2fdfb34df8f670af2669d02fb6103a45
     24distname                        jakarta-tomcat-connectors-jk2-${version}-src
     25master_sites            apache:tomcat/tomcat-connectors/jk2/source/
     26checksums           md5     444bef31619f772df1f0b1c50e6ba773 \
     27                    sha1    b81b262f1086e324216684b05753d562d7182e2c \
     28                    rmd160  d02eaab9b50f816884850ccb6f41d9204927cad5
    2729
    28 patchfiles                      patch-workers2.properties.minimal.diff
    2930
    30 depends_build           path:apache2/bin/httpd:apache2
     31depends_build           path:apache20/bin/httpd:apache20
    3132depends_lib                     lib:pcre:pcre
    3233
    33 worksrcdir                      ${distname}/jakarta-tomcat-connectors/jk/native2
     34worksrcdir                      ${distname}/jk/native2
     35
    3436
    3537
    3638# Try to determine a reasonable JAVA_HOME value
     
    5658        reinplace s|libtoolize|glibtoolize| ${worksrcpath}/buildconf.sh
    5759
    5860        # Fix link
    59         reinplace s|-lcrypt|| ${worksrcpath}/server/apache2/Makefile.in
     61        reinplace s|-lcrypt|| ${worksrcpath}/server/apache2/Makefile.in
    6062}
    6163
    6264pre-configure {
    63         # Check to be sure the apache2 port has been updated, and
     65        # Check to be sure the apache20 port has been updated, and
    6466        # warn the user if it hasn't been.
    6567        # In port versions prior to 2.0.52_1, apxs didn't know where libdir was.
    6668        # That information is needed by the jk2 configure script.
    67         set apxs ${prefix}/apache2/bin/apxs
     69        system "test -h ${prefix}/lib/libapr-0.so || ln -s libapr-0.dylib ${prefix}/lib/libapr-0.so"
     70        set apxs ${prefix}/apache20/bin/apxs
    6871        if { [file executable ${apxs}] } {
    6972                set libdir [exec ${apxs} -q LIBDIR]
    7073                if { 0 == [string length ${libdir}] || ![file isdirectory ${libdir}] } {
    71                         error "Your apache2 installation doesn't know where its library directory is. Please update your apache2 port."
     74                        error "Your apache20 installation doesn't know where its library directory is. Please update your apache20 port."
    7275                }
    7376        }
    7477       
     
    7881}
    7982
    8083configure.args          --with-pcre \
    81                                         --with-apxs2=${prefix}/apache2/bin/apxs \
    82                                         --with-jni \
    83                                         --with-java-home=${javahome}
     84                        --with-apache2=${prefix}/apache20 \
     85                        --with-apxs2=${prefix}/apache20/bin/apxs \
     86                        --with-apr-lib=${prefix}/lib \
     87                        --with-apr-include=${prefix}/include/apr-0 \
     88#                       --with-apr-util=${prefix}/lib/apr-util-1 \
     89                        --with-jni \
     90                        --with-java-home=${javahome}
     91
     92#                               --with-apr=${prefix} \
    8493
    8594destroot {
    86         # Install the jk2 connector for apache2
     95        # Install the jk2 connector for apache20
    8796        xinstall -m 755 -d \
    88                 ${destroot}${prefix}/apache2/modules \
    89                 ${destroot}${prefix}/apache2/conf
     97                ${destroot}${prefix}/apache20/modules \
     98                ${destroot}${prefix}/apache20/conf
    9099               
    91100        xinstall -m 644 \
    92101                ${worksrcpath}/../build/jk2/apache2/mod_jk2.so \
    93                 ${worksrcpath}/../build/jk2/apache2/libjkjni.so \
    94                 ${destroot}${prefix}/apache2/modules
     102                ${destroot}${prefix}/apache20/modules
    95103               
    96104        xinstall -m 644 ${worksrcpath}/../conf/workers2.properties.minimal \
    97                 ${destroot}${prefix}/apache2/conf/workers2.properties.sample
     105                ${destroot}${prefix}/apache20/conf/workers2.properties.sample
    98106}
    99107
    100108
    101109post-install {
    102110        ui_msg "#"
    103         ui_msg "# Example file ${prefix}/apache2/conf/workers2.properties.sample has"
     111        ui_msg "# Example file ${prefix}/apache20/conf/workers2.properties.sample has"
    104112        ui_msg "# been installed to illustrate use of the jk2 connector between "
    105         ui_msg "# apache2 and tomcat over a unix domain socket."
     113        ui_msg "# apache20 and tomcat over a unix domain socket."
    106114        ui_msg "#"
    107115        ui_msg "# You will want to create a working copy of this file as workers2.properties"
    108116        ui_msg "# and configure the uri mappings within it, or using JkUriSet in httpd.conf."