- Sync apache-apr layout with devel/apr one (to avoid another hack for

  subversion)
- Add support for APR_FROM_PORTS

12 files changed, 204 insertions, 236 deletions

diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index cfaba377f1d8..b9982cf496ed 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -60,8 +60,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--with-iconv=${LOCALBASE} \
-		--libdir=${PREFIX_RELDEST}/lib/apache21 \
-		--includedir=${PREFIX_RELDEST}/include/apache21 \
 		--enable-http
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
@@ -129,8 +127,15 @@ CONFIGURE_ARGS+=	--with-ldap \
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libapr-1.so) || defined(WITH_APR_FROM_PORTS)
-IGNORE=	: apr from ports is not yet supported
+.if defined(WITH_APR_FROM_PORTS)
+PLIST_SUB+=	APR_PORTS="@comment "
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
+CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
+			--with-apr-util=${LOCALBASE}/bin/apu-1-config
+CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
+.else
+PLIST_SUB+=	APR_PORTS=""
+CONFLICTS+=	apr-1.*
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
@@ -191,8 +196,6 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache21libs.sh > ${WRKDIR}/apache21libs.sh
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
@@ -215,10 +218,6 @@ pre-install:
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/apache21/Includes
-.if !defined(WITH_APR_FROM_PORTS)
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache21libs.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21libs.sh ${PREFIX}/etc/rc.d/000.apache21libs.sh
-.endif
 	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
 	@@${CAT} ${PKGMESSAGE}
diff --git a/www/apache21/files/apache21libs.sh b/www/apache21/files/apache21libs.sh
deleted file mode 100644
index 67fe5c302561..000000000000
--- a/www/apache21/files/apache21libs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/apache2
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/www/apache21/files/patch-configure.in b/www/apache21/files/patch-configure.in
index 6d77c65b7f07..e36f5d9ac795 100644
--- a/www/apache21/files/patch-configure.in
+++ b/www/apache21/files/patch-configure.in
@@ -1,24 +1,24 @@
---- configure.in.orig	Thu Mar 18 08:36:52 2004
-+++ configure.in	Fri Jul  2 11:44:25 2004
+--- configure.in.orig	Sun Nov 21 19:50:36 2004
++++ configure.in	Mon Dec 13 10:43:16 2004
 @@ -69,7 +69,7 @@
  
  if test "$apr_found" = "reconfig"; then
    APR_SUBDIR_CONFIG(srclib/apr,
 -                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-+                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir],
++                    [$apache_apr_flags --prefix=$prefix],
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the first to build and the last to be cleaned
    AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
  
  if test "$apu_found" = "reconfig"; then
    APR_SUBDIR_CONFIG(srclib/apr-util,
 -                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
-+                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir],
++                    [--with-apr=../apr --prefix=$prefix],
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -545,8 +545,14 @@
+@@ -549,8 +549,14 @@
  	[Root directory of the Apache install area])
  AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  	[Location of the config file, relative to the Apache root directory])
diff --git a/www/apache21/files/patch-srclib:apr-util:config.layout b/www/apache21/files/patch-srclib:apr-util:config.layout
index 222e91d975bc..ad1f4e176a59 100644
--- a/www/apache21/files/patch-srclib:apr-util:config.layout
+++ b/www/apache21/files/patch-srclib:apr-util:config.layout
@@ -1,10 +1,11 @@
---- srclib/apr-util/config.layout.orig	Tue Jan  7 13:13:09 2003
-+++ srclib/apr-util/config.layout	Tue Apr  1 18:36:16 2003
-@@ -229,3 +229,7 @@
+--- srclib/apr-util/config.layout.orig	Thu Oct  2 16:29:48 2003
++++ srclib/apr-util/config.layout	Mon Dec 13 10:17:45 2004
+@@ -229,4 +229,8 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
+     installbuilddir: ${prefix}/usr/share/apache2/build
 +
 +<Layout FreeBSD>
++    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
 +    libsuffix:
