56 files changed, 82 insertions, 67 deletions

diff --git a/MOVED b/MOVED
index 91ef49a64988..0843a24e9d93 100644
--- a/MOVED
+++ b/MOVED
@@ -1986,3 +1986,4 @@ www/firefox-devel|www/firefox|2005-11-29|Firefox 1.5 is now stable
 japanese/uim|textproc/uim|2005-11-30|new category
 www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory
 devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package
+www/apache2|www/apache20|2005-12-03|renamed for consistency with other apache ports
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index f6c43b68aa33..72b9cbffc49e 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -34,7 +34,7 @@ AP_PORT_IS_MODULE=	YES
 #### for backward compatibility
 .elif ${USE_APACHE:L} == yes
 .   if defined(WITH_APACHE2)
-APACHE_PORT?=	www/apache2
+APACHE_PORT?=	www/apache20
 .   else
 APACHE_PORT?=	www/apache13
 .   endif
@@ -293,9 +293,7 @@ IGNORE?=	PREFIX must be egal to APXS_PREFIX.
 AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache2" \
 			APACHEINCLUDEDIR="include/apache2"
-# XXX We postpone www/apache2 => www/apache20 migration
-#APACHE_PORT=	www/apache${APACHE_VERSION}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache${APACHE_VERSION}
 .elif ${APACHE_VERSION} >= "21"
 AP_BUILDEXT=	la
 PLIST_SUB+=	APACHEMODDIR="libexec/apache${APACHE_VERSION}" \
@@ -307,6 +305,7 @@ PLIST_SUB+=	APACHEMODDIR="libexec/apache" \
 			APACHEINCLUDEDIR="include/apache"
 APACHE_PORT?= www/apache13
 .endif
+
 .for VAR in ${OVERRIDABLE_VARS}
 .  if defined(AP${APACHE_VERSION}_${VAR})
 ${VAR} =${AP${APACHE_VERSION}_${VAR}}
diff --git a/UPDATING b/UPDATING
index d56099e9b36c..0e87f48f4604 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,21 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20051203:
+  AFFECTS: users of www/apache2
+  AUTHOR: clement@FreeBSD.org
+
+  www/apache2 port directory was renamed to www/apache20 to keep
+  consistency with other apache ports.
+
+20051203:
+  AFFECTS: users of www/apache22 and any web apps porters
+  AUTHOR: clement@FreeBSD.org
+
+  www/apache22 stop supporting ${LOCALBASE}/www/(data|error|cgi)(|-dist)
+  directory layout in favor of ${LOCALBASE}/www/apache22/(data|error|cgi).
+  FYI, ports layout may change soon.
+
 20051202:
   AFFECTS: users of www/plone and cmf oriented zope modules
   AUTHOR: filippo.natali@gmail.com
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 92d8a9ae23b9..3d52495f7306 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -17,7 +17,7 @@ COMMENT=		Gnatsweb, a GNATS web interface
 RUN_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
 .ifdef WITH_APACHE2
-RUN_DEPENDS+=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
+RUN_DEPENDS+=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
 .endif
 
 USE_PERL5_RUN=		yes
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 3cc9a3f6ef75..0b36113d24bb 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -155,7 +155,7 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
@@ -263,11 +263,11 @@ pre-extract:
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 3cc9a3f6ef75..0b36113d24bb 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -155,7 +155,7 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
@@ -263,11 +263,11 @@ pre-extract:
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 3cc9a3f6ef75..0b36113d24bb 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -155,7 +155,7 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
@@ -263,11 +263,11 @@ pre-extract:
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 3cc9a3f6ef75..0b36113d24bb 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -155,7 +155,7 @@ SVNGROUP?=	svn
 .endif
 
 .if defined(WITH_APACHE2_APR)
-APACHE2_PORT?=	www/apache2
+APACHE2_PORT?=	www/apache20
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 .if ${APACHE2_PORT} == "www/apache21"
@@ -263,11 +263,11 @@ pre-extract:
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from www/apache2.  If you have the devel/apr"
+	@${ECHO_MSG} "Using APR from www/apache20.  If you have the devel/apr"
 	@${ECHO_MSG} "port/package installed, you may need to remove it."
 .else
 	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the www/apache2 port, rather than the devel/apr port,"
