Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.511
diff -u -r1.511 bsd.port.mk
--- Mk/bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
+++ Mk/bsd.port.mk	22 May 2005 08:49:53 -0000
@@ -400,7 +400,7 @@
 # USE_APACHE	- If set, this port relies on an apache webserver.
 # APACHE_PORT	- CATEGORY and portname of the prefered port for apache.
 #				  Default: www/apache13
-#				  If WITH_APACHE2 is defined defaults to www/apache2
+#				  If WITH_APACHE2 is defined defaults to www/apache20
 # APXS			- Full path to the prefered apxs binary to configure
 #				  apache modules.
 #				  Default: ${LOCALBASE}/sbin/apxs
@@ -1214,7 +1214,7 @@
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	www/apache2
+APACHE_PORT?=	www/apache20
 .else
 APACHE_PORT?=	www/apache13
 .endif
Index: databases/gnatsweb4/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/gnatsweb4/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- databases/gnatsweb4/Makefile	14 Nov 2003 00:29:47 -0000	1.2
+++ databases/gnatsweb4/Makefile	22 May 2005 08:49:53 -0000
@@ -17,7 +17,7 @@
 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
Index: devel/portmk/Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/devel/portmk/Mk/bsd.port.mk,v
retrieving revision 1.1
diff -u -r1.1 bsd.port.mk
--- devel/portmk/Mk/bsd.port.mk	6 Jul 2004 12:41:03 -0000	1.1
+++ devel/portmk/Mk/bsd.port.mk	22 May 2005 08:49:53 -0000
@@ -352,7 +352,7 @@
 # USE_APACHE		- Says that the port relies on an apache webserver.
 # APACHE_PORT		- CATEGORY and portname of the prefered port for apache.
 #					Default: www/apache13
-#					If WITH_APACHE2 is defined defaults to www/apache2
+#					If WITH_APACHE2 is defined defaults to www/apache20
 # APXS			- Full path to the prefered apxs binary to configure
 #			  apache modules. Default: ${LOCALBASE}/sbin/apxs
 #				
Index: devel/portmk/Mk/bsd.port.pre.mk
===================================================================
RCS file: /home/ncvs/ports/devel/portmk/Mk/bsd.port.pre.mk,v
retrieving revision 1.5
diff -u -r1.5 bsd.port.pre.mk
--- devel/portmk/Mk/bsd.port.pre.mk	3 Feb 2005 04:01:34 -0000	1.5
+++ devel/portmk/Mk/bsd.port.pre.mk	22 May 2005 08:49:54 -0000
@@ -285,7 +285,7 @@
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
 .if defined(WITH_APACHE2)
-APACHE_PORT?=	www/apache2
+APACHE_PORT?=	www/apache20
 .else
 APACHE_PORT?=	www/apache13
 .endif
Index: devel/subversion/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/subversion/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- devel/subversion/Makefile	12 Apr 2005 03:25:19 -0000	1.78
+++ devel/subversion/Makefile	22 May 2005 08:49:54 -0000
@@ -138,13 +138,13 @@
 .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}
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
-APR_PORT=	www/apache2
+APR_PORT=	www/apache20
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
@@ -231,11 +231,11 @@
 .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} ""
Index: lang/php4/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/php4/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- lang/php4/Makefile	4 Apr 2005 09:20:19 -0000	1.85
+++ lang/php4/Makefile	22 May 2005 08:49:54 -0000
@@ -124,7 +124,7 @@
 .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"
Index: lang/php5/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/php5/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- lang/php5/Makefile	4 Apr 2005 15:47:08 -0000	1.82
+++ lang/php5/Makefile	22 May 2005 08:49:54 -0000
@@ -121,7 +121,7 @@
 .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"
Index: mail/mailman/files/FreeBSD-post-install-notes
===================================================================
RCS file: /home/ncvs/ports/mail/mailman/files/FreeBSD-post-install-notes,v
retrieving revision 1.2
diff -u -r1.2 FreeBSD-post-install-notes
--- mail/mailman/files/FreeBSD-post-install-notes	29 Sep 2003 19:02:49 -0000	1.2
+++ mail/mailman/files/FreeBSD-post-install-notes	22 May 2005 08:49:54 -0000
@@ -56,7 +56,7 @@
 
    You need to set up your webserver to find Mailman's CGI scripts.  The
    Mailman port works well with either Apache 1.3.x or Apache 2.x as