-+</Layout>
+ </Layout>
diff --git a/www/apache21/files/patch-srclib:apr:config.layout b/www/apache21/files/patch-srclib:apr:config.layout
index 5c52779635fc..87903810ee1b 100644
--- a/www/apache21/files/patch-srclib:apr:config.layout
+++ b/www/apache21/files/patch-srclib:apr:config.layout
@@ -1,10 +1,11 @@
---- srclib/apr/config.layout.orig	Tue Jan  7 13:06:50 2003
-+++ srclib/apr/config.layout	Tue Apr  1 18:36:51 2003
-@@ -229,3 +229,7 @@
+--- srclib/apr/config.layout.orig	Wed Jun 30 15:16:54 2004
++++ srclib/apr/config.layout	Mon Dec 13 10:17:16 2004
+@@ -229,3 +229,8 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix:    -${APR_MAJOR_VERSION}
  </Layout>
 +
 +<Layout FreeBSD>
++    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
 +    libsuffix:
 +</Layout>
diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist
index 39aee07cbe9f..d5c0504f45ec 100644
--- a/www/apache21/pkg-plist
+++ b/www/apache21/pkg-plist
@@ -14,7 +14,6 @@ etc/apache21/mime.types-dist
 @unexec if cmp -s %D/etc/apache21/ssl.conf %D/etc/apache21/ssl-std.conf; then rm -f %D/etc/apache21/ssl.conf; fi
 etc/apache21/ssl-std.conf
 @exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
-etc/rc.d/000.apache21libs.sh
 etc/rc.d/apache21.sh
 include/apache21/ap_compat.h
 include/apache21/ap_config.h
@@ -26,68 +25,68 @@ include/apache21/ap_mpm.h
 include/apache21/ap_provider.h
 include/apache21/ap_regkey.h
 include/apache21/ap_release.h
