Changeset 86196


Ignore:
Timestamp:
Oct 21, 2011, 9:17:13 AM (8 years ago)
Author:
ryandesign@…
Message:

apache2:

  • fix build error "unable to infer tagged configuration" (#30566)
  • remove -arch flags and references to ccache from config files including those used by apxs which would cause things using apxs to possibly build wrong
  • re-enable ability to use ccache since this will no longer impact apxs (#21001)
  • treat envvars (#23561) and index.html (#22371) like config files: don't register them to the port because the user might modify them
  • remove pointless no_startupitem variant which had been added before the existence of launchd
Location:
trunk/dports/www/apache2
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/apache2/Portfile

    r84580 r86196  
    66name                apache2
    77version             2.2.21
     8revision            1
    89categories          www
    910maintainers         ryandesign openmaintainer
     
    3738conflicts           apache
    3839
    39 patchfiles          patch-docs-cgi-examples-printenv.diff
     40patchfiles          patch-docs-cgi-examples-printenv.diff \
     41                    libtool-tag.diff
    4042
    4143post-patch {
     
    8284                   --enable-proxy-ftp
    8385
    84 configure.ccache no
    85 
    8686post-configure {
    8787    # Setting DYLD_FALLBACK_LIBRARY_PATH instead of DYLD_LIBRARY_PATH
     
    8989    reinplace "s|DYLD_LIBRARY_PATH|DYLD_FALLBACK_LIBRARY_PATH|g" \
    9090        ${worksrcpath}/support/envvars-std
     91
     92    reinplace -E {s| -arch [a-z0-9_]+||g} \
     93        ${worksrcpath}/config.nice \
     94        ${worksrcpath}/build/config_vars.mk
     95    if {[tbool configure.ccache]} {
     96        reinplace -E {s|ccache ||g} \
     97            ${worksrcpath}/config.nice \
     98            ${worksrcpath}/build/config_vars.mk
     99    }
    91100}
    92101
     
    94103
    95104post-destroot {
    96     set confDir ${destroot}${prefix}/apache2/conf
    97     eval delete ${confDir}/httpd.conf [glob -directory ${confDir}/extra *.conf]
     105    set confDir ${destroot}${prefix}/${name}/conf
     106    eval delete ${destroot}${prefix}/${name}/bin/envvars \
     107                ${confDir}/httpd.conf \
     108                [glob -directory ${confDir}/extra *.conf]
    98109
    99     destroot.keepdirs ${destroot}${prefix}/apache2/logs \
     110    move ${destroot}${prefix}/${name}/htdocs/index.html ${destroot}${prefix}/${name}/htdocs/index.html.sample
     111
     112    destroot.keepdirs ${destroot}${prefix}/${name}/logs \
    100113                      ${confDir}/extra
    101114
    102115    # fix libtool path
    103     reinplace "s|/apache2/build/libtool|/share/apr-1/build/libtool|g" \
    104         ${destroot}${prefix}/apache2/build/config_vars.mk
     116    reinplace "s|/${name}/build/libtool|/share/apr-1/build/libtool|g" \
     117        ${destroot}${prefix}/${name}/build/config_vars.mk
    105118
    106119    set docdir ${prefix}/share/doc/apache-${version}
     
    111124
    112125post-activate {
    113     set confDir ${prefix}/apache2/conf
    114     # Make sure initial conf files are present and set up correctly
     126    set confDir ${prefix}/${name}/conf
     127    # Copy into place sample or default versions of files user is likely to modify
     128    if {![file exists ${prefix}/${name}/htdocs/index.html]} {
     129        file copy ${prefix}/${name}/htdocs/index.html.sample ${prefix}/${name}/htdocs/index.html
     130    }
     131    if {![file exists ${prefix}/${name}/bin/envvars]} {
     132        xinstall -m 755 ${prefix}/${name}/bin/envvars-std ${prefix}/${name}/bin/envvars
     133    }
    115134    if {![file exists ${confDir}/httpd.conf]} {
    116         file copy ${confDir}/original/httpd.conf \
    117              ${confDir}/httpd.conf
     135        file copy ${confDir}/original/httpd.conf ${confDir}/httpd.conf
    118136    }
    119137    foreach f [glob -tails -directory ${confDir}/original/extra *.conf] {
    120138        if {![file exists ${confDir}/extra/${f}]} {
    121             file copy ${confDir}/original/extra/${f} \
    122                  ${confDir}/extra/${f}
     139            file copy ${confDir}/original/extra/${f} ${confDir}/extra/${f}
    123140        }
    124141    }
     
    160177}
    161178
    162 variant no_startupitem description {Do not create a startup item} {
    163     startupitem.create    no
    164 }
    165 
    166179startupitem.create    yes
    167180startupitem.start    \
    168 "\[ -x ${prefix}/apache2/bin/apachectl \] && ${prefix}/apache2/bin/apachectl start > /dev/null"
     181"\[ -x ${prefix}/${name}/bin/apachectl \] && ${prefix}/${name}/bin/apachectl start > /dev/null"
    169182startupitem.stop    \
    170 "\[ -r ${prefix}/apache2/logs/httpd.pid \] && ${prefix}/apache2/bin/apachectl stop > /dev/null"
     183"\[ -r ${prefix}/${name}/logs/httpd.pid \] && ${prefix}/${name}/bin/apachectl stop > /dev/null"
    171184startupitem.restart    \
    172 "${prefix}/apache2/bin/apachectl restart > /dev/null"
     185"${prefix}/${name}/bin/apachectl restart > /dev/null"
    173186
    174187livecheck.type  regex
Note: See TracChangeset for help on using the changeset viewer.