+	@${ECHO_MSG} "the www/apache20 port, rather than the devel/apr port,"
 	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
 .endif
 	@${ECHO_MSG} ""
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index cfe25a152aae..8abd4e26b7cd 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -131,7 +131,7 @@ APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp4.so
 .if ${APACHE_MPM} == "worker"
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index b8c64b12ed6d..77c8c1e5e793 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -128,7 +128,7 @@ APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index b8c64b12ed6d..77c8c1e5e793 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -128,7 +128,7 @@ APACHE_MPM!=	${APXS} -q MPM_NAME
 .endif
 .if defined(WITH_APACHE2)
 APACHE_MPM?=	${WITH_MPM}
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 SAPI_FILE=	libexec/apache2/libphp5.so
 .if ${APACHE_MPM} == "worker"
diff --git a/misc/linux-opengroupware/Makefile b/misc/linux-opengroupware/Makefile
index 0e5e5633f5c9..7934c677d2cc 100644
--- a/misc/linux-opengroupware/Makefile
+++ b/misc/linux-opengroupware/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	frank@opengroupware.org
 COMMENT=	Groupware package including mail, calendar, palm sync and much more
 
 EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20 \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake
 
diff --git a/net/xbone-gui/Makefile b/net/xbone-gui/Makefile
index 0b1c219e18b2..465b3bcf4344 100644
--- a/net/xbone-gui/Makefile
+++ b/net/xbone-gui/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-S
 		${SITE_PERL}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay \
 		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail\
 		${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6\
-		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
 		${SITE_PERL}/${PERL_ARCH}/APR.pm:${PORTSDIR}/www/mod_perl2 \
 		${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk \
 		${SITE_PERL}/Tk/Getopt.pm:${PORTSDIR}/x11-toolkits/p5-Tk-Getopt \
diff --git a/www/Makefile b/www/Makefile
index dc46a284cedb..0003a285709f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -27,7 +27,7 @@
     SUBDIR += apache13-modssl
     SUBDIR += apache13-modssl+ipv6
     SUBDIR += apache13-ssl
-    SUBDIR += apache2
+    SUBDIR += apache20
     SUBDIR += apache21
     SUBDIR += apache22
     SUBDIR += arena
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index cb313aaa5ed2..d9eb5b76a727 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -144,7 +144,7 @@ WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
 WANT_APACHE=	common21
-.include "${APACHEDIR}/../apache2/Makefile.modules.3rd"
+.include "${APACHEDIR}/../apache20/Makefile.modules.3rd"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
diff --git a/www/dpsearch/Makefile b/www/dpsearch/Makefile
index 7d4b9d597be1..bb559dc20413 100644
--- a/www/dpsearch/Makefile
+++ b/www/dpsearch/Makefile
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=--enable-idn
 
 .if defined(WITH_DPSEARCH_APACHE)
 .if defined (WITH_APACHE2)
-BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2
+BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20
 .else
 BUILD_DEPEND+=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13
 .endif
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index c985bc124690..de2628e10d5f 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_APACHE=	yes
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 gconf2
 USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/www/mod_access_identd/Makefile b/www/mod_access_identd/Makefile
index bbebea2961cf..fb26bf1cc1cf 100644
--- a/www/mod_access_identd/Makefile
+++ b/www/mod_access_identd/Makefile
@@ -19,5 +19,5 @@ AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index 22f31a8d6471..cf9d3a7e9bca 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -27,7 +27,7 @@ AP_GENPLIST=	YES
 PORTDOCS=		HACKING LICENSE.txt ChangeLog README TODO mod_access_referer.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/mod_accesscookie/Makefile b/www/mod_accesscookie/Makefile
index 6b76fb3600a9..f14f6a08f81b 100644
--- a/www/mod_accesscookie/Makefile
+++ b/www/mod_accesscookie/Makefile
@@ -24,7 +24,7 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/www/mod_auth_any/Makefile b/www/mod_auth_any/Makefile
index 17b25e0685f9..abaae7f1ef0c 100644
--- a/www/mod_auth_any/Makefile
+++ b/www/mod_auth_any/Makefile
@@ -26,5 +26,5 @@ AP_INC+=	. -DWITH_APACHE2=1
 WANT_APACHE=	13
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff --git a/www/mod_auth_cookie_mysql/Makefile b/www/mod_auth_cookie_mysql/Makefile
index b18f8d29271e..379cf923b09b 100644
--- a/www/mod_auth_cookie_mysql/Makefile
+++ b/www/mod_auth_cookie_mysql/Makefile
@@ -26,7 +26,7 @@ AP_INC?=	${LOCALBASE}/include/mysql
 AP_LIB?=	${LOCALBASE}/lib/mysql -lmysqlclient -lz
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@(cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so)
 .if !defined(NOPORTDOCS)
diff --git a/www/mod_auth_cookie_mysql2/Makefile b/www/mod_auth_cookie_mysql2/Makefile
index 7ce0b632bbea..93f1a74aeb4d 100644
--- a/www/mod_auth_cookie_mysql2/Makefile
+++ b/www/mod_auth_cookie_mysql2/Makefile
@@ -27,7 +27,7 @@ AP_LIB?=	${LOCALBASE}/lib/mysql -lmysqlclient -lz
 PORTDOCS=	mod_auth_cookie_mysql.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index 2cd40568310e..3ac40ed73966 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -22,7 +22,7 @@ SHORTMODNAME=	external_auth
 PORTDOCS=	AUTHENTICATORS INSTALL README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_auth_imap/Makefile b/www/mod_auth_imap/Makefile
index e2941d2192ea..4d829c8065b8 100644
--- a/www/mod_auth_imap/Makefile
+++ b/www/mod_auth_imap/Makefile
@@ -21,7 +21,7 @@ AP_GENPLIST=	YES
 PORTDOCS=	htaccess-example httpd.conf-append-example
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index bf7530e14c59..fae0df18b7a1 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -29,7 +29,7 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 PORTDOCS=	INSTALL example_data.html htpasswd.sql
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index 05bc7b50025c..cb09585dc20f 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -37,5 +37,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff --git a/www/mod_auth_pam2/Makefile b/www/mod_auth_pam2/Makefile
index 584eeee86838..6e851358c890 100644
--- a/www/mod_auth_pam2/Makefile
+++ b/www/mod_auth_pam2/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PAM modules for user authentication
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	mod_auth_pam2
diff --git a/www/mod_auth_pgsql2/Makefile b/www/mod_auth_pgsql2/Makefile
index ad523b7cd998..1b9c10fd40fe 100644
--- a/www/mod_auth_pgsql2/Makefile
+++ b/www/mod_auth_pgsql2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users to use PostgreSQL databases for user authentication
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PGSQL=	yes
diff --git a/www/mod_auth_useragent/Makefile b/www/mod_auth_useragent/Makefile
index a7bdb66e7968..c939fc3f1939 100644
--- a/www/mod_auth_useragent/Makefile
+++ b/www/mod_auth_useragent/Makefile
@@ -20,7 +20,7 @@ AP_GENPLIST=	yes
 PORTDOCS=	README faq.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index 228593b69e51..d34f9f53402c 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -24,7 +24,7 @@ SRC_FILE=	bw_mod-0.6.c
 PORTDOCS=	APACHE2-LICENSE LICENSE bw_mod-0.6.txt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && \
diff --git a/www/mod_cband/Makefile b/www/mod_cband/Makefile
index 92072e5009f6..8bed17b12ed0 100644
--- a/www/mod_cband/Makefile
+++ b/www/mod_cband/Makefile
@@ -23,7 +23,7 @@ ALL_TARGET=	#
 PORTDOCS=	libpatricia.copyright
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/libpatricia.copyright ${DOCSDIR}
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index 79a5380d433a..53c369546ec6 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	AUTHORS cfg_ldap.conf ChangeLog COPYING INSTALL \
 		mod_cfg_ldap.schema README TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
diff --git a/www/mod_chroot/Makefile b/www/mod_chroot/Makefile
index 146f1a7afcb1..3c7eeb3bb2d6 100644
--- a/www/mod_chroot/Makefile
+++ b/www/mod_chroot/Makefile
@@ -18,7 +18,7 @@ AP_FAST_BUILD=	YES
 AP_GENPLIST=	YES
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_curb/Makefile b/www/mod_curb/Makefile
index 3dd83b19c7ff..30a1bcc6c1fb 100644
--- a/www/mod_curb/Makefile
+++ b/www/mod_curb/Makefile
@@ -22,7 +22,7 @@ AP_GENPLIST=	YES
 PORTDOCS=	README
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_dosevasive20/Makefile b/www/mod_dosevasive20/Makefile
index 4b6a844c3871..33fed2ee2af4 100644
--- a/www/mod_dosevasive20/Makefile
+++ b/www/mod_dosevasive20/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/mod_dosevasive
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
diff --git a/www/mod_evasive/Makefile b/www/mod_evasive/Makefile
index 4b6a844c3871..33fed2ee2af4 100644
--- a/www/mod_evasive/Makefile
+++ b/www/mod_evasive/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/mod_dosevasive
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
diff --git a/www/mod_evasive20/Makefile b/www/mod_evasive20/Makefile
index 4b6a844c3871..33fed2ee2af4 100644
--- a/www/mod_evasive20/Makefile
+++ b/www/mod_evasive20/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/mod_dosevasive
 PORTDOCS=	LICENSE README test.pl
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \
diff --git a/www/mod_injection/Makefile b/www/mod_injection/Makefile
index cd963f69bcee..44a6a7138987 100644
--- a/www/mod_injection/Makefile
+++ b/www/mod_injection/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://pmade.org/distfiles/oss-releases/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Injects text in the HTTP response after a HTML tag
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 APXS?=		${LOCALBASE}/sbin/apxs
diff --git a/www/mod_log_config-st/Makefile b/www/mod_log_config-st/Makefile
index f9a335ebe96d..9f5b579780be 100644
--- a/www/mod_log_config-st/Makefile
+++ b/www/mod_log_config-st/Makefile
@@ -23,7 +23,7 @@ SHORTMODNAME=	log_config
 MODULENAME=	mod_log_config-st
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 	@${CAT} ${PKGMESSAGE}
 .include <bsd.port.post.mk>
diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index 00c8753640f0..6006732d1031 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -26,5 +26,5 @@ AP_INC+=	${LOCALBASE}/include/mysql
 AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff --git a/www/mod_log_sql2/Makefile b/www/mod_log_sql2/Makefile
index 4f8444e08675..3de3a55035ff 100644
--- a/www/mod_log_sql2/Makefile
+++ b/www/mod_log_sql2/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql"
 CONFIGURE_ARGS+=	--with-dbi=${LOCALBASE}
 LIB_DEPENDS+=		dbi.0:${PORTSDIR}/databases/libdbi
 .endif
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .   if ${AP_VER} == 13
 WITHOUT_SSL=	YES
 .   endif
diff --git a/www/mod_macro/Makefile b/www/mod_macro/Makefile
index 87548fdd6b32..6cf88a0d57e3 100644
--- a/www/mod_macro/Makefile
+++ b/www/mod_macro/Makefile
@@ -20,7 +20,7 @@ AP_GENPLIST=	YES
 PORTDOCS=	${PORTNAME}.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/mod_macro2/Makefile b/www/mod_macro2/Makefile
index a541ff140f9e..f3b929781aa4 100644
--- a/www/mod_macro2/Makefile
+++ b/www/mod_macro2/Makefile
@@ -20,7 +20,7 @@ AP_GENPLIST=	YES
 PORTDOCS=	${PORTNAME}.html
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_musicindex/Makefile b/www/mod_musicindex/Makefile
index 5b76f73cf203..31b104b62264 100644
--- a/www/mod_musicindex/Makefile
+++ b/www/mod_musicindex/Makefile
@@ -31,7 +31,7 @@ WRKSRC=		${WRKDIR}/libapache-mod-musicindex-${PORTVERSION}
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 MAKE_ENV+=	APXS=${APXS} CPPFLAGS="${CPPFLAGS}" LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/mod_rpaf/Makefile b/www/mod_rpaf/Makefile
index 1a19a4f6e42b..5f624744df9a 100644
--- a/www/mod_rpaf/Makefile
+++ b/www/mod_rpaf/Makefile
@@ -20,5 +20,5 @@ AP2_SRC_FILE=	mod_rpaf-2.0.c
 AP2_PKGNAMESUFFIX=	-ap2
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index 293fa92a4211..31dffb9063f5 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -26,7 +26,7 @@ PLIST_FILES=	${DOCSDIR:S/${PREFIX}\///}/LICENSE
 PLIST_DIRS=	${DOCSDIR:S/${PREFIX}\///}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/www/mod_traf_thief/Makefile b/www/mod_traf_thief/Makefile
index a4c877dbd968..58923d4b2b33 100644
--- a/www/mod_traf_thief/Makefile
+++ b/www/mod_traf_thief/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows you to redirect part of the traffic to your url
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 RESTRICTED=	No licence
diff --git a/www/mod_transform/Makefile b/www/mod_transform/Makefile
index b902ae71abe5..71e771ed5b8e 100644
--- a/www/mod_transform/Makefile
+++ b/www/mod_transform/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	http://www.outoforder.cc/downloads/mod_transform/
 MAINTAINER=	stan@stormier.net
 COMMENT=	An XSLT and XIncludes Filter module for Apache 2.0
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache200
 
 HAS_CONFIGURE=	yes
 USE_GNOME=	libxslt
diff --git a/www/mod_v2h/Makefile b/www/mod_v2h/Makefile
index af3296a4a7d9..19b69091072b 100644
--- a/www/mod_v2h/Makefile
+++ b/www/mod_v2h/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	mod_v2h
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	A mass virtual hosting module for Apache with support
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+BUILD_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache200 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-2
diff --git a/www/mod_vdbh/Makefile b/www/mod_vdbh/Makefile
index f3d3962ed40c..6bb500bc7902 100644
--- a/www/mod_vdbh/Makefile
+++ b/www/mod_vdbh/Makefile
@@ -26,7 +26,7 @@ AP_LIB+=	${LOCALBASE}/lib/mysql -lmysqlclient
 PORTDOCS=	AUTHORS README TODO
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile
index 386c850b38d2..3b19e4e993ae 100644
--- a/www/mod_vhost_ldap/Makefile
+++ b/www/mod_vhost_ldap/Makefile
@@ -31,7 +31,7 @@ IGNORE=		Requires support of LDAP in apache 2.0.x port
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache200/Makefile.modules.3rd"
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/www/mod_vhs/Makefile b/www/mod_vhs/Makefile
index 93033c5cac03..598bdc3102c4 100644
--- a/www/mod_vhs/Makefile
+++ b/www/mod_vhs/Makefile
@@ -38,7 +38,7 @@ PORTDOCS=	ChangeLog AUTHORS README.logs README.wildcards WARNING \
 		WARNING.THREADS README.phpopt
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 
 post-install:
 .if !defined (NOPORTDOCS)
diff --git a/www/resin2/Makefile b/www/resin2/Makefile
index a0d9366cc036..729a12568cf0 100644
--- a/www/resin2/Makefile
+++ b/www/resin2/Makefile
@@ -71,7 +71,7 @@ PLIST_SUB+=		APACHE=""
 #
 # Apache 2
 #
-BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache20
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache2
 # Allow apxs invocations
diff --git a/www/resin3/Makefile b/www/resin3/Makefile
index db8ea5f553f1..573ba9075fe4 100644
--- a/www/resin3/Makefile
+++ b/www/resin3/Makefile
@@ -74,7 +74,7 @@ PLIST_SUB+=		APACHE=""
 #
 # Apache 2
 #
-BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache2
+BUILD_DEPENDS+=		${APXS}:${PORTSDIR}/www/apache20
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 PLIST_SUB+=		MOD_DIR=libexec/apache2
 # Allow apxs invocations
diff --git a/www/suphp/Makefile b/www/suphp/Makefile
index 4d715d38d3ec..4bb44e4937e6 100644
--- a/www/suphp/Makefile
+++ b/www/suphp/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--with-setid-mode=${WITH_SETID_MODE}
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/apache2/apr.h) || defined(WITH_APACHE2)
-APACHE_PORT=	www/apache2
+APACHE_PORT=	www/apache20
 PLIST_SUB+=	MODULEDIR="libexec/apache2/"
 .else
 PLIST_SUB+=	MODULEDIR="libexec/apache/"