-include/apache21/apr.h
-include/apache21/apr_allocator.h
-include/apache21/apr_anylock.h
-include/apache21/apr_atomic.h
-include/apache21/apr_base64.h
-include/apache21/apr_buckets.h
-include/apache21/apr_date.h
-include/apache21/apr_dbm.h
-include/apache21/apr_dso.h
-include/apache21/apr_env.h
-include/apache21/apr_errno.h
-include/apache21/apr_file_info.h
-include/apache21/apr_file_io.h
-include/apache21/apr_fnmatch.h
-include/apache21/apr_general.h
-include/apache21/apr_getopt.h
-include/apache21/apr_global_mutex.h
-include/apache21/apr_hash.h
-include/apache21/apr_hooks.h
-include/apache21/apr_inherit.h
-include/apache21/apr_ldap.h
-include/apache21/apr_ldap_init.h
-include/apache21/apr_ldap_url.h
-include/apache21/apr_lib.h
-include/apache21/apr_md4.h
-include/apache21/apr_md5.h
-include/apache21/apr_mmap.h
-include/apache21/apr_network_io.h
-include/apache21/apr_optional.h
-include/apache21/apr_optional_hooks.h
-include/apache21/apr_poll.h
-include/apache21/apr_pools.h
-include/apache21/apr_portable.h
-include/apache21/apr_proc_mutex.h
-include/apache21/apr_queue.h
-include/apache21/apr_random.h
-include/apache21/apr_reslist.h
-include/apache21/apr_ring.h
-include/apache21/apr_rmm.h
-include/apache21/apr_sdbm.h
-include/apache21/apr_sha1.h
-include/apache21/apr_shm.h
-include/apache21/apr_signal.h
-include/apache21/apr_strings.h
-include/apache21/apr_strmatch.h
-include/apache21/apr_support.h
-include/apache21/apr_tables.h
-include/apache21/apr_thread_cond.h
-include/apache21/apr_thread_mutex.h
-include/apache21/apr_thread_proc.h
-include/apache21/apr_thread_rwlock.h
-include/apache21/apr_time.h
-include/apache21/apr_uri.h
-include/apache21/apr_user.h
-include/apache21/apr_uuid.h
-include/apache21/apr_version.h
-include/apache21/apr_want.h
-include/apache21/apr_xlate.h
-include/apache21/apr_xml.h
-include/apache21/apu.h
-include/apache21/apu_version.h
-include/apache21/apu_want.h
+%%APR_PORTS%%include/apr-1/apr.h
+%%APR_PORTS%%include/apr-1/apr_allocator.h
+%%APR_PORTS%%include/apr-1/apr_anylock.h
+%%APR_PORTS%%include/apr-1/apr_atomic.h
+%%APR_PORTS%%include/apr-1/apr_base64.h
+%%APR_PORTS%%include/apr-1/apr_buckets.h
+%%APR_PORTS%%include/apr-1/apr_date.h
+%%APR_PORTS%%include/apr-1/apr_dbm.h
+%%APR_PORTS%%include/apr-1/apr_dso.h
+%%APR_PORTS%%include/apr-1/apr_env.h
+%%APR_PORTS%%include/apr-1/apr_errno.h
+%%APR_PORTS%%include/apr-1/apr_file_info.h
+%%APR_PORTS%%include/apr-1/apr_file_io.h
+%%APR_PORTS%%include/apr-1/apr_fnmatch.h
+%%APR_PORTS%%include/apr-1/apr_general.h
+%%APR_PORTS%%include/apr-1/apr_getopt.h
+%%APR_PORTS%%include/apr-1/apr_global_mutex.h
+%%APR_PORTS%%include/apr-1/apr_hash.h
+%%APR_PORTS%%include/apr-1/apr_hooks.h
+%%APR_PORTS%%include/apr-1/apr_inherit.h
+%%APR_PORTS%%include/apr-1/apr_ldap.h
+%%APR_PORTS%%include/apr-1/apr_ldap_init.h
+%%APR_PORTS%%include/apr-1/apr_ldap_url.h
+%%APR_PORTS%%include/apr-1/apr_lib.h
+%%APR_PORTS%%include/apr-1/apr_md4.h
+%%APR_PORTS%%include/apr-1/apr_md5.h
+%%APR_PORTS%%include/apr-1/apr_mmap.h
+%%APR_PORTS%%include/apr-1/apr_network_io.h
+%%APR_PORTS%%include/apr-1/apr_optional.h
+%%APR_PORTS%%include/apr-1/apr_optional_hooks.h
+%%APR_PORTS%%include/apr-1/apr_poll.h
+%%APR_PORTS%%include/apr-1/apr_pools.h
+%%APR_PORTS%%include/apr-1/apr_portable.h
+%%APR_PORTS%%include/apr-1/apr_proc_mutex.h
+%%APR_PORTS%%include/apr-1/apr_queue.h
+%%APR_PORTS%%include/apr-1/apr_random.h
+%%APR_PORTS%%include/apr-1/apr_reslist.h
+%%APR_PORTS%%include/apr-1/apr_ring.h
+%%APR_PORTS%%include/apr-1/apr_rmm.h
+%%APR_PORTS%%include/apr-1/apr_sdbm.h
+%%APR_PORTS%%include/apr-1/apr_sha1.h
+%%APR_PORTS%%include/apr-1/apr_shm.h
+%%APR_PORTS%%include/apr-1/apr_signal.h
+%%APR_PORTS%%include/apr-1/apr_strings.h
+%%APR_PORTS%%include/apr-1/apr_strmatch.h
+%%APR_PORTS%%include/apr-1/apr_support.h
+%%APR_PORTS%%include/apr-1/apr_tables.h
+%%APR_PORTS%%include/apr-1/apr_thread_cond.h
+%%APR_PORTS%%include/apr-1/apr_thread_mutex.h
+%%APR_PORTS%%include/apr-1/apr_thread_proc.h
+%%APR_PORTS%%include/apr-1/apr_thread_rwlock.h
+%%APR_PORTS%%include/apr-1/apr_time.h
+%%APR_PORTS%%include/apr-1/apr_uri.h
+%%APR_PORTS%%include/apr-1/apr_user.h
+%%APR_PORTS%%include/apr-1/apr_uuid.h
+%%APR_PORTS%%include/apr-1/apr_version.h
+%%APR_PORTS%%include/apr-1/apr_want.h
+%%APR_PORTS%%include/apr-1/apr_xlate.h
+%%APR_PORTS%%include/apr-1/apr_xml.h
+%%APR_PORTS%%include/apr-1/apu.h
+%%APR_PORTS%%include/apr-1/apu_version.h
+%%APR_PORTS%%include/apr-1/apu_want.h
 %%WORKER%%include/apache21/fdqueue.h
 %%THREADPOOL%%include/apache21/pod.h
 include/apache21/http_config.h
@@ -126,16 +125,16 @@ include/apache21/util_md5.h
 include/apache21/util_script.h
 include/apache21/util_time.h
 include/apache21/util_xml.h
