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

  subversion)
- Add support for APR_FROM_PORTS

1 files changed, 77 insertions, 79 deletions

diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index 39aee07..d5c0504 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