4 files changed, 14 insertions, 10 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 58c47ea5ef5e..9567ad548d17 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.2.8
+PORTVERSION=	2.2.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index a703e0ebea62..89d2a935f84d 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache22/httpd-2.2.8.tar.bz2) = 76d2598a4797163d07cd50e5304aa7cd
-SHA256 (apache22/httpd-2.2.8.tar.bz2) = 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
-SIZE (apache22/httpd-2.2.8.tar.bz2) = 4799055
+MD5 (apache22/httpd-2.2.9.tar.bz2) = 3afa8137dc1999be695a20b62fdf032b
+SHA256 (apache22/httpd-2.2.9.tar.bz2) = d76599fbcf8b3bcff2779f880fb10e4a2bc4af60f64232083c06863e40850b61
+SIZE (apache22/httpd-2.2.9.tar.bz2) = 4943462
diff --git a/www/apache22/files/patch-srclib:apr-util:Makefile.in b/www/apache22/files/patch-srclib__arp-util__Makefile.in
index d0e295d2c6df..ee5df9074093 100644
--- a/www/apache22/files/patch-srclib:apr-util:Makefile.in
+++ b/www/apache22/files/patch-srclib__arp-util__Makefile.in
@@ -1,9 +1,9 @@
---- srclib/apr-util/Makefile.in.orig	Sun Nov 28 19:59:35 2004
-+++ srclib/apr-util/Makefile.in	Wed Feb 23 11:26:13 2005
-@@ -54,12 +54,11 @@
+--- srclib/apr-util/Makefile.in.orig	2008-05-23 00:37:47.000000000 +0200
++++ srclib/apr-util/Makefile.in	2008-06-12 16:33:33.000000000 +0200
+@@ -69,12 +69,11 @@
  	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
  
- install: $(TARGET_LIB) apu-config.out
+ install: $(TARGETS) install-modules
 -	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 +	$(APR_MKDIR) $(DESTDIR)$(includedir) \
  		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index df2682af47b9..8fa4f01fb04c 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -80,10 +80,12 @@ include/apache22/ap_release.h
 %%APR_PORTS%%include/apr-1/apr_ldap.h
 %%APR_PORTS%%include/apr-1/apr_ldap_init.h
 %%APR_PORTS%%include/apr-1/apr_ldap_option.h
+%%APR_PORTS%%include/apr-1/apr_ldap_rebind.h
 %%APR_PORTS%%include/apr-1/apr_ldap_url.h
 %%APR_PORTS%%include/apr-1/apr_lib.h
 %%APR_PORTS%%include/apr-1/apr_md4.h
 %%APR_PORTS%%include/apr-1/apr_md5.h
+%%APR_PORTS%%include/apr-1/apr_memcache.h
 %%APR_PORTS%%include/apr-1/apr_mmap.h
 %%APR_PORTS%%include/apr-1/apr_network_io.h
 %%APR_PORTS%%include/apr-1/apr_optional.h
@@ -107,6 +109,7 @@ include/apache22/ap_release.h
 %%APR_PORTS%%include/apr-1/apr_tables.h
 %%APR_PORTS%%include/apr-1/apr_thread_cond.h
 %%APR_PORTS%%include/apr-1/apr_thread_mutex.h
+%%APR_PORTS%%include/apr-1/apr_thread_pool.h
 %%APR_PORTS%%include/apr-1/apr_thread_proc.h
 %%APR_PORTS%%include/apr-1/apr_thread_rwlock.h
 %%APR_PORTS%%include/apr-1/apr_time.h
@@ -165,11 +168,11 @@ include/apache22/util_xml.h
 %%APR_PORTS%%lib/libapr-1.a
 %%APR_PORTS%%lib/libapr-1.la
 %%APR_PORTS%%lib/libapr-1.so
-%%APR_PORTS%%lib/libapr-1.so.2
+%%APR_PORTS%%lib/libapr-1.so.3
 %%APR_PORTS%%lib/libaprutil-1.a
 %%APR_PORTS%%lib/libaprutil-1.la
 %%APR_PORTS%%lib/libaprutil-1.so
-%%APR_PORTS%%lib/libaprutil-1.so.2
+%%APR_PORTS%%lib/libaprutil-1.so.3
 libexec/apache22/httpd.exp
 %%MOD_ACTIONS%%libexec/apache22/mod_actions.so
 %%MOD_ALIAS%%libexec/apache22/mod_alias.so
@@ -533,6 +536,7 @@ www/apache22/icons/world2.png
 @dirrm share/apache22/build
 @dirrm share/apache22
 %%APR_PORTS%%@dirrm include/apr-1
+%%APR_PORTS%%@dirrm lib/apr-util-1
 %%APR_PORTS%%@dirrm build-1
 @dirrmtry libexec/apache22
 @dirrmtry include/apache22