-lib/apache21/apr-1-config
-lib/apache21/apr.exp
-lib/apache21/aprutil.exp
-lib/apache21/apu-1-config
-lib/apache21/libapr-1.a
-lib/apache21/libapr-1.so
-lib/apache21/libapr-1.so.0
-lib/apache21/libaprutil-1.a
-lib/apache21/libaprutil-1.so
-lib/apache21/libaprutil-1.so.0
+%%APR_PORTS%%bin/apr-1-config
+%%APR_PORTS%%bin/apu-1-config
+%%APR_PORTS%%lib/apr.exp
+%%APR_PORTS%%lib/aprutil.exp
+%%APR_PORTS%%lib/libapr-1.a
+%%APR_PORTS%%lib/libapr-1.so
+%%APR_PORTS%%lib/libapr-1.so.0
+%%APR_PORTS%%lib/libaprutil-1.a
+%%APR_PORTS%%lib/libaprutil-1.so
+%%APR_PORTS%%lib/libaprutil-1.so.0
 libexec/apache21/httpd.exp
 %%MOD_ACTIONS%%libexec/apache21/mod_actions.so
 %%MOD_ALIAS%%libexec/apache21/mod_alias.so
@@ -218,16 +217,16 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 %%MOD_SUEXEC%%sbin/suexec
-share/apache21/build/apr_rules.mk
+%%APR_PORTS%%build-1/apr_rules.mk
+%%APR_PORTS%%build-1/libtool
+%%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/libtool
 share/apache21/build/ltlib.mk
-share/apache21/build/make_exports.awk
-share/apache21/build/make_var_export.awk
-share/apache21/build/mkdir.sh
 share/apache21/build/program.mk
 share/apache21/build/rules.mk
 share/apache21/build/special.mk
@@ -501,7 +500,6 @@ share/apache21/build/special.mk
 @dirrm share/apache21/build
 @dirrm share/apache21
 @unexec rmdir %D/libexec/apache21 2> /dev/null || true
-@dirrm lib/apache21
 @dirrm include/apache21
 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
 @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index cfaba377f1d8..b9982cf496ed 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -60,8 +60,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-expat=${LOCALBASE} \
 		--with-iconv=${LOCALBASE} \
-		--libdir=${PREFIX_RELDEST}/lib/apache21 \
-		--includedir=${PREFIX_RELDEST}/include/apache21 \
 		--enable-http
 
 CONFIGURE_ENV=	CC="${CC}" CPPFLAGS="${CPPFLAGS}" \
@@ -129,8 +127,15 @@ CONFIGURE_ARGS+=	--with-ldap \
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libapr-1.so) || defined(WITH_APR_FROM_PORTS)
-IGNORE=	: apr from ports is not yet supported
+.if defined(WITH_APR_FROM_PORTS)
+PLIST_SUB+=	APR_PORTS="@comment "
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr
+CONFIGURE_ARGS+=	--with-apr=${LOCALBASE}/bin/apr-1-config \
+			--with-apr-util=${LOCALBASE}/bin/apu-1-config
+CONFIGURE_ENV+=		LTFLAGS="--tag=CXX"
+.else
+PLIST_SUB+=	APR_PORTS=""
+CONFLICTS+=	apr-1.*
 .endif
 
 WITH_PTHREAD_LIBS?=	${PTHREAD_LIBS:S/-l//:S/-//}
@@ -191,8 +196,6 @@ post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/apache.sh > ${WRKDIR}/apache21.sh
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/apache21libs.sh > ${WRKDIR}/apache21libs.sh
 	@${RM} -f ${WRKSRC}/docs/manual/index.html.ko.euc-kr
 	@${REINPLACE_CMD} -e 's," PLATFORM ",FreeBSD,' \
 			${WRKSRC}/server/core.c
@@ -215,10 +218,6 @@ pre-install:
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/apache21/Includes
-.if !defined(WITH_APR_FROM_PORTS)
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache21libs.sh startup script."
-	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21libs.sh ${PREFIX}/etc/rc.d/000.apache21libs.sh
-.endif
 	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache21.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache21.sh ${PREFIX}/etc/rc.d/apache21.sh
 	@@${CAT} ${PKGMESSAGE}
diff --git a/www/apache22/files/apache21libs.sh b/www/apache22/files/apache21libs.sh
deleted file mode 100644
index 67fe5c302561..000000000000
--- a/www/apache22/files/apache21libs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/apache2
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/www/apache22/files/patch-configure.in b/www/apache22/files/patch-configure.in
index 6d77c65b7f07..e36f5d9ac795 100644
--- a/www/apache22/files/patch-configure.in
+++ b/www/apache22/files/patch-configure.in
@@ -1,24 +1,24 @@
---- configure.in.orig	Thu Mar 18 08:36:52 2004
-+++ configure.in	Fri Jul  2 11:44:25 2004
+--- configure.in.orig	Sun Nov 21 19:50:36 2004
++++ configure.in	Mon Dec 13 10:43:16 2004
 @@ -69,7 +69,7 @@
  
  if test "$apr_found" = "reconfig"; then
    APR_SUBDIR_CONFIG(srclib/apr,
 -                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir],
-+                    [$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir --datadir=$datadir --with-installbuilddir=$installbuilddir],
++                    [$apache_apr_flags --prefix=$prefix],
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the first to build and the last to be cleaned
    AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
  
  if test "$apu_found" = "reconfig"; then
    APR_SUBDIR_CONFIG(srclib/apr-util,
 -                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
-+                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$libdir],
++                    [--with-apr=../apr --prefix=$prefix],
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -545,8 +545,14 @@
+@@ -549,8 +549,14 @@
  	[Root directory of the Apache install area])
  AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  	[Location of the config file, relative to the Apache root directory])