-   installed from their respective ports (www/apache13 and www/apache2).
+   installed from their respective ports (www/apache13 and www/apache20).
 
    If you're using Apache, you need to add at least two lines to your
    httpd.conf.  Assuming that you installed the Mailman port in the default
Index: misc/linux-opengroupware/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/linux-opengroupware/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- misc/linux-opengroupware/Makefile	12 Apr 2005 03:26:07 -0000	1.13
+++ misc/linux-opengroupware/Makefile	22 May 2005 08:49:54 -0000
@@ -22,7 +22,7 @@
 COMMENT=	Groupware package including mail, calendar, palm sync and much more
 
 EXTRACT_DEPENDS=	rpm2cpio:${PORTSDIR}/archivers/rpm
-INSTALL_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2 \
+INSTALL_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20 \
 		${LOCALBASE}/bin/psql:${PORTSDIR}/databases/postgresql7 \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash2 \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake
@@ -112,7 +112,7 @@
 NGWEB_ADAP_DIR=	opengroupware.org-mod_ngobjweb
 PKGNAME_PREFIX=	linux-
 
-#CONFLICTS=	${PORTSDIR}/www/apache2 \
+#CONFLICTS=	${PORTSDIR}/www/apache20 \
 #		${PORTSDIR}/databases/postgresql7
 
 ONLY_FOR_ARCHS=	i386
Index: net/xbone-gui/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/xbone-gui/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- net/xbone-gui/Makefile	16 Dec 2004 22:33:18 -0000	1.3
+++ net/xbone-gui/Makefile	22 May 2005 08:49:54 -0000
@@ -27,7 +27,7 @@
 		${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
 
 USE_GMAKE=	yes
 NO_BUILD=       yes
Index: www/dpsearch/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/dpsearch/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/dpsearch/Makefile	12 Apr 2005 03:26:43 -0000	1.11
+++ www/dpsearch/Makefile	22 May 2005 08:49:54 -0000
@@ -93,7 +93,7 @@
 
 .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
Index: www/gnome-user-share/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gnome-user-share/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/gnome-user-share/Makefile	12 Mar 2005 10:53:10 -0000	1.5
+++ www/gnome-user-share/Makefile	22 May 2005 08:49:54 -0000
@@ -22,7 +22,7 @@
 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_LIBTOOL_VER=15
Index: www/mod_access_identd/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_access_identd/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- www/mod_access_identd/Makefile	18 Aug 2004 16:21:44 -0000	1.8
+++ www/mod_access_identd/Makefile	22 May 2005 08:49:54 -0000
@@ -19,5 +19,5 @@
 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>
Index: www/mod_access_referer/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_access_referer/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- www/mod_access_referer/Makefile	11 Dec 2004 18:49:43 -0000	1.13
+++ www/mod_access_referer/Makefile	22 May 2005 08:49:54 -0000
@@ -27,7 +27,7 @@
 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)
Index: www/mod_accesscookie/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_accesscookie/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/mod_accesscookie/Makefile	18 Aug 2004 16:21:44 -0000	1.2
+++ www/mod_accesscookie/Makefile	22 May 2005 08:49:54 -0000
@@ -24,7 +24,7 @@
 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}
Index: www/mod_auth_any/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_any/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- www/mod_auth_any/Makefile	18 Oct 2004 19:22:28 -0000	1.13
+++ www/mod_auth_any/Makefile	22 May 2005 08:49:54 -0000
@@ -26,5 +26,5 @@
 WANT_APACHE=	13
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
Index: www/mod_auth_cookie_mysql/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_cookie_mysql/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_auth_cookie_mysql/Makefile	18 Aug 2004 16:21:45 -0000	1.4
+++ www/mod_auth_cookie_mysql/Makefile	22 May 2005 08:49:54 -0000
@@ -26,7 +26,7 @@
 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)
Index: www/mod_auth_cookie_mysql2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_cookie_mysql2/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/mod_auth_cookie_mysql2/Makefile	18 Aug 2004 16:21:45 -0000	1.2
+++ www/mod_auth_cookie_mysql2/Makefile	22 May 2005 08:49:54 -0000
@@ -27,7 +27,7 @@
 PORTDOCS=	mod_auth_cookie_mysql2.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}
