- Add apache 2.2.0

It's a temporary layout, I need more time to find the best.
  note that ${PREFIX}/www/(data|errors|cgi)(-dist) disappeared in favor of
  ${PREFIX}/www/apache22

www/Makefile

@@ -29,6 +29,7 @@
     SUBDIR += apache13-ssl
     SUBDIR += apache2
     SUBDIR += apache21
+    SUBDIR += apache22
     SUBDIR += arena
     SUBDIR += aria
     SUBDIR += ashe           # requires Motif

www/apache22/Makefile

@@ -1,4 +1,4 @@
-# New ports collection makefile for:	apache21
+# New ports collection makefile for:	apache22
 # Date created:				Dec 11 2004
 # Whom:					Clement Laforet <clement@FreeBSD.org>
 #
@@ -8,23 +8,23 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.1.9
+PORTVERSION=	2.2.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/clement/}:powerlogo
-DISTNAME=	httpd-${PORTVERSION}-beta
+DISTNAME=	httpd-${PORTVERSION}
 DISTFILES=	${DISTNAME}.tar.bz2 \
 		powerlogo.gif:powerlogo
-DIST_SUBDIR=	apache21
+DIST_SUBDIR=	apache22
 EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	clement@FreeBSD.org
-COMMENT?=	Version 2.1 of Apache web server with ${WITH_MPM:L} MPM.
+COMMENT?=	Version 2.2 of Apache web server with ${WITH_MPM:L} MPM.
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 
-LATEST_LINK=	apache21
+LATEST_LINK=	apache22
 
 CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \
 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
@@ -32,13 +32,14 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.*
 		apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* \
-		apache-2.0.* apache-*-2.0.*
+		apache-2.0.* apache-*-2.0.* apache-2.1.* apache-*-2.1.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \
 			AUTOHEADER=${AUTOHEADER}
 
+USE_APACHE=		common22
 USE_BZIP2=		yes
 USE_ICONV=		yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
@@ -143,8 +144,6 @@ WITH_PTHREAD_CFLAGS?=	${PTHREAD_CFLAGS}
 
 .include "${APACHEDIR}/Makefile.doc"
 .include "${APACHEDIR}/Makefile.modules"
-WANT_APACHE=	common21
-.include "${APACHEDIR}/../apache2/Makefile.modules.3rd"
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L} ${CONFIGURE_TARGET}
 
@@ -195,7 +194,7 @@ post-patch:
 		${WRKSRC}/docs/docroot/index.html
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache22.sh
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${RM} -f ${WRKSRC}/docs/conf/highperformance-std.conf
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
@@ -219,17 +218,17 @@ pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 install-startup-script:
-.if !exists(${WRKDIR}/apache21.sh)
+.if !exists(${WRKDIR}/apache22.sh)
 	@${MKDIR} ${WRKDIR}
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache22.sh
 .endif
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
+	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache22.sh startup script."
+	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/apache22.sh ${PREFIX}/etc/rc.d/apache22.sh
 
 post-install: install-startup-script
-	@${MKDIR} ${PREFIX}/etc/apache21/envvars.d
-	@${MKDIR} ${PREFIX}/etc/apache21/Includes
+	@${MKDIR} ${PREFIX}/etc/apache22/envvars.d
+	@${MKDIR} ${PREFIX}/etc/apache22/Includes
 	@@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

www/apache22/Makefile.doc

@@ -91,8 +91,8 @@
 ##            to do not use quotes.
 ##
 
-DOCSDIR=	${PREFIX}/share/doc/apache21
-EXAMPLESDIR=	${PREFIX}/share/examples/apache21
+DOCSDIR=	${PREFIX}/share/doc/apache22
+EXAMPLESDIR=	${PREFIX}/share/examples/apache22
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 
 .if defined(NOPORTDOCS)

www/apache22/distinfo

