Index: files/patch-httpd.conf.in.diff
===================================================================
--- files/patch-httpd.conf.in.diff	(revision 0)
+++ files/patch-httpd.conf.in.diff	(working copy)
@@ -1,5 +1,5 @@
---- docs/conf/httpd.conf.in.orig  2005-12-05 13:41:59.000000000 -0500
-+++ docs/conf/httpd.conf.in       2005-12-05 13:42:11.000000000 -0500
+--- docs/conf/httpd.conf.in	2007-12-21 05:43:00.000000000 -0600
++++ docs/conf/httpd.conf.in	2008-02-06 14:10:15.000000000 -0600
 @@ -63,8 +63,8 @@
  # It is usually good practice to create a dedicated user and group for
  # running httpd, as with most system services.
@@ -8,5 +8,35 @@
 -Group daemon
 +User www
 +Group www
+ 
  </IfModule>
  </IfModule>
+@@ -168,14 +168,24 @@
+ </IfModule>
+ 
+ #
+-# The following lines prevent .htaccess and .htpasswd files from being 
+-# viewed by Web clients. 
++# The following lines prevent .htaccess, .htpasswd and .DS_Store files and
++# Mac resource forks and named forks from being viewed by Web clients.
+ #
+-<FilesMatch "^\.ht">
++<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+     Order allow,deny
+     Deny from all
+     Satisfy All
+-</FilesMatch>
++</Files>
++<Files "rsrc">
++    Order allow,deny
++    Deny from all
++    Satisfy All
++</Files>
++<DirectoryMatch ".*\.\.namedfork">
++    Order allow,deny
++    Deny from all
++    Satisfy All
++</DirectoryMatch>
+ 
+ #
+ # ErrorLog: The location of the error log file.
Index: files/patch-httpd-userdir.conf.in.diff
===================================================================
--- files/patch-httpd-userdir.conf.in.diff	(revision 0)
+++ files/patch-httpd-userdir.conf.in.diff	(revision 0)
@@ -0,0 +1,18 @@
+--- docs/conf/extra/httpd-userdir.conf.in	2007-03-07 01:33:58.000000000 -0600
++++ docs/conf/extra/httpd-userdir.conf.in	2008-02-06 14:23:42.000000000 -0600
+@@ -7,13 +7,13 @@
+ # directory if a ~user request is received.  Note that you must also set
+ # the default access control for these directories, as in the example below.
+ #
+-UserDir public_html
++UserDir Sites
+ 
+ #
+ # Control access to UserDir directories.  The following is an example
+ # for a site where these directories are restricted to read-only.
+ #
+-<Directory "/home/*/public_html">
++<Directory "/Users/*/Sites">
+     AllowOverride FileInfo AuthConfig Limit Indexes
+     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+     <Limit GET POST OPTIONS>
Index: Portfile
===================================================================
--- Portfile	(revision 33886)
+++ Portfile	(working copy)
@@ -4,6 +4,7 @@
 
 name             apache2
 version          2.2.8
+revision         1
 
 categories       www
 maintainers      imajes@macports.org
@@ -31,16 +32,8 @@
                  port:openssl \
                  port:pcre
 
-post-patch {
-    reinplace -E "s/(User|Group) daemon/\\1 www/" ${worksrcpath}/docs/conf/httpd.conf.in
-}
-
 platform darwin {
-	post-patch {
-		# Customize userdir naming to match darwin
-		reinplace "s|/home/|/Users/|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
-		reinplace "s|public_html|Sites|g" ${worksrcpath}/docs/conf/extra/httpd-userdir.conf.in
-	}
+	patchfiles-append patch-httpd.conf.in.diff patch-httpd-userdir.conf.in.diff
 }
 
 platform darwin 7 {