Index: Makefile
===================================================================
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.22
diff -N -u Makefile
--- Makefile	1 Dec 2009 13:38:23 -0000	1.22
+++ Makefile	11 Mar 2010 23:26:21 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=	apache HTTP server
 
-V=		2.2.14
+V=		2.2.15
 PKGNAME=	apache-httpd-${V}
 DISTNAME=	httpd-${V}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/apache-httpd/distinfo,v
retrieving revision 1.9
diff -N -u distinfo
--- distinfo	1 Dec 2009 13:38:23 -0000	1.9
+++ distinfo	11 Mar 2010 23:26:21 -0000
@@ -1,5 +1,5 @@
-MD5 (httpd-2.2.14.tar.gz) = LB48e6ALyqAWPaez5mqqHg==
-RMD160 (httpd-2.2.14.tar.gz) = 4sfk+Uii5WkNewlVIqKM+7dMG80=
-SHA1 (httpd-2.2.14.tar.gz) = 5uILP8WKV6URbgNuMb+X1AnbfPo=
-SHA256 (httpd-2.2.14.tar.gz) = 1XkoCedmfHhABShPr+KKVcuJvUz76ko087jlbBDWc8g=
-SIZE (httpd-2.2.14.tar.gz) = 6684081
+MD5 (httpd-2.2.15.tar.gz) = MfoCLcPAkIxuqv5zyBxl3w==
+RMD160 (httpd-2.2.15.tar.gz) = OUj1YdwjI2iVZ6k3Z7lY2ecX+ZM=
+SHA1 (httpd-2.2.15.tar.gz) = GnUaq0Q8527eIzttM1EiPpyVFvI=
+SHA256 (httpd-2.2.15.tar.gz) = T4eSUek46B+v7avJRoMaUBtx3cM8uKmtSplPziM/KBs=
+SIZE (httpd-2.2.15.tar.gz) = 6593633
Index: patches/patch-config_layout
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-config_layout,v
retrieving revision 1.5
diff -N -u patches/patch-config_layout
--- patches/patch-config_layout	9 Jan 2007 10:47:37 -0000	1.5
+++ patches/patch-config_layout	11 Mar 2010 23:26:21 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-config_layout,v 1.5 2007/01/09 10:47:37 dlg Exp $
---- config.layout.orig	Tue Jan  9 06:59:42 2007
-+++ config.layout	Tue Jan  9 07:00:28 2007
+--- config.layout.orig	Mon Nov 22 05:50:36 2004
++++ config.layout	Fri Mar 12 10:18:40 2010
 @@ -252,26 +252,26 @@
  
  #   OpenBSD Layout
@@ -8,7 +8,7 @@
 -    prefix:        /var/www
 -    exec_prefix:   /usr
 +    prefix:        /var/apache2
-+    exec_prefix:   %%PREFIX%%
++    exec_prefix:   /usr/local
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
@@ -29,7 +29,7 @@
 -    runtimedir:    ${prefix}/logs
 -    logfiledir:    ${prefix}/logs
 -    proxycachedir: ${prefix}/proxy
-+    sysconfdir:    %%CONFDIR%%
++    sysconfdir:    /etc/apache2
 +    installbuilddir: ${exec_prefix}/share/apache2/build
 +    errordir:      ${datadir}/error
 +    iconsdir:      ${datadir}/icons
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-configure,v
retrieving revision 1.7
diff -N -u patches/patch-configure
--- patches/patch-configure	1 Dec 2009 13:38:23 -0000	1.7
+++ patches/patch-configure	11 Mar 2010 23:26:21 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-configure,v 1.7 2009/12/01 13:38:23 bernd Exp $
---- configure.orig	Thu Sep 24 01:29:56 2009
-+++ configure	Fri Oct  9 11:52:03 2009
-@@ -3097,7 +3097,7 @@ do
+--- configure.orig	Tue Mar  2 16:34:50 2010
++++ configure	Fri Mar 12 10:18:40 2010
+@@ -2828,7 +2828,7 @@ do
    ap_last="${ap_cur}"
    ap_cur=`eval "echo ${ap_cur}"`
  done
 -exp_sysconfdir="${ap_cur}"
-+exp_sysconfdir=%%CONFDIR%%
++exp_sysconfdir=/etc/apache2
  
  
    APACHE_VAR_SUBST="$APACHE_VAR_SUBST exp_sysconfdir"
-@@ -4077,7 +4077,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
+@@ -3831,7 +3831,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
  APR_BINDIR=`$apr_config --bindir`
  APR_INCLUDEDIR=`$apr_config --includedir`
  APR_VERSION=`$apr_config --version`
@@ -19,7 +19,7 @@
  
  echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
  
-@@ -4384,7 +4384,7 @@ fi
+@@ -4150,7 +4150,7 @@ fi
  APU_BINDIR=`$apu_config --bindir`
  APU_INCLUDEDIR=`$apu_config --includedir`
  APU_VERSION=`$apu_config --version`
Index: patches/patch-support_apxs_in
===================================================================
RCS file: /cvs/ports/www/apache-httpd/patches/patch-support_apxs_in,v
retrieving revision 1.1
diff -N -u patches/patch-support_apxs_in
--- patches/patch-support_apxs_in	16 Jan 2007 01:12:26 -0000	1.1
+++ patches/patch-support_apxs_in	11 Mar 2010 23:26:21 -0000
@@ -1,14 +1,14 @@
 $OpenBSD: patch-support_apxs_in,v 1.1 2007/01/16 01:12:26 deanna Exp $
---- support/apxs.in.orig	Tue Jul 11 23:38:44 2006
-+++ support/apxs.in	Sun Jan 14 20:22:59 2007
+--- support/apxs.in.orig	Wed Jul 12 13:38:44 2006
++++ support/apxs.in	Fri Mar 12 10:18:40 2010
 @@ -645,13 +645,13 @@ __DATA__
  ##
  
  builddir=.
 -top_srcdir=%PREFIX%
 -top_builddir=%PREFIX%
-+top_srcdir=%%PREFIX%%/share/apache2
-+top_builddir=%%PREFIX%%/share/apache2
++top_srcdir=/usr/local/share/apache2
++top_builddir=/usr/local/share/apache2
  include %INSTALLBUILDDIR%/special.mk
  
  #   the used tools
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/apache-httpd/pkg/PLIST,v
retrieving revision 1.17
diff -N -u pkg/PLIST
--- pkg/PLIST	1 Dec 2009 13:38:23 -0000	1.17
+++ pkg/PLIST	11 Mar 2010 23:26:21 -0000
@@ -99,6 +99,7 @@
 lib/apache2/mod_proxy_ftp.so
 lib/apache2/mod_proxy_http.so
 lib/apache2/mod_proxy_scgi.so
+lib/apache2/mod_reqtimeout.so
 lib/apache2/mod_rewrite.so
 lib/apache2/mod_setenvif.so
 lib/apache2/mod_speling.so
@@ -607,6 +608,8 @@
 share/doc/apache2/mod/mod_proxy_http.html.en
 share/doc/apache2/mod/mod_proxy_scgi.html
 share/doc/apache2/mod/mod_proxy_scgi.html.en
+share/doc/apache2/mod/mod_reqtimeout.html
+share/doc/apache2/mod/mod_reqtimeout.html.en
 share/doc/apache2/mod/mod_rewrite.html
 share/doc/apache2/mod/mod_rewrite.html.en
 share/doc/apache2/mod/mod_setenvif.html