Ticket #14069: apache2-2.2.8.diff

File apache2-2.2.8.diff, 2.4 KB (added by nox@…, 17 years ago)

  • files/patch-httpd-std.conf.in

     
    1 --- docs/conf/httpd.conf.in.orig  2005-12-05 13:41:59.000000000 -0500
    2 +++ docs/conf/httpd.conf.in       2005-12-05 13:42:11.000000000 -0500
    3 @@ -63,8 +63,8 @@
    4  # It is usually good practice to create a dedicated user and group for
    5  # running httpd, as with most system services.
    6  #
    7 -User daemon
    8 -Group daemon
    9 +User www
    10 +Group www
    11  </IfModule>
    12  </IfModule>

  • Portfile

     
    11# $Id$
    22
    3 PortSystem 1.0
     3PortSystem       1.0
     4
    45name             apache2
    5 version          2.2.6
     6version          2.2.8
    67
    78categories       www
    89maintainers      imajes@macports.org
    … …  
    1819
    1920master_sites     apache:httpd
    2021distname         httpd-${version}
    21 checksums        md5 203bea91715064f0c787f6499d33a377 \
    22                                  sha1 e6ef926ecd1f9a412af8c266239f0a6f58c63854
    2322use_bzip2        yes
    2423
     24checksums       md5 76d2598a4797163d07cd50e5304aa7cd \
     25                sha1 5074904435d3d942ce2dc96c44b07294b8eaca77 \
     26                rmd160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57
     27
    2528depends_lib      port:apr \
    2629                 port:apr-util \
    2730                 port:expat \
    2831                 port:openssl \
    2932                 port:pcre
    3033
    31 patchfiles       patch-httpd-std.conf.in
     34post-patch {
     35    reinplace -E "s/(User|Group) daemon/\\1 www/" ${worksrcpath}/docs/conf/httpd.conf.in
     36}
    3237
    3338platform darwin {
    3439        post-patch {
    … …  
    7984
    8085post-destroot {
    8186        set confDir ${destroot}${prefix}/apache2/conf
    82         file rename -force ${confDir}/httpd.conf ${confDir}/httpd.conf.sample
     87    move -force ${confDir}/httpd.conf ${confDir}/httpd.conf.sample
    8388
    8489        destroot.keepdirs ${destroot}${prefix}/apache2/logs
    8590
    8691        # fix libtool path
    87         reinplace "s|/apache2/build/libtool|/share/apr-0/build/libtool|g" \
     92    reinplace "s|/apache2/build/libtool|/share/apr-1/build/libtool|g" \
    8893                ${destroot}${prefix}/apache2/build/config_vars.mk
     94
     95    set docdir ${prefix}/share/doc/apache-${version}
     96    xinstall -d ${destroot}${docdir}
     97    xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
     98        README.platforms ROADMAP VERSIONING ${destroot}${docdir}
    8999}
    90100
    91101variant openbsd {