Ticket #12646: apache2-2.2.6.diff

Portfile

@@ -1 +1 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem       1.0
+
 name             apache2
-version          2.2.4
-revision         1
+version          2.2.6
 
 categories       www
 maintainers      imajes@macports.org
@@ -19 +19 @@
 
 master_sites     apache:httpd
 distname         httpd-${version}
-checksums        md5 536c86c7041515a25dd8bad3611da9a3
 use_bzip2        yes
 
+checksums        md5 203bea91715064f0c787f6499d33a377 \
+                 sha1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 \
+                                 rmd160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f
+
 depends_lib      port:apr \
                  port:apr-util \
                  port:expat \
@@ -75 +78 @@
 
 post-destroot {
         set confDir ${destroot}${prefix}/apache2/conf
-        file rename -force ${confDir}/httpd.conf ${confDir}/httpd.conf.sample
+        move -force ${confDir}/httpd.conf ${confDir}/httpd.conf.sample
 
         destroot.keepdirs ${destroot}${prefix}/apache2/logs
 
         # fix libtool path
         reinplace "s|/apache2/build/libtool|/share/apr-0/build/libtool|g" \
                 ${destroot}${prefix}/apache2/build/config_vars.mk
+
+        set docdir ${prefix}/share/doc/apache-${version}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 0644 -W ${worksrcpath} ABOUT_APACHE CHANGES LICENSE NOTICE README \
+                README.platforms ROADMAP VERSIONING ${destroot}${docdir}
 }
 
 variant openbsd {
@@ -119 +127 @@
 "\[ -r ${prefix}/apache2/logs/httpd.pid \] && ${prefix}/apache2/bin/apachectl stop > /dev/null"
 startupitem.restart     \
 "${prefix}/apache2/bin/apachectl restart > /dev/null"
+
+livecheck.check regex
+livecheck.url   ${homepage}
+livecheck.regex "Apache (\\d+(?:\\.\\d+)*) Released"
+