- Sync with www/apache2

5 files changed, 19 insertions, 12 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index b76c53bbbb43..0873160a4f3a 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.0.53
+PORTVERSION=	2.0.54
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
@@ -35,7 +35,12 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 .if defined (WITH_WINDOWSUPDATEFIX)
 EXTRA_PATCHES+=		${FILESDIR}/exp-windowsupdate.patch
 .endif
+
 .if defined(WITH_EXPERIMENTAL_PATCHES)
+IGNORE=		: Please define WITH_KQUEUE_SUPPORT instead
+.endif
+
+.if defined(WITH_KQUEUE_SUPPORT)
 EXTRA_PATCHES+=		${FILESDIR}/exp-apr-kqueue.patch
 .endif
 
diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc
index 2927d4a83f9d..d12c49ff82d8 100644
--- a/www/apache20/Makefile.doc
+++ b/www/apache20/Makefile.doc
@@ -73,8 +73,10 @@
 ##                                [cgi|errordocs|icons|wwwdata]
 ##
 ##  Optionnal patches:  
-##      WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported
-##                                from apr/httpd CVS)
+#      WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported
+#                                from apr/httpd CVS)
+#
+##      WITH_KQUEUE_SUPPORT       Add kqueue support to apr/httpd
 ##      WITH_WINDOWSUPDATEFIX     Add a fix to use apache as proxy with 
 ##                                Windows Update service.
 ##
diff --git a/www/apache20/Makefile.modules.3rd b/www/apache20/Makefile.modules.3rd
index cec8b9884052..6305ceffd39c 100644
--- a/www/apache20/Makefile.modules.3rd
+++ b/www/apache20/Makefile.modules.3rd
@@ -18,14 +18,14 @@ OVERRIDABLE_VARS=	SRC_FILE MODULENAME SHORTMODNAME WRKSRC \
 			PKGNAMESUFFIX
 
 
-.if exists(${APXS_PREFIX}/include/apache2/http_core.h)
+.if exists(${LOCALBASE}/include/apache2/http_core.h)
 WITH_APACHE2=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 13
 IGNORE=		"This module require apache13 and you have apache2 installed"
 .     endif
 .   endif
-.elif exists(${APXS_PREFIX}/include/apache/http_core.h)
+.elif exists(${LOCALBASE}/include/apache/http_core.h)
 WITH_APACHE13=	YES
 .   if defined (WANT_APACHE)
 .     if ${WANT_APACHE} == 2
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 54fcea96b8b1..db2dc3f33270 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1,4 +1,4 @@
-MD5 (apache2/httpd-2.0.53.tar.bz2) = 94f3a793fb1665365724943206cce23f
-SIZE (apache2/httpd-2.0.53.tar.bz2) = 5079345
+MD5 (apache2/httpd-2.0.54.tar.bz2) = 4ae8a38c6b5db9046616ce10a0d551a2
+SIZE (apache2/httpd-2.0.54.tar.bz2) = 5566979
 MD5 (apache2/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
 SIZE (apache2/powerlogo.gif) = 5279
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index 89048db49d3b..e9344df7a041 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Wed Nov 24 20:31:09 2004
-+++ Makefile.in	Sat Feb  5 12:04:56 2005
++++ Makefile.in	Sun Apr 17 10:22:37 2005
 @@ -31,15 +31,21 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -78,7 +78,7 @@
 +	@test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
 +	@test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
 +	@test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
-+	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find -name "CVS" -print | xargs rm -rf
++	-@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name ".svn" -print | xargs rm -rf
 +.endif
 +  
  install-error:
@@ -95,7 +95,7 @@
 +	@echo Installing error documents
 +	@test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
 +	cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
-+	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	-@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name ".svn" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
 +.endif
 +  
@@ -113,7 +113,7 @@
 +	@echo Installing icons
 +	@test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
 +	cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
-+	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	-@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name ".svn" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
 +.endif 
 +  
@@ -130,7 +130,7 @@
 +	@echo Installing CGIs
 +	@test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
 +	cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
-+	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf 
++	-@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name ".svn" -print | xargs rm -rf 
 +	@test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
 +.endif