Index: www/mod_auth_external2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_external2/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- www/mod_auth_external2/Makefile	13 Nov 2004 15:02:27 -0000	1.6
+++ www/mod_auth_external2/Makefile	22 May 2005 08:49:54 -0000
@@ -21,7 +21,7 @@
 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}
Index: www/mod_auth_imap/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_imap/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/mod_auth_imap/Makefile	18 Aug 2004 16:21:45 -0000	1.2
+++ www/mod_auth_imap/Makefile	22 May 2005 08:49:54 -0000
@@ -21,7 +21,7 @@
 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:
Index: www/mod_auth_imap2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_imap2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_auth_imap2/Makefile	16 Jan 2005 15:05:56 -0000	1.4
+++ www/mod_auth_imap2/Makefile	22 May 2005 08:49:54 -0000
@@ -22,7 +22,7 @@
 
 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:
Index: www/mod_auth_mysql_another/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_mysql_another/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/mod_auth_mysql_another/Makefile	5 Apr 2005 08:23:53 -0000	1.7
+++ www/mod_auth_mysql_another/Makefile	22 May 2005 08:49:54 -0000
@@ -35,5 +35,5 @@
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
Index: www/mod_auth_pam2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pam2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_auth_pam2/Makefile	18 Aug 2004 16:21:46 -0000	1.4
+++ www/mod_auth_pam2/Makefile	22 May 2005 08:49:54 -0000
@@ -15,7 +15,7 @@
 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
Index: www/mod_auth_pgsql2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_pgsql2/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/mod_auth_pgsql2/Makefile	31 Jan 2005 00:35:55 -0000	1.7
+++ www/mod_auth_pgsql2/Makefile	22 May 2005 08:49:54 -0000
@@ -13,7 +13,7 @@
 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
Index: www/mod_auth_useragent/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_auth_useragent/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_auth_useragent/Makefile	18 Aug 2004 16:21:47 -0000	1.3
+++ www/mod_auth_useragent/Makefile	22 May 2005 08:49:54 -0000
@@ -20,7 +20,7 @@
 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}
Index: www/mod_cfg_ldap/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_cfg_ldap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_cfg_ldap/Makefile	14 Oct 2004 10:11:52 -0000	1.3
+++ www/mod_cfg_ldap/Makefile	22 May 2005 08:49:54 -0000
@@ -29,7 +29,7 @@
 		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)
Index: www/mod_chroot/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_chroot/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_chroot/Makefile	16 Jan 2005 15:17:28 -0000	1.4
+++ www/mod_chroot/Makefile	22 May 2005 08:49:54 -0000
@@ -18,7 +18,7 @@
 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}
Index: www/mod_dosevasive20/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_dosevasive20/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/mod_dosevasive20/Makefile	15 Feb 2005 20:24:20 -0000	1.2
+++ www/mod_dosevasive20/Makefile	22 May 2005 08:49:54 -0000
@@ -25,7 +25,7 @@
 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-install:
 .if !defined (NOPORTDOCS)
Index: www/mod_injection/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_injection/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_injection/Makefile	18 Aug 2004 16:21:50 -0000	1.3
+++ www/mod_injection/Makefile	22 May 2005 08:49:54 -0000
@@ -13,7 +13,7 @@
 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
Index: www/mod_log_config-st/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_config-st/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- www/mod_log_config-st/Makefile	18 Aug 2004 16:21:51 -0000	1.2
+++ www/mod_log_config-st/Makefile	22 May 2005 08:49:54 -0000
@@ -23,7 +23,7 @@
 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>
Index: www/mod_log_data/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_data/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_log_data/Makefile	18 Aug 2004 16:21:51 -0000	1.3
+++ www/mod_log_data/Makefile	22 May 2005 08:49:54 -0000
@@ -13,7 +13,7 @@
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Module for Apache 2.0 which logs incoming and outgoing data
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
Index: www/mod_log_mysql/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_mysql/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- www/mod_log_mysql/Makefile	18 Aug 2004 16:21:51 -0000	1.10
+++ www/mod_log_mysql/Makefile	22 May 2005 08:49:54 -0000
@@ -26,5 +26,5 @@
 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>
Index: www/mod_log_sql2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_log_sql2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- www/mod_log_sql2/Makefile	22 Jan 2005 09:37:52 -0000	1.8
+++ www/mod_log_sql2/Makefile	22 May 2005 08:49:54 -0000
@@ -29,7 +29,7 @@
 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
