Ticket #45921: mod_jk-Portfile.diff

File mod_jk-Portfile.diff, 2.5 KB (added by girgen@…, 9 years ago)

  • (a) /Users/girgen/Portfile.orig vs. (b) Portfile

    a b  
    3333
    3434configure.args      --with-apxs=${prefix}/apache2/bin/apxs
    3535
    36 set apachedir       apache2
     36set apacheconfdir   apache2/conf
     37set apachemoddir    apache2/modules
    3738
    3839if {[variant_isset universal]} {
    3940    patchfiles-append   configure_universal.patch
    … …  
    4546destroot {
    4647    # Install the connector for apache2
    4748    xinstall -m 755 -d \
    48         ${destroot}${prefix}/${apachedir}/modules \
    49         ${destroot}${prefix}/${apachedir}/conf
     49        ${destroot}${prefix}/${apachemoddir} \
     50        ${destroot}${prefix}/${apacheconfdir}
    5051
    5152    xinstall -m 644 \
    5253        ${worksrcpath}/apache-2.0/mod_jk.so \
    53         ${destroot}${prefix}/${apachedir}/modules
     54        ${destroot}${prefix}/${apachemoddir}
    5455
    5556    xinstall -m 644 ${worksrcpath}/../conf/workers.properties.minimal \
    56         ${destroot}${prefix}/${apachedir}/conf/workers.properties.sample
     57        ${destroot}${prefix}/${apacheconfdir}/workers.properties.sample
    5758}
    5859
    59 
    6060notes "\
    61 Example file ${prefix}/${apachedir}/conf/workers.properties.sample has been\
     61Example file ${prefix}/${apacheconfdir}/workers.properties.sample has been\
    6262installed to illustrate the use of the jk connector between apache2 and\
    6363tomcat.
    6464You will want to create a working copy of this file as workers.properties and\
    … …  
    6868    LoadModule jk_module modules/mod_jk.so"
    6969
    7070variant apache20 description "install for apache 2.0.x" {
    71     global apachedir
    72     set apachedir apache20
     71    global apacheconfdir
     72    global apachemoddir
     73    set apacheconfdir apache20/conf
     74    set apachemoddir  apache20/modules
    7375    depends_build-delete    path:apache2/bin/httpd:apache2
    7476    depends_build-append    path:apache20/bin/httpd:apache20
    7577    configure.args-delete   --with-apxs=${prefix}/apache2/bin/apxs
    7678    configure.args-append   --with-apxs=${prefix}/apache20/bin/apxs
    7779}
    7880
     81variant apache24 description "install for apache 2.4.x" {
     82    global apacheconfdir
     83    global apachemoddir
     84    set apacheconfdir etc/apache2
     85    set apachemoddir  lib/apache2/modules
     86    depends_build-delete    path:apache2/bin/httpd:apache2
     87    depends_build-append    path:bin/httpd:apache24-devel
     88    configure.args-delete   --with-apxs=${prefix}/apache2/bin/apxs
     89    configure.args-append   --with-apxs=${prefix}/bin/apxs
     90}
     91
    7992livecheck.type  regex
    8093livecheck.regex "tomcat-connectors-(\\d+\\.\\d+(\\.\\d+)?)-src.tar.gz"