diff --git a/www/apache22/files/patch-srclib:apr-util:config.layout b/www/apache22/files/patch-srclib:apr-util:config.layout
index 222e91d975bc..ad1f4e176a59 100644
--- a/www/apache22/files/patch-srclib:apr-util:config.layout
+++ b/www/apache22/files/patch-srclib:apr-util:config.layout
@@ -1,10 +1,11 @@
---- srclib/apr-util/config.layout.orig	Tue Jan  7 13:13:09 2003
-+++ srclib/apr-util/config.layout	Tue Apr  1 18:36:16 2003
-@@ -229,3 +229,7 @@
+--- srclib/apr-util/config.layout.orig	Thu Oct  2 16:29:48 2003
++++ srclib/apr-util/config.layout	Mon Dec 13 10:17:45 2004
+@@ -229,4 +229,8 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix     -${APRUTIL_MAJOR_VERSION}
- </Layout>
+     installbuilddir: ${prefix}/usr/share/apache2/build
 +
 +<Layout FreeBSD>
++    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
 +    libsuffix:
-+</Layout>
+ </Layout>
diff --git a/www/apache22/files/patch-srclib:apr:config.layout b/www/apache22/files/patch-srclib:apr:config.layout
index 5c52779635fc..87903810ee1b 100644
--- a/www/apache22/files/patch-srclib:apr:config.layout
+++ b/www/apache22/files/patch-srclib:apr:config.layout
@@ -1,10 +1,11 @@
---- srclib/apr/config.layout.orig	Tue Jan  7 13:06:50 2003
-+++ srclib/apr/config.layout	Tue Apr  1 18:36:51 2003
-@@ -229,3 +229,7 @@
+--- srclib/apr/config.layout.orig	Wed Jun 30 15:16:54 2004
++++ srclib/apr/config.layout	Mon Dec 13 10:17:16 2004
+@@ -229,3 +229,8 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix:    -${APR_MAJOR_VERSION}
  </Layout>
 +
 +<Layout FreeBSD>
++    includedir:    ${prefix}/include/apr-${APR_MAJOR_VERSION}
 +    libsuffix:
 +</Layout>
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 39aee07cbe9f..d5c0504f45ec 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -14,7 +14,6 @@ etc/apache21/mime.types-dist
 @unexec if cmp -s %D/etc/apache21/ssl.conf %D/etc/apache21/ssl-std.conf; then rm -f %D/etc/apache21/ssl.conf; fi
 etc/apache21/ssl-std.conf
 @exec [ -f %B/ssl.conf ] || cp %B/%f %B/ssl.conf
-etc/rc.d/000.apache21libs.sh
 etc/rc.d/apache21.sh
 include/apache21/ap_compat.h
 include/apache21/ap_config.h
@@ -26,68 +25,68 @@ include/apache21/ap_mpm.h
 include/apache21/ap_provider.h
 include/apache21/ap_regkey.h
 include/apache21/ap_release.h