@@ -1,6 +1,6 @@
-MD5 (apache21/httpd-2.1.9-beta.tar.bz2) = 49e5278304da8ba522f7721aaf4e5b46
-SHA256 (apache21/httpd-2.1.9-beta.tar.bz2) = 2387367c69e1677ab4c01c7a4525669a4563bf016c4b23c51fd02d10239595d3
-SIZE (apache21/httpd-2.1.9-beta.tar.bz2) = 4859336
-MD5 (apache21/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
-SHA256 (apache21/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
-SIZE (apache21/powerlogo.gif) = 5279
+MD5 (apache22/httpd-2.2.0.tar.bz2) = 402b90a2e47205f94b3b1d91e1a8c459
+SHA256 (apache22/httpd-2.2.0.tar.bz2) = bbf1a452889f9d502840e3b8dda4938b6bd633b94b888ab799ee9aa5845115f7
+SIZE (apache22/httpd-2.2.0.tar.bz2) = 4839151
+MD5 (apache22/powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
+SHA256 (apache22/powerlogo.gif) = 0144675a80761b9660bdb652d331d9ba3bebdff89c0fa35a56aa463662a53254
+SIZE (apache22/powerlogo.gif) = 5279

www/apache22/files/apache.sh

@@ -1,66 +1,66 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.8 2005-01-11 13:45:05 clement Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/apache22/files/Attic/apache.sh,v 1.9 2005-12-03 22:02:58 clement Exp $
 #
 
-# PROVIDE: apache21
+# PROVIDE: apache22
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: FreeBSD shutdown
 
 #
-# Add the following lines to /etc/rc.conf to enable apache21:
-# apache21_enable (bool):      Set to "NO" by default.
-#                             Set it to "YES" to enable apache21
-# apache21ssl_enable (bool):   Set to "NO" by default.
+# Add the following lines to /etc/rc.conf to enable apache22:
+# apache22_enable (bool):      Set to "NO" by default.
+#                             Set it to "YES" to enable apache22
+# apache22ssl_enable (bool):   Set to "NO" by default.
 #                             Set it to "YES" to start apache with SSL   
 #                             (if <IfDefined SSL> exists in httpd.conf)
-# apache21limits_enable (bool):Set to "NO" by default.
+# apache22limits_enable (bool):Set to "NO" by default.
 #                             Set it to yes to run `limits $limits_args`
 #                             just before apache starts.
-# apache21_flags (str):        Set to "" by default.
+# apache22_flags (str):        Set to "" by default.
 #                             Extra flags passed to start command.
-# apache21limits_args (str):   Default to "-e -C daemon"
+# apache22limits_args (str):   Default to "-e -C daemon"
 #                             Arguments of pre-start limits run.
 #
 . %%RC_SUBR%%
 
-name="apache21"
+name="apache22"
 rcvar=`set_rcvar`
 
-start_precmd="apache21_precmd"
-restart_precmd="apache21_checkconfig"
-reload_precmd="apache21_checkconfig"
+start_precmd="apache22_precmd"
+restart_precmd="apache22_checkconfig"
+reload_precmd="apache22_checkconfig"
 command="%%PREFIX%%/sbin/httpd"
 pidfile="/var/run/httpd.pid"
-required_files=%%PREFIX%%/etc/apache21/httpd.conf
+required_files=%%PREFIX%%/etc/apache22/httpd.conf
 
-[ -z "$apache21_enable" ]       && apache21_enable="NO"
-[ -z "$apache21ssl_enable" ]    && apache21ssl_enable="NO"
-[ -z "$apache21_flags" ]        && apache21_flags=""
-[ -z "$apache21limits_enable" ] && apache21limits_enable="NO"
-[ -z "$apache21limits_args" ]   && apache21limits_args="-e -C daemon"
+[ -z "$apache22_enable" ]       && apache22_enable="NO"
+[ -z "$apache22ssl_enable" ]    && apache22ssl_enable="NO"
+[ -z "$apache22_flags" ]        && apache22_flags=""
+[ -z "$apache22limits_enable" ] && apache22limits_enable="NO"
+[ -z "$apache22limits_args" ]   && apache22limits_args="-e -C daemon"
 
 load_rc_config $name
 
-checkyesno apache21ssl_enable && \
-			apache21_flags="-DSSL $apache21_flags"
+checkyesno apache22ssl_enable && \
+			apache22_flags="-DSSL $apache22_flags"
 
-apache21_checkconfig()
+apache22_checkconfig()
 {
-	echo "Performing sanity check on apache21 configuration:"
-	${command} ${apache21_flags} -t
+	echo "Performing sanity check on apache22 configuration:"
+	${command} ${apache22_flags} -t
 }
 
-apache21_precmd() 
+apache22_precmd() 
 {
 	if test -f %%PREFIX%%/sbin/envvars
 	then
 		. %%PREFIX%%/sbin/envvars
 	fi
-	if checkyesno apache21limits_enable
+	if checkyesno apache22limits_enable
 	then
-		eval `/usr/bin/limits ${apache21limits_args}` 2>/dev/null
+		eval `/usr/bin/limits ${apache22limits_args}` 2>/dev/null
 	else
 		return 0
         fi

www/apache22/files/patch-Makefile.in

@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Sep 25 23:07:27 2005
-+++ Makefile.in	Sun Oct 30 19:31:59 2005
+--- Makefile.in.orig	Sun Nov 13 06:33:15 2005
++++ Makefile.in	Sat Dec  3 22:10:42 2005
 @@ -31,9 +31,11 @@
  install-conf:
  	@echo Installing configuration files
@@ -31,89 +31,17 @@
  	    	fi; \
  	    	fi; \
  	    done ; \
-@@ -117,44 +119,40 @@
- 	doxygen $(top_srcdir)/docs/doxygen.conf
- 
- install-htdocs:
--	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
--           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
--        else \
--	    echo Installing HTML documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
--	    test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
--	    cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+.if !defined(NO_WWWDATA)
-+	@echo Installing HTML documents
-+	@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
-+.endif
- 
- install-error:
--	-@if [ -d $(DESTDIR)$(errordir) ]; then \
--           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
--        else \
--	    echo Installing error documents ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
--	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
--	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+.if !defined(NO_ERROR)
-+	@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 -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
-+.endif
- 
- install-icons:
--	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
--           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
--        else \
--	    echo Installing icons ; \
--	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
--	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
--	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+.if !defined(NO_ICONS)
-+	@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 -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
-+.endif 
- 
- install-cgi:
--	-@if [ -d $(DESTDIR)$(cgidir) ];then \
--	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
--	else \
--	   echo Installing CGIs ; \
--	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
--	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
--	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
--	fi
-+.if !defined(NO_CGI)
-+	@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 -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
-+.endif
- 
- install-other:
- 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -198,11 +196,13 @@
- 	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
- 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
- 	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
-+.if !defined(NOPORTDOCS)
+@@ -206,12 +208,14 @@
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
- 	@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
- 	@(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
++.if !defined(NOPORTDOCS)
+ 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
+ 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
+ 	else \
+ 	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
+ 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \
+ 	fi
 +.endif
  
  install-suexec:

www/apache22/files/patch-config.layout

@@ -1,25 +1,26 @@
---- config.layout.orig	Sun Nov 21 19:50:36 2004
-+++ config.layout	Sat Dec 11 17:56:14 2004
+--- config.layout.orig	Sun Nov 21 18:50:36 2004
++++ config.layout	Sat Dec  3 22:07:46 2005
 @@ -281,17 +281,17 @@
    bindir:        ${exec_prefix}/bin
    sbindir:       ${exec_prefix}/sbin
    libdir:        ${exec_prefix}/lib
 -  libexecdir:    ${exec_prefix}/libexec/apache2
-+  libexecdir:    ${exec_prefix}/libexec/apache21
++  libexecdir:    ${exec_prefix}/libexec/apache22
    mandir:        ${prefix}/man
 -  sysconfdir:    ${prefix}/etc/apache2
-+  sysconfdir:    ${prefix}/etc/apache21
-   datadir:       ${prefix}/www
+-  datadir:       ${prefix}/www
 -  installbuilddir: ${prefix}/share/apache2/build
-+  installbuilddir: ${prefix}/share/apache21/build
++  sysconfdir:    ${prefix}/etc/apache22
++  datadir:       ${prefix}/www/apache22
++  installbuilddir: ${prefix}/share/apache22/build
    errordir:      ${datadir}/error
    iconsdir:      ${datadir}/icons
    htdocsdir:     ${datadir}/data
 -  manualdir:     ${prefix}/share/doc/apache2
-+  manualdir:     ${prefix}/share/doc/apache21
++  manualdir:     ${prefix}/share/doc/apache22
    cgidir:        ${datadir}/cgi-bin
 -  includedir:    ${prefix}/include/apache2
-+  includedir:    ${prefix}/include/apache21
++  includedir:    ${prefix}/include/apache22
    localstatedir: /var
    runtimedir:    ${localstatedir}/run
    logfiledir:    ${localstatedir}/log

www/apache22/pkg-message

@@ -1,2 +1,2 @@
-To run apache www server from startup, add apache21_enable="YES"
+To run apache www server from startup, add apache22_enable="YES"
 in your /etc/rc.conf. Extra options can be found in startup script.

www/apache22/pkg-plist

@@ -1,59 +1,59 @@
 @comment $FreeBSD$
-@exec mkdir -p %D/etc/apache21 2> /dev/null
-@unexec if cmp -s %D/etc/apache21/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache21/httpd.conf; fi
+@exec mkdir -p %D/etc/apache22 2> /dev/null
+@unexec if cmp -s %D/etc/apache22/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache22/httpd.conf; fi
 %%EXAMPLESDIR%%/httpd.conf
-@exec [ -f %D/etc/apache21/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache21/httpd.conf
-@unexec if cmp -s %D/etc/apache21/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/etc/apache21/magic; fi
+@exec [ -f %D/etc/apache22/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache22/httpd.conf
+@unexec if cmp -s %D/etc/apache22/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/etc/apache22/magic; fi
 %%EXAMPLESDIR%%/magic
-@exec [ -f %D/etc/apache21/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/etc/apache21/magic
-@unexec if cmp -s %D/etc/apache21/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/etc/apache21/mime.types; fi
+@exec [ -f %D/etc/apache22/magic ] || cp %D/%%EXAMPLESDIR%%/magic %D/etc/apache22/magic
+@unexec if cmp -s %D/etc/apache22/mime.types %D/%%EXAMPLESDIR%%/mime.types; then rm -f %D/etc/apache22/mime.types; fi
 %%EXAMPLESDIR%%/mime.types
-@exec [ -f %D/etc/apache21/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/etc/apache21/mime.types
-@unexec if cmp -s %D/etc/apache21/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/etc/apache21/extra/httpd-autoindex.conf; fi
+@exec [ -f %D/etc/apache22/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types- %D/etc/apache22/mime.types
+@unexec if cmp -s %D/etc/apache22/extra/httpd-autoindex.conf %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf; then rm -f %D/etc/apache22/extra/httpd-autoindex.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-autoindex.conf
-@exec [ -f %D/etc/apache21/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/etc/apache21/extra/httpd-autoindex.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-dav.conf %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf; then rm -f %D/etc/apache21/extra/httpd-dav.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-autoindex.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-autoindex.conf %D/etc/apache22/extra/httpd-autoindex.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-dav.conf %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf; then rm -f %D/etc/apache22/extra/httpd-dav.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-dav.conf
-@exec [ -f %D/etc/apache21/extra/httpd-dav.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf %D/etc/apache21/extra/httpd-dav.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-default.conf %D/%%EXAMPLESDIR%%/extra/httpd-default.conf; then rm -f %D/etc/apache21/extra/httpd-default.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-dav.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-dav.conf %D/etc/apache22/extra/httpd-dav.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-default.conf %D/%%EXAMPLESDIR%%/extra/httpd-default.conf; then rm -f %D/etc/apache22/extra/httpd-default.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-default.conf
-@exec [ -f %D/etc/apache21/extra/httpd-default.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-default.conf %D/etc/apache21/extra/httpd-default.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-info.conf %D/%%EXAMPLESDIR%%/extra/httpd-info.conf; then rm -f %D/etc/apache21/extra/httpd-info.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-default.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-default.conf %D/etc/apache22/extra/httpd-default.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-info.conf %D/%%EXAMPLESDIR%%/extra/httpd-info.conf; then rm -f %D/etc/apache22/extra/httpd-info.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-info.conf
-@exec [ -f %D/etc/apache21/extra/httpd-info.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-info.conf %D/etc/apache21/extra/httpd-info.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-languages.conf %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf; then rm -f %D/etc/apache21/extra/httpd-languages.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-info.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-info.conf %D/etc/apache22/extra/httpd-info.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-languages.conf %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf; then rm -f %D/etc/apache22/extra/httpd-languages.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-languages.conf
-@exec [ -f %D/etc/apache21/extra/httpd-languages.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf %D/etc/apache21/extra/httpd-languages.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-manual.conf %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf; then rm -f %D/etc/apache21/extra/httpd-manual.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-languages.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-languages.conf %D/etc/apache22/extra/httpd-languages.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-manual.conf %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf; then rm -f %D/etc/apache22/extra/httpd-manual.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-manual.conf
-@exec [ -f %D/etc/apache21/extra/httpd-manual.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf %D/etc/apache21/extra/httpd-manual.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-mpm.conf %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf; then rm -f %D/etc/apache21/extra/httpd-mpm.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-manual.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-manual.conf %D/etc/apache22/extra/httpd-manual.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-mpm.conf %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf; then rm -f %D/etc/apache22/extra/httpd-mpm.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-mpm.conf
-@exec [ -f %D/etc/apache21/extra/httpd-mpm.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf %D/etc/apache21/extra/httpd-mpm.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-multilang-errordoc.conf %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf; then rm -f %D/etc/apache21/extra/httpd-multilang-errordoc.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-mpm.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-mpm.conf %D/etc/apache22/extra/httpd-mpm.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-multilang-errordoc.conf %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf; then rm -f %D/etc/apache22/extra/httpd-multilang-errordoc.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf
-@exec [ -f %D/etc/apache21/extra/httpd-multilang-errordoc.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf %D/etc/apache21/extra/httpd-multilang-errordoc.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-ssl.conf %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf; then rm -f %D/etc/apache21/extra/httpd-ssl.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-multilang-errordoc.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-multilang-errordoc.conf %D/etc/apache22/extra/httpd-multilang-errordoc.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-ssl.conf %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf; then rm -f %D/etc/apache22/extra/httpd-ssl.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-ssl.conf
-@exec [ -f %D/etc/apache21/extra/httpd-ssl.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf %D/etc/apache21/extra/httpd-ssl.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-userdir.conf %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf; then rm -f %D/etc/apache21/extra/httpd-userdir.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-ssl.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-ssl.conf %D/etc/apache22/extra/httpd-ssl.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-userdir.conf %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf; then rm -f %D/etc/apache22/extra/httpd-userdir.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-userdir.conf
-@exec [ -f %D/etc/apache21/extra/httpd-userdir.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf %D/etc/apache21/extra/httpd-userdir.conf
-@unexec if cmp -s %D/etc/apache21/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/etc/apache21/extra/httpd-vhosts.conf; fi
+@exec [ -f %D/etc/apache22/extra/httpd-userdir.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-userdir.conf %D/etc/apache22/extra/httpd-userdir.conf
+@unexec if cmp -s %D/etc/apache22/extra/httpd-vhosts.conf %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf; then rm -f %D/etc/apache22/extra/httpd-vhosts.conf; fi
 %%EXAMPLESDIR%%/extra/httpd-vhosts.conf
-@exec [ -f %D/etc/apache21/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/etc/apache21/extra/httpd-vhosts.conf
-etc/rc.d/apache21.sh
-include/apache21/ap_compat.h
-include/apache21/ap_config.h
-include/apache21/ap_config_auto.h
-include/apache21/ap_config_layout.h
-include/apache21/ap_listen.h
-include/apache21/ap_mmn.h
-include/apache21/ap_mpm.h
-include/apache21/ap_provider.h
-include/apache21/ap_regex.h
-include/apache21/ap_regkey.h
-include/apache21/ap_release.h
+@exec [ -f %D/etc/apache22/extra/httpd-vhosts.conf ] || cp %D/%%EXAMPLESDIR%%/extra/httpd-vhosts.conf %D/etc/apache22/extra/httpd-vhosts.conf
+etc/rc.d/apache22.sh
+include/apache22/ap_compat.h
+include/apache22/ap_config.h
+include/apache22/ap_config_auto.h
+include/apache22/ap_config_layout.h
+include/apache22/ap_listen.h
+include/apache22/ap_mmn.h
+include/apache22/ap_mpm.h
+include/apache22/ap_provider.h
+include/apache22/ap_regex.h
+include/apache22/ap_regkey.h
+include/apache22/ap_release.h
 %%APR_PORTS%%include/apr-1/apr.h
 %%APR_PORTS%%include/apr-1/apr_allocator.h
 %%APR_PORTS%%include/apr-1/apr_anylock.h
@@ -118,45 +118,45 @@ include/apache21/ap_release.h
 %%APR_PORTS%%include/apr-1/apu.h
 %%APR_PORTS%%include/apr-1/apu_version.h
 %%APR_PORTS%%include/apr-1/apu_want.h
-%%EVENT%%include/apache21/pod.h
-%%EVENT%%include/apache21/fdqueue.h
-%%WORKER%%include/apache21/fdqueue.h
-%%THREADPOOL%%include/apache21/pod.h
-include/apache21/http_config.h
-include/apache21/http_connection.h
-include/apache21/http_core.h
-include/apache21/http_log.h
-include/apache21/http_main.h
-include/apache21/http_protocol.h
-include/apache21/http_request.h
-include/apache21/http_vhost.h
-include/apache21/httpd.h
-include/apache21/mod_auth.h
-include/apache21/mod_cgi.h
-include/apache21/mod_core.h
-include/apache21/mod_dav.h
-include/apache21/mod_dbd.h
-include/apache21/mod_include.h
-include/apache21/mod_log_config.h
-include/apache21/mod_proxy.h
-include/apache21/mod_ssl.h
-include/apache21/mod_status.h
-include/apache21/mpm.h
-include/apache21/mpm_common.h
-include/apache21/mpm_default.h
-include/apache21/os.h
-%%WORKER%%include/apache21/pod.h
-include/apache21/scoreboard.h
-include/apache21/unixd.h
-include/apache21/util_cfgtree.h
-include/apache21/util_charset.h
-include/apache21/util_ebcdic.h
-include/apache21/util_filter.h
-include/apache21/util_ldap.h
-include/apache21/util_md5.h
-include/apache21/util_script.h
-include/apache21/util_time.h
-include/apache21/util_xml.h
+%%EVENT%%include/apache22/pod.h
+%%EVENT%%include/apache22/fdqueue.h
+%%WORKER%%include/apache22/fdqueue.h
+%%THREADPOOL%%include/apache22/pod.h
+include/apache22/http_config.h
+include/apache22/http_connection.h
+include/apache22/http_core.h
+include/apache22/http_log.h
+include/apache22/http_main.h
+include/apache22/http_protocol.h
+include/apache22/http_request.h
+include/apache22/http_vhost.h
+include/apache22/httpd.h
+include/apache22/mod_auth.h
+include/apache22/mod_cgi.h
+include/apache22/mod_core.h
+include/apache22/mod_dav.h
+include/apache22/mod_dbd.h
+include/apache22/mod_include.h
+include/apache22/mod_log_config.h
+include/apache22/mod_proxy.h
+include/apache22/mod_ssl.h
+include/apache22/mod_status.h
+include/apache22/mpm.h
+include/apache22/mpm_common.h
+include/apache22/mpm_default.h
+include/apache22/os.h
+%%WORKER%%include/apache22/pod.h
+include/apache22/scoreboard.h
+include/apache22/unixd.h
+include/apache22/util_cfgtree.h
+include/apache22/util_charset.h
+include/apache22/util_ebcdic.h
+include/apache22/util_filter.h
+include/apache22/util_ldap.h
+include/apache22/util_md5.h
+include/apache22/util_script.h
+include/apache22/util_time.h
+include/apache22/util_xml.h
 %%APR_PORTS%%bin/apr-1-config
 %%APR_PORTS%%bin/apu-1-config
 %%APR_PORTS%%lib/apr.exp
@@ -167,73 +167,73 @@ include/apache21/util_xml.h
 %%APR_PORTS%%lib/libaprutil-1.a
 %%APR_PORTS%%lib/libaprutil-1.so
 %%APR_PORTS%%lib/libaprutil-1.so.2
-libexec/apache21/httpd.exp
-%%MOD_ACTIONS%%libexec/apache21/mod_actions.so
-%%MOD_ALIAS%%libexec/apache21/mod_alias.so
-%%MOD_ASIS%%libexec/apache21/mod_asis.so
-%%MOD_AUTH_BASIC%%libexec/apache21/mod_auth_basic.so
-%%MOD_AUTH_DIGEST%%libexec/apache21/mod_auth_digest.so
-%%MOD_AUTHN_ANON%%libexec/apache21/mod_authn_anon.so
-%%MOD_AUTHN_DBM%%libexec/apache21/mod_authn_dbm.so
-%%MOD_AUTHN_DEFAULT%%libexec/apache21/mod_authn_default.so
-%%MOD_AUTHN_FILE%%libexec/apache21/mod_authn_file.so
-%%MOD_AUTHNZ_LDAP%%libexec/apache21/mod_authnz_ldap.so
-%%MOD_AUTHZ_DBM%%libexec/apache21/mod_authz_dbm.so
-%%MOD_AUTHZ_DEFAULT%%libexec/apache21/mod_authz_default.so
-%%MOD_AUTHZ_GROUPFILE%%libexec/apache21/mod_authz_groupfile.so
-%%MOD_AUTHZ_HOST%%libexec/apache21/mod_authz_host.so
-%%MOD_AUTHZ_OWNER%%libexec/apache21/mod_authz_owner.so
-%%MOD_AUTHZ_USER%%libexec/apache21/mod_authz_user.so
-%%MOD_AUTOINDEX%%libexec/apache21/mod_autoindex.so
-%%MOD_BUCKETEER%%libexec/apache21/mod_bucketeer.so
-%%MOD_CACHE%%libexec/apache21/mod_cache.so
-%%MOD_CASE_FILTER%%libexec/apache21/mod_case_filter.so
-%%MOD_CASE_FILTER_IN%%libexec/apache21/mod_case_filter_in.so
-%%MOD_CERN_META%%libexec/apache21/mod_cern_meta.so
-%%MOD_CGI%%libexec/apache21/mod_cgi.so
-%%MOD_CGID%%libexec/apache21/mod_cgid.so
-%%MOD_CHARSET_LITE%%libexec/apache21/mod_charset_lite.so
-%%MOD_DAV%%libexec/apache21/mod_dav.so
-%%MOD_DAV_FS%%libexec/apache21/mod_dav_fs.so
-%%MOD_DEFLATE%%libexec/apache21/mod_deflate.so
-%%MOD_DIR%%libexec/apache21/mod_dir.so
-%%MOD_DISK_CACHE%%libexec/apache21/mod_disk_cache.so
-%%MOD_ENV%%libexec/apache21/mod_env.so
-%%MOD_EXPIRES%%libexec/apache21/mod_expires.so
-%%MOD_EXT_FILTER%%libexec/apache21/mod_ext_filter.so
-%%MOD_FILE_CACHE%%libexec/apache21/mod_file_cache.so
-%%MOD_HEADERS%%libexec/apache21/mod_headers.so
-%%MOD_IMAGEMAP%%libexec/apache21/mod_imagemap.so
-%%MOD_INCLUDE%%libexec/apache21/mod_include.so
-%%MOD_INFO%%libexec/apache21/mod_info.so
-%%MOD_LDAP%%libexec/apache21/mod_ldap.so
-%%MOD_LOG_CONFIG%%libexec/apache21/mod_log_config.so
-%%MOD_LOG_FORENSIC%%libexec/apache21/mod_log_forensic.so
-%%MOD_LOGIO%%libexec/apache21/mod_logio.so
-%%MOD_MEM_CACHE%%libexec/apache21/mod_mem_cache.so
-%%MOD_MIME%%libexec/apache21/mod_mime.so
-%%MOD_MIME_MAGIC%%libexec/apache21/mod_mime_magic.so
-%%MOD_NEGOTIATION%%libexec/apache21/mod_negotiation.so
-%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache21/mod_optional_hook_export.so
-%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache21/mod_optional_hook_import.so
-%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache21/mod_optional_fn_import.so
-%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache21/mod_optional_fn_export.so
-%%MOD_PROXY%%libexec/apache21/mod_proxy.so
-%%MOD_PROXY_AJP%%libexec/apache21/mod_proxy_ajp.so
-%%MOD_PROXY_BALANCER%%libexec/apache21/mod_proxy_balancer.so
-%%MOD_PROXY_CONNECT%%libexec/apache21/mod_proxy_connect.so
-%%MOD_PROXY_FTP%%libexec/apache21/mod_proxy_ftp.so
-%%MOD_PROXY_HTTP%%libexec/apache21/mod_proxy_http.so
-%%MOD_REWRITE%%libexec/apache21/mod_rewrite.so
-%%MOD_SETENVIF%%libexec/apache21/mod_setenvif.so
-%%MOD_SPELING%%libexec/apache21/mod_speling.so
-%%MOD_SSL%%libexec/apache21/mod_ssl.so
-%%MOD_STATUS%%libexec/apache21/mod_status.so
-%%MOD_SUEXEC%%libexec/apache21/mod_suexec.so
-%%MOD_UNIQUE_ID%%libexec/apache21/mod_unique_id.so
-%%MOD_USERDIR%%libexec/apache21/mod_userdir.so
-%%MOD_USERTRACK%%libexec/apache21/mod_usertrack.so
-%%MOD_VHOST_ALIAS%%libexec/apache21/mod_vhost_alias.so
+libexec/apache22/httpd.exp
+%%MOD_ACTIONS%%libexec/apache22/mod_actions.so
+%%MOD_ALIAS%%libexec/apache22/mod_alias.so
+%%MOD_ASIS%%libexec/apache22/mod_asis.so
+%%MOD_AUTH_BASIC%%libexec/apache22/mod_auth_basic.so
+%%MOD_AUTH_DIGEST%%libexec/apache22/mod_auth_digest.so
+%%MOD_AUTHN_ANON%%libexec/apache22/mod_authn_anon.so
+%%MOD_AUTHN_DBM%%libexec/apache22/mod_authn_dbm.so
+%%MOD_AUTHN_DEFAULT%%libexec/apache22/mod_authn_default.so
+%%MOD_AUTHN_FILE%%libexec/apache22/mod_authn_file.so
+%%MOD_AUTHNZ_LDAP%%libexec/apache22/mod_authnz_ldap.so
+%%MOD_AUTHZ_DBM%%libexec/apache22/mod_authz_dbm.so
+%%MOD_AUTHZ_DEFAULT%%libexec/apache22/mod_authz_default.so
+%%MOD_AUTHZ_GROUPFILE%%libexec/apache22/mod_authz_groupfile.so
+%%MOD_AUTHZ_HOST%%libexec/apache22/mod_authz_host.so
+%%MOD_AUTHZ_OWNER%%libexec/apache22/mod_authz_owner.so
+%%MOD_AUTHZ_USER%%libexec/apache22/mod_authz_user.so
+%%MOD_AUTOINDEX%%libexec/apache22/mod_autoindex.so
+%%MOD_BUCKETEER%%libexec/apache22/mod_bucketeer.so
+%%MOD_CACHE%%libexec/apache22/mod_cache.so
+%%MOD_CASE_FILTER%%libexec/apache22/mod_case_filter.so
+%%MOD_CASE_FILTER_IN%%libexec/apache22/mod_case_filter_in.so
+%%MOD_CERN_META%%libexec/apache22/mod_cern_meta.so
+%%MOD_CGI%%libexec/apache22/mod_cgi.so
+%%MOD_CGID%%libexec/apache22/mod_cgid.so
+%%MOD_CHARSET_LITE%%libexec/apache22/mod_charset_lite.so
+%%MOD_DAV%%libexec/apache22/mod_dav.so
+%%MOD_DAV_FS%%libexec/apache22/mod_dav_fs.so
+%%MOD_DEFLATE%%libexec/apache22/mod_deflate.so
+%%MOD_DIR%%libexec/apache22/mod_dir.so
+%%MOD_DISK_CACHE%%libexec/apache22/mod_disk_cache.so
+%%MOD_ENV%%libexec/apache22/mod_env.so
+%%MOD_EXPIRES%%libexec/apache22/mod_expires.so
+%%MOD_EXT_FILTER%%libexec/apache22/mod_ext_filter.so
+%%MOD_FILE_CACHE%%libexec/apache22/mod_file_cache.so
+%%MOD_HEADERS%%libexec/apache22/mod_headers.so
+%%MOD_IMAGEMAP%%libexec/apache22/mod_imagemap.so
+%%MOD_INCLUDE%%libexec/apache22/mod_include.so
+%%MOD_INFO%%libexec/apache22/mod_info.so
+%%MOD_LDAP%%libexec/apache22/mod_ldap.so
+%%MOD_LOG_CONFIG%%libexec/apache22/mod_log_config.so
+%%MOD_LOG_FORENSIC%%libexec/apache22/mod_log_forensic.so
+%%MOD_LOGIO%%libexec/apache22/mod_logio.so
+%%MOD_MEM_CACHE%%libexec/apache22/mod_mem_cache.so
+%%MOD_MIME%%libexec/apache22/mod_mime.so
+%%MOD_MIME_MAGIC%%libexec/apache22/mod_mime_magic.so
+%%MOD_NEGOTIATION%%libexec/apache22/mod_negotiation.so
+%%MOD_OPTIONAL_HOOK_EXPORT%%libexec/apache22/mod_optional_hook_export.so
+%%MOD_OPTIONAL_HOOK_IMPORT%%libexec/apache22/mod_optional_hook_import.so
+%%MOD_OPTIONAL_FN_IMPORT%%libexec/apache22/mod_optional_fn_import.so
+%%MOD_OPTIONAL_FN_EXPORT%%libexec/apache22/mod_optional_fn_export.so
+%%MOD_PROXY%%libexec/apache22/mod_proxy.so
+%%MOD_PROXY_AJP%%libexec/apache22/mod_proxy_ajp.so
+%%MOD_PROXY_BALANCER%%libexec/apache22/mod_proxy_balancer.so
+%%MOD_PROXY_CONNECT%%libexec/apache22/mod_proxy_connect.so
+%%MOD_PROXY_FTP%%libexec/apache22/mod_proxy_ftp.so
+%%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.so
+%%MOD_REWRITE%%libexec/apache22/mod_rewrite.so
+%%MOD_SETENVIF%%libexec/apache22/mod_setenvif.so
+%%MOD_SPELING%%libexec/apache22/mod_speling.so
+%%MOD_SSL%%libexec/apache22/mod_ssl.so
+%%MOD_STATUS%%libexec/apache22/mod_status.so
+%%MOD_SUEXEC%%libexec/apache22/mod_suexec.so
+%%MOD_UNIQUE_ID%%libexec/apache22/mod_unique_id.so
+%%MOD_USERDIR%%libexec/apache22/mod_userdir.so
+%%MOD_USERTRACK%%libexec/apache22/mod_usertrack.so
+%%MOD_VHOST_ALIAS%%libexec/apache22/mod_vhost_alias.so
 sbin/ab
 sbin/apachectl
 sbin/apxs
@@ -254,293 +254,290 @@ sbin/rotatelogs
 %%APR_PORTS%%build-1/make_exports.awk
 %%APR_PORTS%%build-1/make_var_export.awk
 %%APR_PORTS%%build-1/mkdir.sh
-share/apache21/build/config_vars.mk
-share/apache21/build/config.nice
-share/apache21/build/instdso.sh
-share/apache21/build/library.mk
-share/apache21/build/ltlib.mk
-share/apache21/build/mkdir.sh
-share/apache21/build/program.mk
-share/apache21/build/rules.mk
-share/apache21/build/special.mk
+share/apache22/build/config_vars.mk
+share/apache22/build/config.nice
+share/apache22/build/instdso.sh
+share/apache22/build/library.mk
+share/apache22/build/ltlib.mk
+share/apache22/build/mkdir.sh
+share/apache22/build/program.mk
+share/apache22/build/rules.mk
+share/apache22/build/special.mk
 %%CGI%%@unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
-%%CGI%%@exec [ ! -d %D/www/cgi-bin ] && ln -fs %D/www/cgi-bin-dist %D/www/cgi-bin
-%%CGI%%www/cgi-bin-dist/printenv
-%%CGI%%www/cgi-bin-dist/test-cgi
+%%CGI%%www/apache22/cgi-bin/printenv
+%%CGI%%www/apache22/cgi-bin/test-cgi
 %%WWWDATA%%@unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
-%%WWWDATA%%@exec [ ! -d %D/www/data ] && ln -fs %D/www/data-dist %D/www/data
-%%WWWDATA%%www/data-dist/apache_pb.gif
-%%WWWDATA%%www/data-dist/apache_pb.png
-%%WWWDATA%%www/data-dist/apache_pb2.gif
-%%WWWDATA%%www/data-dist/apache_pb2.png
-%%WWWDATA%%www/data-dist/apache_pb2_ani.gif
-%%WWWDATA%%www/data-dist/index.html
+%%WWWDATA%%www/apache22/data/apache_pb.gif
+%%WWWDATA%%www/apache22/data/apache_pb.png
+%%WWWDATA%%www/apache22/data/apache_pb2.gif
+%%WWWDATA%%www/apache22/data/apache_pb2.png
+%%WWWDATA%%www/apache22/data/apache_pb2_ani.gif
+%%WWWDATA%%www/apache22/data/index.html
 %%ERROR%%@unexec if [ -L %D/www/error ]; then rm -f %D/www/error; fi
-%%ERROR%%@exec [ ! -d %D/www/error ] && ln -fs %D/www/error-dist %D/www/error
-%%ERROR%%www/error-dist/HTTP_BAD_GATEWAY.html.var
-%%ERROR%%www/error-dist/HTTP_BAD_REQUEST.html.var
-%%ERROR%%www/error-dist/HTTP_FORBIDDEN.html.var
-%%ERROR%%www/error-dist/HTTP_GONE.html.var
-%%ERROR%%www/error-dist/HTTP_INTERNAL_SERVER_ERROR.html.var
-%%ERROR%%www/error-dist/HTTP_LENGTH_REQUIRED.html.var
-%%ERROR%%www/error-dist/HTTP_METHOD_NOT_ALLOWED.html.var
-%%ERROR%%www/error-dist/HTTP_NOT_FOUND.html.var
-%%ERROR%%www/error-dist/HTTP_NOT_IMPLEMENTED.html.var
-%%ERROR%%www/error-dist/HTTP_PRECONDITION_FAILED.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_TIME_OUT.html.var
-%%ERROR%%www/error-dist/HTTP_REQUEST_URI_TOO_LARGE.html.var
-%%ERROR%%www/error-dist/HTTP_SERVICE_UNAVAILABLE.html.var
-%%ERROR%%www/error-dist/HTTP_UNAUTHORIZED.html.var
-%%ERROR%%www/error-dist/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-%%ERROR%%www/error-dist/HTTP_VARIANT_ALSO_VARIES.html.var
-%%ERROR%%www/error-dist/README
-%%ERROR%%www/error-dist/contact.html.var
-%%ERROR%%www/error-dist/include/bottom.html
-%%ERROR%%www/error-dist/include/spacer.html
-%%ERROR%%www/error-dist/include/top.html
+%%ERROR%%www/apache22/error/HTTP_BAD_GATEWAY.html.var
+%%ERROR%%www/apache22/error/HTTP_BAD_REQUEST.html.var
+%%ERROR%%www/apache22/error/HTTP_FORBIDDEN.html.var
+%%ERROR%%www/apache22/error/HTTP_GONE.html.var
+%%ERROR%%www/apache22/error/HTTP_INTERNAL_SERVER_ERROR.html.var
+%%ERROR%%www/apache22/error/HTTP_LENGTH_REQUIRED.html.var
+%%ERROR%%www/apache22/error/HTTP_METHOD_NOT_ALLOWED.html.var
+%%ERROR%%www/apache22/error/HTTP_NOT_FOUND.html.var
+%%ERROR%%www/apache22/error/HTTP_NOT_IMPLEMENTED.html.var
+%%ERROR%%www/apache22/error/HTTP_PRECONDITION_FAILED.html.var
+%%ERROR%%www/apache22/error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
+%%ERROR%%www/apache22/error/HTTP_REQUEST_TIME_OUT.html.var
+%%ERROR%%www/apache22/error/HTTP_REQUEST_URI_TOO_LARGE.html.var
+%%ERROR%%www/apache22/error/HTTP_SERVICE_UNAVAILABLE.html.var
+%%ERROR%%www/apache22/error/HTTP_UNAUTHORIZED.html.var
+%%ERROR%%www/apache22/error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
+%%ERROR%%www/apache22/error/HTTP_VARIANT_ALSO_VARIES.html.var
+%%ERROR%%www/apache22/error/README
+%%ERROR%%www/apache22/error/contact.html.var
+%%ERROR%%www/apache22/error/include/bottom.html
+%%ERROR%%www/apache22/error/include/spacer.html
+%%ERROR%%www/apache22/error/include/top.html
 %%ICONS%%@unexec if [ -L %D/www/icons ]; then rm -f %D/www/icons; fi
-%%ICONS%%@exec [ ! -d %D/www/icons ] && ln -fs %D/www/icons-dist %D/www/icons
-%%ICONS%%www/icons-dist/README
-%%ICONS%%www/icons-dist/a.gif
-%%ICONS%%www/icons-dist/a.png
-%%ICONS%%www/icons-dist/alert.black.gif
-%%ICONS%%www/icons-dist/alert.black.png
-%%ICONS%%www/icons-dist/alert.red.gif
-%%ICONS%%www/icons-dist/alert.red.png
-%%ICONS%%www/icons-dist/apache_pb.gif
-%%ICONS%%www/icons-dist/apache_pb.png
-%%ICONS%%www/icons-dist/apache_pb2.gif
-%%ICONS%%www/icons-dist/apache_pb2.png
-%%ICONS%%www/icons-dist/apache_pb2_ani.gif
-%%ICONS%%www/icons-dist/back.gif
-%%ICONS%%www/icons-dist/back.png
-%%ICONS%%www/icons-dist/ball.gray.gif
-%%ICONS%%www/icons-dist/ball.gray.png
-%%ICONS%%www/icons-dist/ball.red.gif
-%%ICONS%%www/icons-dist/ball.red.png
-%%ICONS%%www/icons-dist/binary.gif
-%%ICONS%%www/icons-dist/binary.png
-%%ICONS%%www/icons-dist/binhex.gif
-%%ICONS%%www/icons-dist/binhex.png
-%%ICONS%%www/icons-dist/blank.gif
-%%ICONS%%www/icons-dist/blank.png
-%%ICONS%%www/icons-dist/bomb.gif
-%%ICONS%%www/icons-dist/bomb.png
-%%ICONS%%www/icons-dist/box1.gif
-%%ICONS%%www/icons-dist/box1.png
-%%ICONS%%www/icons-dist/box2.gif
-%%ICONS%%www/icons-dist/box2.png
-%%ICONS%%www/icons-dist/broken.gif
-%%ICONS%%www/icons-dist/broken.png
-%%ICONS%%www/icons-dist/burst.gif
-%%ICONS%%www/icons-dist/burst.png
-%%ICONS%%www/icons-dist/c.gif
-%%ICONS%%www/icons-dist/c.png
-%%ICONS%%www/icons-dist/comp.blue.gif
-%%ICONS%%www/icons-dist/comp.blue.png
-%%ICONS%%www/icons-dist/comp.gray.gif
-%%ICONS%%www/icons-dist/comp.gray.png
-%%ICONS%%www/icons-dist/compressed.gif
-%%ICONS%%www/icons-dist/compressed.png
-%%ICONS%%www/icons-dist/continued.gif
-%%ICONS%%www/icons-dist/continued.png
-%%ICONS%%www/icons-dist/dir.gif
-%%ICONS%%www/icons-dist/dir.png
-%%ICONS%%www/icons-dist/diskimg.gif
-%%ICONS%%www/icons-dist/diskimg.png
-%%ICONS%%www/icons-dist/down.gif
-%%ICONS%%www/icons-dist/down.png
-%%ICONS%%www/icons-dist/dvi.gif
-%%ICONS%%www/icons-dist/dvi.png
-%%ICONS%%www/icons-dist/f.gif
-%%ICONS%%www/icons-dist/f.png
-%%ICONS%%www/icons-dist/folder.gif
-%%ICONS%%www/icons-dist/folder.open.gif
-%%ICONS%%www/icons-dist/folder.open.png
-%%ICONS%%www/icons-dist/folder.png
-%%ICONS%%www/icons-dist/folder.sec.gif
-%%ICONS%%www/icons-dist/folder.sec.png
-%%ICONS%%www/icons-dist/forward.gif
-%%ICONS%%www/icons-dist/forward.png
-%%ICONS%%www/icons-dist/freebsd.gif
-%%ICONS%%www/icons-dist/generic.gif
-%%ICONS%%www/icons-dist/generic.png
-%%ICONS%%www/icons-dist/generic.red.gif
-%%ICONS%%www/icons-dist/generic.red.png
-%%ICONS%%www/icons-dist/generic.sec.gif
-%%ICONS%%www/icons-dist/generic.sec.png
-%%ICONS%%www/icons-dist/hand.right.gif
-%%ICONS%%www/icons-dist/hand.right.png
-%%ICONS%%www/icons-dist/hand.up.gif
-%%ICONS%%www/icons-dist/hand.up.png
-%%ICONS%%www/icons-dist/icon.sheet.gif
-%%ICONS%%www/icons-dist/icon.sheet.png
-%%ICONS%%www/icons-dist/image1.gif
-%%ICONS%%www/icons-dist/image1.png
-%%ICONS%%www/icons-dist/image2.gif
-%%ICONS%%www/icons-dist/image2.png
-%%ICONS%%www/icons-dist/image3.gif
-%%ICONS%%www/icons-dist/image3.png
-%%ICONS%%www/icons-dist/index.gif
-%%ICONS%%www/icons-dist/index.png
-%%ICONS%%www/icons-dist/layout.gif
-%%ICONS%%www/icons-dist/layout.png
-%%ICONS%%www/icons-dist/left.gif
-%%ICONS%%www/icons-dist/left.png
-%%ICONS%%www/icons-dist/link.gif
-%%ICONS%%www/icons-dist/link.png
-%%ICONS%%www/icons-dist/movie.gif
-%%ICONS%%www/icons-dist/movie.png
-%%ICONS%%www/icons-dist/p.gif
-%%ICONS%%www/icons-dist/p.png
-%%ICONS%%www/icons-dist/patch.gif
-%%ICONS%%www/icons-dist/patch.png
-%%ICONS%%www/icons-dist/pdf.gif
-%%ICONS%%www/icons-dist/pdf.png
-%%ICONS%%www/icons-dist/pie0.gif
-%%ICONS%%www/icons-dist/pie0.png
-%%ICONS%%www/icons-dist/pie1.gif
-%%ICONS%%www/icons-dist/pie1.png
-%%ICONS%%www/icons-dist/pie2.gif
-%%ICONS%%www/icons-dist/pie2.png
-%%ICONS%%www/icons-dist/pie3.gif
-%%ICONS%%www/icons-dist/pie3.png
-%%ICONS%%www/icons-dist/pie4.gif
-%%ICONS%%www/icons-dist/pie4.png
-%%ICONS%%www/icons-dist/pie5.gif
-%%ICONS%%www/icons-dist/pie5.png
-%%ICONS%%www/icons-dist/pie6.gif
-%%ICONS%%www/icons-dist/pie6.png
-%%ICONS%%www/icons-dist/pie7.gif
-%%ICONS%%www/icons-dist/pie7.png
-%%ICONS%%www/icons-dist/pie8.gif
-%%ICONS%%www/icons-dist/pie8.png
-%%ICONS%%www/icons-dist/portal.gif
-%%ICONS%%www/icons-dist/portal.png
-%%ICONS%%www/icons-dist/ps.gif
-%%ICONS%%www/icons-dist/ps.png
-%%ICONS%%www/icons-dist/quill.gif
-%%ICONS%%www/icons-dist/quill.png
-%%ICONS%%www/icons-dist/right.gif
-%%ICONS%%www/icons-dist/right.png
-%%ICONS%%www/icons-dist/screw1.gif
-%%ICONS%%www/icons-dist/screw1.png
-%%ICONS%%www/icons-dist/screw2.gif
-%%ICONS%%www/icons-dist/screw2.png
-%%ICONS%%www/icons-dist/script.gif
-%%ICONS%%www/icons-dist/script.png
-%%ICONS%%www/icons-dist/small/README.txt
-%%ICONS%%www/icons-dist/small/back.gif
-%%ICONS%%www/icons-dist/small/back.png
-%%ICONS%%www/icons-dist/small/binary.gif
-%%ICONS%%www/icons-dist/small/binary.png
-%%ICONS%%www/icons-dist/small/binhex.gif
-%%ICONS%%www/icons-dist/small/binhex.png
-%%ICONS%%www/icons-dist/small/blank.gif
-%%ICONS%%www/icons-dist/small/blank.png
-%%ICONS%%www/icons-dist/small/broken.gif
-%%ICONS%%www/icons-dist/small/broken.png
-%%ICONS%%www/icons-dist/small/burst.gif
-%%ICONS%%www/icons-dist/small/burst.png
-%%ICONS%%www/icons-dist/small/comp1.gif
-%%ICONS%%www/icons-dist/small/comp1.png
-%%ICONS%%www/icons-dist/small/comp2.gif
-%%ICONS%%www/icons-dist/small/comp2.png
-%%ICONS%%www/icons-dist/small/compressed.gif
-%%ICONS%%www/icons-dist/small/compressed.png
-%%ICONS%%www/icons-dist/small/continued.gif
-%%ICONS%%www/icons-dist/small/continued.png
-%%ICONS%%www/icons-dist/small/dir.gif
-%%ICONS%%www/icons-dist/small/dir.png
-%%ICONS%%www/icons-dist/small/dir2.gif
-%%ICONS%%www/icons-dist/small/dir2.png
-%%ICONS%%www/icons-dist/small/doc.gif
-%%ICONS%%www/icons-dist/small/doc.png
-%%ICONS%%www/icons-dist/small/forward.gif
-%%ICONS%%www/icons-dist/small/forward.png
-%%ICONS%%www/icons-dist/small/generic.gif
-%%ICONS%%www/icons-dist/small/generic.png
-%%ICONS%%www/icons-dist/small/generic2.gif
-%%ICONS%%www/icons-dist/small/generic2.png
-%%ICONS%%www/icons-dist/small/generic3.gif
-%%ICONS%%www/icons-dist/small/generic3.png
-%%ICONS%%www/icons-dist/small/image.gif
-%%ICONS%%www/icons-dist/small/image.png
-%%ICONS%%www/icons-dist/small/image2.gif
-%%ICONS%%www/icons-dist/small/image2.png
-%%ICONS%%www/icons-dist/small/index.gif
-%%ICONS%%www/icons-dist/small/index.png
-%%ICONS%%www/icons-dist/small/key.gif
-%%ICONS%%www/icons-dist/small/key.png
-%%ICONS%%www/icons-dist/small/movie.gif
-%%ICONS%%www/icons-dist/small/movie.png
-%%ICONS%%www/icons-dist/small/patch.gif
-%%ICONS%%www/icons-dist/small/patch.png
-%%ICONS%%www/icons-dist/small/ps.gif
-%%ICONS%%www/icons-dist/small/ps.png
-%%ICONS%%www/icons-dist/small/rainbow.gif
-%%ICONS%%www/icons-dist/small/rainbow.png
-%%ICONS%%www/icons-dist/small/sound.gif
-%%ICONS%%www/icons-dist/small/sound.png
-%%ICONS%%www/icons-dist/small/sound2.gif
-%%ICONS%%www/icons-dist/small/sound2.png
-%%ICONS%%www/icons-dist/small/tar.gif
-%%ICONS%%www/icons-dist/small/tar.png
-%%ICONS%%www/icons-dist/small/text.gif
-%%ICONS%%www/icons-dist/small/text.png
-%%ICONS%%www/icons-dist/small/transfer.gif
-%%ICONS%%www/icons-dist/small/transfer.png
-%%ICONS%%www/icons-dist/small/unknown.gif
-%%ICONS%%www/icons-dist/small/unknown.png
-%%ICONS%%www/icons-dist/small/uu.gif
-%%ICONS%%www/icons-dist/small/uu.png
-%%ICONS%%www/icons-dist/sound1.gif
-%%ICONS%%www/icons-dist/sound1.png
-%%ICONS%%www/icons-dist/sound2.gif
-%%ICONS%%www/icons-dist/sound2.png
-%%ICONS%%www/icons-dist/sphere1.gif
-%%ICONS%%www/icons-dist/sphere1.png
-%%ICONS%%www/icons-dist/sphere2.gif
-%%ICONS%%www/icons-dist/sphere2.png
-%%ICONS%%www/icons-dist/tar.gif
-%%ICONS%%www/icons-dist/tar.png
-%%ICONS%%www/icons-dist/tex.gif
-%%ICONS%%www/icons-dist/tex.png
-%%ICONS%%www/icons-dist/text.gif
-%%ICONS%%www/icons-dist/text.png
-%%ICONS%%www/icons-dist/transfer.gif
-%%ICONS%%www/icons-dist/transfer.png
-%%ICONS%%www/icons-dist/unknown.gif
-%%ICONS%%www/icons-dist/unknown.png
-%%ICONS%%www/icons-dist/up.gif
-%%ICONS%%www/icons-dist/up.png
-%%ICONS%%www/icons-dist/uu.gif
-%%ICONS%%www/icons-dist/uu.png
-%%ICONS%%www/icons-dist/uuencoded.gif
-%%ICONS%%www/icons-dist/uuencoded.png
-%%ICONS%%www/icons-dist/world1.gif
-%%ICONS%%www/icons-dist/world1.png
-%%ICONS%%www/icons-dist/world2.gif
-%%ICONS%%www/icons-dist/world2.png
-%%ICONS%%@dirrm www/icons-dist/small
-%%ICONS%%@dirrm www/icons-dist
-%%ERROR%%@dirrm www/error-dist/include
-%%ERROR%%@dirrm www/error-dist
-%%WWWDATA%%@dirrm www/data-dist
-%%CGI%%@dirrm www/cgi-bin-dist
+%%ICONS%%www/apache22/icons/README
+%%ICONS%%www/apache22/icons/a.gif
+%%ICONS%%www/apache22/icons/a.png
+%%ICONS%%www/apache22/icons/alert.black.gif
+%%ICONS%%www/apache22/icons/alert.black.png
+%%ICONS%%www/apache22/icons/alert.red.gif
+%%ICONS%%www/apache22/icons/alert.red.png
+%%ICONS%%www/apache22/icons/apache_pb.gif
+%%ICONS%%www/apache22/icons/apache_pb.png
+%%ICONS%%www/apache22/icons/apache_pb2.gif
+%%ICONS%%www/apache22/icons/apache_pb2.png
+%%ICONS%%www/apache22/icons/apache_pb2_ani.gif
+%%ICONS%%www/apache22/icons/back.gif
+%%ICONS%%www/apache22/icons/back.png
+%%ICONS%%www/apache22/icons/ball.gray.gif
+%%ICONS%%www/apache22/icons/ball.gray.png
+%%ICONS%%www/apache22/icons/ball.red.gif
+%%ICONS%%www/apache22/icons/ball.red.png
+%%ICONS%%www/apache22/icons/binary.gif
+%%ICONS%%www/apache22/icons/binary.png
+%%ICONS%%www/apache22/icons/binhex.gif
+%%ICONS%%www/apache22/icons/binhex.png
+%%ICONS%%www/apache22/icons/blank.gif
+%%ICONS%%www/apache22/icons/blank.png
+%%ICONS%%www/apache22/icons/bomb.gif
+%%ICONS%%www/apache22/icons/bomb.png
+%%ICONS%%www/apache22/icons/box1.gif
+%%ICONS%%www/apache22/icons/box1.png
+%%ICONS%%www/apache22/icons/box2.gif
+%%ICONS%%www/apache22/icons/box2.png
+%%ICONS%%www/apache22/icons/broken.gif
+%%ICONS%%www/apache22/icons/broken.png
+%%ICONS%%www/apache22/icons/burst.gif
+%%ICONS%%www/apache22/icons/burst.png
+%%ICONS%%www/apache22/icons/c.gif
+%%ICONS%%www/apache22/icons/c.png
+%%ICONS%%www/apache22/icons/comp.blue.gif
+%%ICONS%%www/apache22/icons/comp.blue.png
+%%ICONS%%www/apache22/icons/comp.gray.gif
+%%ICONS%%www/apache22/icons/comp.gray.png
+%%ICONS%%www/apache22/icons/compressed.gif
+%%ICONS%%www/apache22/icons/compressed.png
+%%ICONS%%www/apache22/icons/continued.gif
+%%ICONS%%www/apache22/icons/continued.png
+%%ICONS%%www/apache22/icons/dir.gif
+%%ICONS%%www/apache22/icons/dir.png
+%%ICONS%%www/apache22/icons/diskimg.gif
+%%ICONS%%www/apache22/icons/diskimg.png
+%%ICONS%%www/apache22/icons/down.gif
+%%ICONS%%www/apache22/icons/down.png
+%%ICONS%%www/apache22/icons/dvi.gif
+%%ICONS%%www/apache22/icons/dvi.png
+%%ICONS%%www/apache22/icons/f.gif
+%%ICONS%%www/apache22/icons/f.png
+%%ICONS%%www/apache22/icons/folder.gif
+%%ICONS%%www/apache22/icons/folder.open.gif
+%%ICONS%%www/apache22/icons/folder.open.png
+%%ICONS%%www/apache22/icons/folder.png
+%%ICONS%%www/apache22/icons/folder.sec.gif
+%%ICONS%%www/apache22/icons/folder.sec.png
+%%ICONS%%www/apache22/icons/forward.gif
+%%ICONS%%www/apache22/icons/forward.png
+%%ICONS%%www/apache22/icons/freebsd.gif
+%%ICONS%%www/apache22/icons/generic.gif
+%%ICONS%%www/apache22/icons/generic.png
+%%ICONS%%www/apache22/icons/generic.red.gif
+%%ICONS%%www/apache22/icons/generic.red.png
+%%ICONS%%www/apache22/icons/generic.sec.gif
+%%ICONS%%www/apache22/icons/generic.sec.png
+%%ICONS%%www/apache22/icons/hand.right.gif
+%%ICONS%%www/apache22/icons/hand.right.png
+%%ICONS%%www/apache22/icons/hand.up.gif
+%%ICONS%%www/apache22/icons/hand.up.png
+%%ICONS%%www/apache22/icons/icon.sheet.gif
+%%ICONS%%www/apache22/icons/icon.sheet.png
+%%ICONS%%www/apache22/icons/image1.gif
+%%ICONS%%www/apache22/icons/image1.png
+%%ICONS%%www/apache22/icons/image2.gif
+%%ICONS%%www/apache22/icons/image2.png
+%%ICONS%%www/apache22/icons/image3.gif
+%%ICONS%%www/apache22/icons/image3.png
+%%ICONS%%www/apache22/icons/index.gif
+%%ICONS%%www/apache22/icons/index.png
+%%ICONS%%www/apache22/icons/layout.gif
+%%ICONS%%www/apache22/icons/layout.png
+%%ICONS%%www/apache22/icons/left.gif
+%%ICONS%%www/apache22/icons/left.png
+%%ICONS%%www/apache22/icons/link.gif
+%%ICONS%%www/apache22/icons/link.png
+%%ICONS%%www/apache22/icons/movie.gif
+%%ICONS%%www/apache22/icons/movie.png
+%%ICONS%%www/apache22/icons/p.gif
+%%ICONS%%www/apache22/icons/p.png
+%%ICONS%%www/apache22/icons/patch.gif
+%%ICONS%%www/apache22/icons/patch.png
+%%ICONS%%www/apache22/icons/pdf.gif
+%%ICONS%%www/apache22/icons/pdf.png
+%%ICONS%%www/apache22/icons/pie0.gif
+%%ICONS%%www/apache22/icons/pie0.png
+%%ICONS%%www/apache22/icons/pie1.gif
+%%ICONS%%www/apache22/icons/pie1.png
+%%ICONS%%www/apache22/icons/pie2.gif
+%%ICONS%%www/apache22/icons/pie2.png
+%%ICONS%%www/apache22/icons/pie3.gif
+%%ICONS%%www/apache22/icons/pie3.png
+%%ICONS%%www/apache22/icons/pie4.gif
+%%ICONS%%www/apache22/icons/pie4.png
+%%ICONS%%www/apache22/icons/pie5.gif
+%%ICONS%%www/apache22/icons/pie5.png
+%%ICONS%%www/apache22/icons/pie6.gif
+%%ICONS%%www/apache22/icons/pie6.png
+%%ICONS%%www/apache22/icons/pie7.gif
+%%ICONS%%www/apache22/icons/pie7.png
+%%ICONS%%www/apache22/icons/pie8.gif
+%%ICONS%%www/apache22/icons/pie8.png
+%%ICONS%%www/apache22/icons/portal.gif
+%%ICONS%%www/apache22/icons/portal.png
+%%ICONS%%www/apache22/icons/ps.gif
+%%ICONS%%www/apache22/icons/ps.png
+%%ICONS%%www/apache22/icons/quill.gif
+%%ICONS%%www/apache22/icons/quill.png
+%%ICONS%%www/apache22/icons/right.gif
+%%ICONS%%www/apache22/icons/right.png
+%%ICONS%%www/apache22/icons/screw1.gif
+%%ICONS%%www/apache22/icons/screw1.png
+%%ICONS%%www/apache22/icons/screw2.gif
+%%ICONS%%www/apache22/icons/screw2.png
+%%ICONS%%www/apache22/icons/script.gif
+%%ICONS%%www/apache22/icons/script.png
+%%ICONS%%www/apache22/icons/small/README.txt
+%%ICONS%%www/apache22/icons/small/back.gif
+%%ICONS%%www/apache22/icons/small/back.png
+%%ICONS%%www/apache22/icons/small/binary.gif
+%%ICONS%%www/apache22/icons/small/binary.png
+%%ICONS%%www/apache22/icons/small/binhex.gif
+%%ICONS%%www/apache22/icons/small/binhex.png
+%%ICONS%%www/apache22/icons/small/blank.gif
+%%ICONS%%www/apache22/icons/small/blank.png
+%%ICONS%%www/apache22/icons/small/broken.gif
+%%ICONS%%www/apache22/icons/small/broken.png
+%%ICONS%%www/apache22/icons/small/burst.gif
+%%ICONS%%www/apache22/icons/small/burst.png
+%%ICONS%%www/apache22/icons/small/comp1.gif
+%%ICONS%%www/apache22/icons/small/comp1.png
+%%ICONS%%www/apache22/icons/small/comp2.gif
+%%ICONS%%www/apache22/icons/small/comp2.png
+%%ICONS%%www/apache22/icons/small/compressed.gif
+%%ICONS%%www/apache22/icons/small/compressed.png
+%%ICONS%%www/apache22/icons/small/continued.gif
+%%ICONS%%www/apache22/icons/small/continued.png
+%%ICONS%%www/apache22/icons/small/dir.gif
+%%ICONS%%www/apache22/icons/small/dir.png
+%%ICONS%%www/apache22/icons/small/dir2.gif
+%%ICONS%%www/apache22/icons/small/dir2.png
+%%ICONS%%www/apache22/icons/small/doc.gif
+%%ICONS%%www/apache22/icons/small/doc.png
+%%ICONS%%www/apache22/icons/small/forward.gif
+%%ICONS%%www/apache22/icons/small/forward.png
+%%ICONS%%www/apache22/icons/small/generic.gif
+%%ICONS%%www/apache22/icons/small/generic.png
+%%ICONS%%www/apache22/icons/small/generic2.gif
+%%ICONS%%www/apache22/icons/small/generic2.png
+%%ICONS%%www/apache22/icons/small/generic3.gif
+%%ICONS%%www/apache22/icons/small/generic3.png
+%%ICONS%%www/apache22/icons/small/image.gif
+%%ICONS%%www/apache22/icons/small/image.png
+%%ICONS%%www/apache22/icons/small/image2.gif
+%%ICONS%%www/apache22/icons/small/image2.png
+%%ICONS%%www/apache22/icons/small/index.gif
+%%ICONS%%www/apache22/icons/small/index.png
+%%ICONS%%www/apache22/icons/small/key.gif
+%%ICONS%%www/apache22/icons/small/key.png
+%%ICONS%%www/apache22/icons/small/movie.gif
+%%ICONS%%www/apache22/icons/small/movie.png
+%%ICONS%%www/apache22/icons/small/patch.gif
+%%ICONS%%www/apache22/icons/small/patch.png
+%%ICONS%%www/apache22/icons/small/ps.gif
+%%ICONS%%www/apache22/icons/small/ps.png
+%%ICONS%%www/apache22/icons/small/rainbow.gif
+%%ICONS%%www/apache22/icons/small/rainbow.png
+%%ICONS%%www/apache22/icons/small/sound.gif
+%%ICONS%%www/apache22/icons/small/sound.png
+%%ICONS%%www/apache22/icons/small/sound2.gif
+%%ICONS%%www/apache22/icons/small/sound2.png
+%%ICONS%%www/apache22/icons/small/tar.gif
+%%ICONS%%www/apache22/icons/small/tar.png
+%%ICONS%%www/apache22/icons/small/text.gif
+%%ICONS%%www/apache22/icons/small/text.png
+%%ICONS%%www/apache22/icons/small/transfer.gif
+%%ICONS%%www/apache22/icons/small/transfer.png
+%%ICONS%%www/apache22/icons/small/unknown.gif
+%%ICONS%%www/apache22/icons/small/unknown.png
+%%ICONS%%www/apache22/icons/small/uu.gif
+%%ICONS%%www/apache22/icons/small/uu.png
+%%ICONS%%www/apache22/icons/sound1.gif
+%%ICONS%%www/apache22/icons/sound1.png
+%%ICONS%%www/apache22/icons/sound2.gif
+%%ICONS%%www/apache22/icons/sound2.png
+%%ICONS%%www/apache22/icons/sphere1.gif
+%%ICONS%%www/apache22/icons/sphere1.png
+%%ICONS%%www/apache22/icons/sphere2.gif
+%%ICONS%%www/apache22/icons/sphere2.png
+%%ICONS%%www/apache22/icons/tar.gif
+%%ICONS%%www/apache22/icons/tar.png
+%%ICONS%%www/apache22/icons/tex.gif
+%%ICONS%%www/apache22/icons/tex.png
+%%ICONS%%www/apache22/icons/text.gif
+%%ICONS%%www/apache22/icons/text.png
+%%ICONS%%www/apache22/icons/transfer.gif
+%%ICONS%%www/apache22/icons/transfer.png
+%%ICONS%%www/apache22/icons/unknown.gif
+%%ICONS%%www/apache22/icons/unknown.png
+%%ICONS%%www/apache22/icons/up.gif
+%%ICONS%%www/apache22/icons/up.png
+%%ICONS%%www/apache22/icons/uu.gif
+%%ICONS%%www/apache22/icons/uu.png
+%%ICONS%%www/apache22/icons/uuencoded.gif
+%%ICONS%%www/apache22/icons/uuencoded.png
+%%ICONS%%www/apache22/icons/world1.gif
+%%ICONS%%www/apache22/icons/world1.png
+%%ICONS%%www/apache22/icons/world2.gif
+%%ICONS%%www/apache22/icons/world2.png
+%%ICONS%%@dirrm www/apache22/icons/small
+%%ICONS%%@dirrm www/apache22/icons
+%%ERROR%%@dirrm www/apache22/error/include
+%%ERROR%%@dirrm www/apache22/error
+%%WWWDATA%%@dirrm www/apache22/data
+%%CGI%%@dirrm www/apache22/cgi-bin
 @dirrm %%EXAMPLESDIR%%/extra
 @dirrm %%EXAMPLESDIR%%
-@dirrm share/apache21/build
-@dirrm share/apache21
+@dirrm share/apache22/build
+@dirrm share/apache22
 %%APR_PORTS%%@dirrm include/apr-1
 %%APR_PORTS%%@dirrm build-1
-@unexec rmdir %D/libexec/apache21 2> /dev/null || true
-@dirrm include/apache21
-@exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
-@exec mkdir -p %D/etc/apache21/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
-@unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true
-@unexec rmdir %D/etc/apache21/extra 2> /dev/null || true
-@unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21."
+@unexec rmdir %D/libexec/apache22 2> /dev/null || true
+@dirrm include/apache22
+@exec mkdir -p %D/etc/apache22/Includes 2> /dev/null || true
+@exec mkdir -p %D/etc/apache22/envvars.d 2> /dev/null || true
+@unexec rmdir %D/www/apache22 2> /dev/null || true
+@unexec rmdir %D/etc/apache22/Includes 2> /dev/null || true
+@unexec rm -f %D/etc/apache22/httpd.conf.bak 2> /dev/null || true
+@unexec rmdir %D/etc/apache22/envvars.d 2> /dev/null || true
+@unexec rmdir %D/etc/apache22/extra 2> /dev/null || true
+@unexec rmdir %D/etc/apache22 2> /dev/null || echo "===> If you plan to do not reinstall apache22, you can safely remove %D/etc/apache22."