[33568] trunk/dports/www/apache2

[nox at macports.org]

Revision: 33568
          http://trac.macosforge.org/projects/macports/changeset/33568
Author:   nox at macports.org
Date:     2008-01-30 05:57:16 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
apache2 (closes #14069):
 * Updated to 2.2.8.
 * Fixed apr build libtool path, apr-0 is the apr0 port's one.
 * The config patch is now a simple reinplace call.

Modified Paths:
--------------
    trunk/dports/www/apache2/Portfile

Removed Paths:
-------------
    trunk/dports/www/apache2/files/

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2008-01-30 13:53:54 UTC (rev 33567)
+++ trunk/dports/www/apache2/Portfile	2008-01-30 13:57:16 UTC (rev 33568)
@@ -1,8 +1,9 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem       1.0
+
 name             apache2
-version          2.2.6
+version          2.2.8
 
 categories       www
 maintainers      imajes at macports.org
@@ -18,17 +19,21 @@
 
 master_sites     apache:httpd
 distname         httpd-${version}
-checksums        md5 203bea91715064f0c787f6499d33a377 \
-				 sha1 e6ef926ecd1f9a412af8c266239f0a6f58c63854
 use_bzip2        yes
 
+checksums       md5 76d2598a4797163d07cd50e5304aa7cd \
+                sha1 5074904435d3d942ce2dc96c44b07294b8eaca77 \
+                rmd160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57
+
 depends_lib      port:apr \
                  port:apr-util \
                  port:expat \
                  port:openssl \
                  port:pcre
 
-patchfiles       patch-httpd-std.conf.in 
+post-patch {
+    reinplace -E "s/(User|Group) daemon/\\1 www/" ${worksrcpath}/docs/conf/httpd.conf.in
+}
 
 platform darwin {
 	post-patch {
@@ -79,13 +84,18 @@
 
 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" \
+    reinplace "s|/apache2/build/libtool|/share/apr-1/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 {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080130/3d40f27c/attachment.html