-include/apache21/apr.h
-include/apache21/apr_allocator.h
-include/apache21/apr_anylock.h
-include/apache21/apr_atomic.h
-include/apache21/apr_base64.h
-include/apache21/apr_buckets.h
-include/apache21/apr_date.h
-include/apache21/apr_dbm.h
-include/apache21/apr_dso.h
-include/apache21/apr_env.h
-include/apache21/apr_errno.h
-include/apache21/apr_file_info.h
-include/apache21/apr_file_io.h
-include/apache21/apr_fnmatch.h
-include/apache21/apr_general.h
-include/apache21/apr_getopt.h
-include/apache21/apr_global_mutex.h
-include/apache21/apr_hash.h
-include/apache21/apr_hooks.h
-include/apache21/apr_inherit.h
-include/apache21/apr_ldap.h
-include/apache21/apr_ldap_init.h
-include/apache21/apr_ldap_url.h
-include/apache21/apr_lib.h
-include/apache21/apr_md4.h
-include/apache21/apr_md5.h
-include/apache21/apr_mmap.h
-include/apache21/apr_network_io.h
-include/apache21/apr_optional.h
-include/apache21/apr_optional_hooks.h
-include/apache21/apr_poll.h
-include/apache21/apr_pools.h
-include/apache21/apr_portable.h
-include/apache21/apr_proc_mutex.h
-include/apache21/apr_queue.h
-include/apache21/apr_random.h
-include/apache21/apr_reslist.h
-include/apache21/apr_ring.h
-include/apache21/apr_rmm.h
-include/apache21/apr_sdbm.h
-include/apache21/apr_sha1.h
-include/apache21/apr_shm.h
-include/apache21/apr_signal.h
-include/apache21/apr_strings.h
-include/apache21/apr_strmatch.h
-include/apache21/apr_support.h
-include/apache21/apr_tables.h
-include/apache21/apr_thread_cond.h
-include/apache21/apr_thread_mutex.h
-include/apache21/apr_thread_proc.h
-include/apache21/apr_thread_rwlock.h
-include/apache21/apr_time.h
-include/apache21/apr_uri.h
-include/apache21/apr_user.h
-include/apache21/apr_uuid.h
-include/apache21/apr_version.h
-include/apache21/apr_want.h
-include/apache21/apr_xlate.h
-include/apache21/apr_xml.h
-include/apache21/apu.h
-include/apache21/apu_version.h
-include/apache21/apu_want.h
+%%APR_PORTS%%include/apr-1/apr.h
+%%APR_PORTS%%include/apr-1/apr_allocator.h
+%%APR_PORTS%%include/apr-1/apr_anylock.h
+%%APR_PORTS%%include/apr-1/apr_atomic.h
+%%APR_PORTS%%include/apr-1/apr_base64.h
+%%APR_PORTS%%include/apr-1/apr_buckets.h
+%%APR_PORTS%%include/apr-1/apr_date.h
+%%APR_PORTS%%include/apr-1/apr_dbm.h
+%%APR_PORTS%%include/apr-1/apr_dso.h
+%%APR_PORTS%%include/apr-1/apr_env.h
+%%APR_PORTS%%include/apr-1/apr_errno.h
+%%APR_PORTS%%include/apr-1/apr_file_info.h
+%%APR_PORTS%%include/apr-1/apr_file_io.h
+%%APR_PORTS%%include/apr-1/apr_fnmatch.h
+%%APR_PORTS%%include/apr-1/apr_general.h
+%%APR_PORTS%%include/apr-1/apr_getopt.h
+%%APR_PORTS%%include/apr-1/apr_global_mutex.h
+%%APR_PORTS%%include/apr-1/apr_hash.h
+%%APR_PORTS%%include/apr-1/apr_hooks.h
+%%APR_PORTS%%include/apr-1/apr_inherit.h
+%%APR_PORTS%%include/apr-1/apr_ldap.h
+%%APR_PORTS%%include/apr-1/apr_ldap_init.h
+%%APR_PORTS%%include/apr-1/apr_ldap_url.h
+%%APR_PORTS%%include/apr-1/apr_lib.h
+%%APR_PORTS%%include/apr-1/apr_md4.h
+%%APR_PORTS%%include/apr-1/apr_md5.h
+%%APR_PORTS%%include/apr-1/apr_mmap.h
+%%APR_PORTS%%include/apr-1/apr_network_io.h
+%%APR_PORTS%%include/apr-1/apr_optional.h
+%%APR_PORTS%%include/apr-1/apr_optional_hooks.h
+%%APR_PORTS%%include/apr-1/apr_poll.h
+%%APR_PORTS%%include/apr-1/apr_pools.h
+%%APR_PORTS%%include/apr-1/apr_portable.h
+%%APR_PORTS%%include/apr-1/apr_proc_mutex.h
+%%APR_PORTS%%include/apr-1/apr_queue.h
+%%APR_PORTS%%include/apr-1/apr_random.h
+%%APR_PORTS%%include/apr-1/apr_reslist.h
+%%APR_PORTS%%include/apr-1/apr_ring.h
+%%APR_PORTS%%include/apr-1/apr_rmm.h
+%%APR_PORTS%%include/apr-1/apr_sdbm.h
+%%APR_PORTS%%include/apr-1/apr_sha1.h
+%%APR_PORTS%%include/apr-1/apr_shm.h
+%%APR_PORTS%%include/apr-1/apr_signal.h
+%%APR_PORTS%%include/apr-1/apr_strings.h
+%%APR_PORTS%%include/apr-1/apr_strmatch.h
+%%APR_PORTS%%include/apr-1/apr_support.h
+%%APR_PORTS%%include/apr-1/apr_tables.h
+%%APR_PORTS%%include/apr-1/apr_thread_cond.h
+%%APR_PORTS%%include/apr-1/apr_thread_mutex.h
+%%APR_PORTS%%include/apr-1/apr_thread_proc.h
+%%APR_PORTS%%include/apr-1/apr_thread_rwlock.h
+%%APR_PORTS%%include/apr-1/apr_time.h
+%%APR_PORTS%%include/apr-1/apr_uri.h
+%%APR_PORTS%%include/apr-1/apr_user.h
+%%APR_PORTS%%include/apr-1/apr_uuid.h
+%%APR_PORTS%%include/apr-1/apr_version.h
+%%APR_PORTS%%include/apr-1/apr_want.h
+%%APR_PORTS%%include/apr-1/apr_xlate.h
+%%APR_PORTS%%include/apr-1/apr_xml.h
+%%APR_PORTS%%include/apr-1/apu.h
+%%APR_PORTS%%include/apr-1/apu_version.h
+%%APR_PORTS%%include/apr-1/apu_want.h
 %%WORKER%%include/apache21/fdqueue.h
 %%THREADPOOL%%include/apache21/pod.h
 include/apache21/http_config.h