Index: www/mod_macro/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_macro/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_macro/Makefile	18 Aug 2004 16:21:52 -0000	1.3
+++ www/mod_macro/Makefile	22 May 2005 08:49:54 -0000
@@ -20,7 +20,7 @@
 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)
Index: www/mod_macro2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_macro2/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_macro2/Makefile	25 Nov 2004 13:29:04 -0000	1.4
+++ www/mod_macro2/Makefile	22 May 2005 08:49:54 -0000
@@ -20,7 +20,7 @@
 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}
Index: www/mod_musicindex/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_musicindex/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- www/mod_musicindex/Makefile	16 Mar 2005 14:50:13 -0000	1.11
+++ www/mod_musicindex/Makefile	22 May 2005 08:49:54 -0000
@@ -31,7 +31,7 @@
 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"
 
Index: www/mod_python3/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_python3/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- www/mod_python3/Makefile	19 Feb 2005 18:04:26 -0000	1.32
+++ www/mod_python3/Makefile	22 May 2005 08:49:54 -0000
@@ -37,7 +37,7 @@
 .endif
 
 .if !exists(${PREFIX}/etc/apache2/envvars.d) && !defined(PACKAGE_BUILDING)
-BROKEN=		"Please upgrade your www/apache2 installation."
+BROKEN=		"Please upgrade your www/apache20 installation."
 .endif
 
 post-build:
Index: www/mod_rpaf/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_rpaf/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/mod_rpaf/Makefile	18 Aug 2004 16:21:54 -0000	1.4
+++ www/mod_rpaf/Makefile	22 May 2005 08:49:54 -0000
@@ -20,5 +20,5 @@
 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>
Index: www/mod_tidy/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_tidy/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/mod_tidy/Makefile	18 Aug 2004 16:21:55 -0000	1.5
+++ www/mod_tidy/Makefile	22 May 2005 08:49:54 -0000
@@ -27,5 +27,5 @@
 AP_LIB+=	${LOCALBASE}/lib -ltidy
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
+.include "${PORTSDIR}/www/apache20/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
Index: www/mod_traf_thief/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_traf_thief/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- www/mod_traf_thief/Makefile	26 Feb 2005 15:24:15 -0000	1.5
+++ www/mod_traf_thief/Makefile	22 May 2005 08:49:54 -0000
@@ -16,7 +16,7 @@
 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
Index: www/mod_transform/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_transform/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/mod_transform/Makefile	8 Dec 2004 21:27:24 -0000	1.1
+++ www/mod_transform/Makefile	22 May 2005 08:49:54 -0000
@@ -13,8 +13,8 @@
 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/apache20
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache20
 
 HAS_CONFIGURE=	yes
 USE_GNOME=	libxslt
Index: www/mod_v2h/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_v2h/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/mod_v2h/Makefile	9 Apr 2005 14:48:01 -0000	1.7
+++ www/mod_v2h/Makefile	22 May 2005 08:49:54 -0000
@@ -14,9 +14,9 @@
 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/apache20 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
-RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache20 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-2
Index: www/mod_vdbh/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_vdbh/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- www/mod_vdbh/Makefile	18 Aug 2004 16:21:55 -0000	1.3
+++ www/mod_vdbh/Makefile	22 May 2005 08:49:54 -0000
@@ -26,7 +26,7 @@
 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)
Index: www/mod_vhs/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_vhs/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- www/mod_vhs/Makefile	15 Apr 2005 12:08:36 -0000	1.7
+++ www/mod_vhs/Makefile	22 May 2005 08:49:54 -0000
@@ -32,7 +32,7 @@
 PORTDOCS=	AUTHORS 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)
Index: www/resin2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/resin2/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- www/resin2/Makefile	15 Apr 2005 00:30:47 -0000	1.8
+++ www/resin2/Makefile	22 May 2005 08:49:54 -0000
@@ -71,7 +71,7 @@
 #
 # 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
Index: www/resin3/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/resin3/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- www/resin3/Makefile	25 Apr 2005 22:13:54 -0000	1.13
+++ www/resin3/Makefile	22 May 2005 08:49:54 -0000
@@ -74,7 +74,7 @@
 #
 # 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
Index: www/suphp/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/suphp/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- www/suphp/Makefile	28 Oct 2004 18:29:16 -0000	1.19
+++ www/suphp/Makefile	22 May 2005 08:49:54 -0000
@@ -54,7 +54,7 @@
 .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/"