@@ -126,16 +125,16 @@ include/apache21/util_md5.h
 include/apache21/util_script.h
 include/apache21/util_time.h
 include/apache21/util_xml.h
-lib/apache21/apr-1-config
-lib/apache21/apr.exp
-lib/apache21/aprutil.exp
-lib/apache21/apu-1-config
-lib/apache21/libapr-1.a
-lib/apache21/libapr-1.so
-lib/apache21/libapr-1.so.0
-lib/apache21/libaprutil-1.a
-lib/apache21/libaprutil-1.so
-lib/apache21/libaprutil-1.so.0
+%%APR_PORTS%%bin/apr-1-config
+%%APR_PORTS%%bin/apu-1-config
+%%APR_PORTS%%lib/apr.exp
+%%APR_PORTS%%lib/aprutil.exp
+%%APR_PORTS%%lib/libapr-1.a
+%%APR_PORTS%%lib/libapr-1.so
+%%APR_PORTS%%lib/libapr-1.so.0
+%%APR_PORTS%%lib/libaprutil-1.a
+%%APR_PORTS%%lib/libaprutil-1.so
+%%APR_PORTS%%lib/libaprutil-1.so.0
 libexec/apache21/httpd.exp
 %%MOD_ACTIONS%%libexec/apache21/mod_actions.so
 %%MOD_ALIAS%%libexec/apache21/mod_alias.so
@@ -218,16 +217,16 @@ sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
 %%MOD_SUEXEC%%sbin/suexec
-share/apache21/build/apr_rules.mk
+%%APR_PORTS%%build-1/apr_rules.mk
+%%APR_PORTS%%build-1/libtool
+%%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/libtool
 share/apache21/build/ltlib.mk
-share/apache21/build/make_exports.awk
-share/apache21/build/make_var_export.awk
-share/apache21/build/mkdir.sh
 share/apache21/build/program.mk
 share/apache21/build/rules.mk
 share/apache21/build/special.mk
@@ -501,7 +500,6 @@ share/apache21/build/special.mk
 @dirrm share/apache21/build
 @dirrm share/apache21
 @unexec rmdir %D/libexec/apache21 2> /dev/null || true
-@dirrm lib/apache21
 @dirrm include/apache21
 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true
 @unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true