diff options
author | Clement Laforet <clement@FreeBSD.org> | 2004-02-08 15:40:41 +0000 |
---|---|---|
committer | Clement Laforet <clement@FreeBSD.org> | 2004-02-08 15:40:41 +0000 |
commit | b99ca6371f8af22a588b9d17eac8e46991d35ee9 (patch) | |
tree | 4f7326372a5e7ab3bebdfd63e6c676238a7038d4 /www | |
parent | Update to 0.2.8. (diff) |
- Improve apr from ports support.
Thanks a lot to kuriyama.
Submitted by: kuriyama
Notes
Notes:
svn path=/head/; revision=100392
Diffstat (limited to 'www')
-rw-r--r-- | www/apache2/Makefile | 6 | ||||
-rw-r--r-- | www/apache2/Makefile.doc | 1 | ||||
-rw-r--r-- | www/apache2/pkg-plist | 154 | ||||
-rw-r--r-- | www/apache20/Makefile | 6 | ||||
-rw-r--r-- | www/apache20/Makefile.doc | 1 | ||||
-rw-r--r-- | www/apache20/pkg-plist | 154 |
6 files changed, 164 insertions, 158 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 4ddb92465329..6c58115c3fb7 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -54,7 +54,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ + LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} @@ -101,16 +101,18 @@ CONFIGURE_ARGS+= --with-ldap \ .if defined(WITH_APR_FROM_PORTS) . if defined (WITH_BDB) || defined(WITH_BERKELEYDB) BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" -.endif +. endif LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ --with-apr-util=${LOCALBASE}/bin/apu-config +PLIST_SUB+= PORTS_APR="@comment " .else . if exists(${LOCALBASE}/lib/libapr-0.so) BROKEN= "apr is installed and may conflict with apache one\ (if you want to use apr port define WITH_APR_FROM_PORTS,\ at your own risk)" . endif +PLIST_SUB+= PORTS_APR="" .endif WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//} diff --git a/www/apache2/Makefile.doc b/www/apache2/Makefile.doc index e8cadaaaf3aa..710f3aa1f774 100644 --- a/www/apache2/Makefile.doc +++ b/www/apache2/Makefile.doc @@ -49,6 +49,7 @@ ## Port-related: ## WITHOUT_WWW: Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR ## WITH_CUSTOM_WWW: Let you choose your ${LOCALBASE}/www components: [cgi|errordocs|icons|wwwdata] +## WITH_APR_FROM_PORTS: Utilise apr and apr-utils from ${PORTSDIR}/devel/apr ## ## Available make targets: ## show-options: prints this message diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist index 5579a070b701..acada35ba310 100644 --- a/www/apache2/pkg-plist +++ b/www/apache2/pkg-plist @@ -25,68 +25,68 @@ include/apache2/ap_mpm.h include/apache2/ap_provider.h include/apache2/ap_regkey.h include/apache2/ap_release.h -include/apache2/apr.h -include/apache2/apr_allocator.h -include/apache2/apr_anylock.h -include/apache2/apr_atomic.h -include/apache2/apr_base64.h -include/apache2/apr_buckets.h -include/apache2/apr_compat.h -include/apache2/apr_date.h -include/apache2/apr_dbm.h -include/apache2/apr_dso.h -include/apache2/apr_env.h -include/apache2/apr_errno.h -include/apache2/apr_file_info.h -include/apache2/apr_file_io.h -include/apache2/apr_fnmatch.h -include/apache2/apr_general.h -include/apache2/apr_getopt.h -include/apache2/apr_global_mutex.h -include/apache2/apr_hash.h -include/apache2/apr_hooks.h -include/apache2/apr_inherit.h -include/apache2/apr_ldap.h -include/apache2/apr_ldap_url.h -include/apache2/apr_lib.h -include/apache2/apr_md4.h -include/apache2/apr_md5.h -include/apache2/apr_mmap.h -include/apache2/apr_network_io.h -include/apache2/apr_optional.h -include/apache2/apr_optional_hooks.h -include/apache2/apr_poll.h -include/apache2/apr_pools.h -include/apache2/apr_portable.h -include/apache2/apr_proc_mutex.h -include/apache2/apr_queue.h -include/apache2/apr_reslist.h -include/apache2/apr_ring.h -include/apache2/apr_rmm.h -include/apache2/apr_sdbm.h -include/apache2/apr_sha1.h -include/apache2/apr_shm.h -include/apache2/apr_signal.h -include/apache2/apr_strings.h -include/apache2/apr_strmatch.h -include/apache2/apr_support.h -include/apache2/apr_tables.h -include/apache2/apr_thread_cond.h -include/apache2/apr_thread_mutex.h -include/apache2/apr_thread_proc.h -include/apache2/apr_thread_rwlock.h -include/apache2/apr_time.h -include/apache2/apr_uri.h -include/apache2/apr_user.h -include/apache2/apr_uuid.h -include/apache2/apr_version.h -include/apache2/apr_want.h -include/apache2/apr_xlate.h -include/apache2/apr_xml.h -include/apache2/apu.h -include/apache2/apu_compat.h -include/apache2/apu_version.h -include/apache2/apu_want.h +%%PORTS_APR%%include/apache2/apr.h +%%PORTS_APR%%include/apache2/apr_allocator.h +%%PORTS_APR%%include/apache2/apr_anylock.h +%%PORTS_APR%%include/apache2/apr_atomic.h +%%PORTS_APR%%include/apache2/apr_base64.h +%%PORTS_APR%%include/apache2/apr_buckets.h +%%PORTS_APR%%include/apache2/apr_compat.h +%%PORTS_APR%%include/apache2/apr_date.h +%%PORTS_APR%%include/apache2/apr_dbm.h +%%PORTS_APR%%include/apache2/apr_dso.h +%%PORTS_APR%%include/apache2/apr_env.h +%%PORTS_APR%%include/apache2/apr_errno.h +%%PORTS_APR%%include/apache2/apr_file_info.h +%%PORTS_APR%%include/apache2/apr_file_io.h +%%PORTS_APR%%include/apache2/apr_fnmatch.h +%%PORTS_APR%%include/apache2/apr_general.h +%%PORTS_APR%%include/apache2/apr_getopt.h +%%PORTS_APR%%include/apache2/apr_global_mutex.h +%%PORTS_APR%%include/apache2/apr_hash.h +%%PORTS_APR%%include/apache2/apr_hooks.h +%%PORTS_APR%%include/apache2/apr_inherit.h +%%PORTS_APR%%include/apache2/apr_ldap.h +%%PORTS_APR%%include/apache2/apr_ldap_url.h +%%PORTS_APR%%include/apache2/apr_lib.h +%%PORTS_APR%%include/apache2/apr_md4.h +%%PORTS_APR%%include/apache2/apr_md5.h +%%PORTS_APR%%include/apache2/apr_mmap.h +%%PORTS_APR%%include/apache2/apr_network_io.h +%%PORTS_APR%%include/apache2/apr_optional.h +%%PORTS_APR%%include/apache2/apr_optional_hooks.h +%%PORTS_APR%%include/apache2/apr_poll.h +%%PORTS_APR%%include/apache2/apr_pools.h +%%PORTS_APR%%include/apache2/apr_portable.h +%%PORTS_APR%%include/apache2/apr_proc_mutex.h +%%PORTS_APR%%include/apache2/apr_queue.h +%%PORTS_APR%%include/apache2/apr_reslist.h +%%PORTS_APR%%include/apache2/apr_ring.h +%%PORTS_APR%%include/apache2/apr_rmm.h +%%PORTS_APR%%include/apache2/apr_sdbm.h +%%PORTS_APR%%include/apache2/apr_sha1.h +%%PORTS_APR%%include/apache2/apr_shm.h +%%PORTS_APR%%include/apache2/apr_signal.h +%%PORTS_APR%%include/apache2/apr_strings.h +%%PORTS_APR%%include/apache2/apr_strmatch.h +%%PORTS_APR%%include/apache2/apr_support.h +%%PORTS_APR%%include/apache2/apr_tables.h +%%PORTS_APR%%include/apache2/apr_thread_cond.h +%%PORTS_APR%%include/apache2/apr_thread_mutex.h +%%PORTS_APR%%include/apache2/apr_thread_proc.h +%%PORTS_APR%%include/apache2/apr_thread_rwlock.h +%%PORTS_APR%%include/apache2/apr_time.h +%%PORTS_APR%%include/apache2/apr_uri.h +%%PORTS_APR%%include/apache2/apr_user.h +%%PORTS_APR%%include/apache2/apr_uuid.h +%%PORTS_APR%%include/apache2/apr_version.h +%%PORTS_APR%%include/apache2/apr_want.h +%%PORTS_APR%%include/apache2/apr_xlate.h +%%PORTS_APR%%include/apache2/apr_xml.h +%%PORTS_APR%%include/apache2/apu.h +%%PORTS_APR%%include/apache2/apu_compat.h +%%PORTS_APR%%include/apache2/apu_version.h +%%PORTS_APR%%include/apache2/apu_want.h %%WORKER%%include/apache2/fdqueue.h include/apache2/http_config.h include/apache2/http_connection.h @@ -128,18 +128,18 @@ include/apache2/util_md5.h include/apache2/util_script.h include/apache2/util_time.h include/apache2/util_xml.h -lib/apache2/apr-config -lib/apache2/apr.exp -lib/apache2/aprutil.exp -lib/apache2/apu-config -lib/apache2/libapr-0.a -lib/apache2/libapr-0.la -lib/apache2/libapr-0.so -lib/apache2/libapr-0.so.9 -lib/apache2/libaprutil-0.a -lib/apache2/libaprutil-0.la -lib/apache2/libaprutil-0.so -lib/apache2/libaprutil-0.so.9 +%%PORTS_APR%%lib/apache2/apr-config +%%PORTS_APR%%lib/apache2/apr.exp +%%PORTS_APR%%lib/apache2/aprutil.exp +%%PORTS_APR%%lib/apache2/apu-config +%%PORTS_APR%%lib/apache2/libapr-0.a +%%PORTS_APR%%lib/apache2/libapr-0.la +%%PORTS_APR%%lib/apache2/libapr-0.so +%%PORTS_APR%%lib/apache2/libapr-0.so.9 +%%PORTS_APR%%lib/apache2/libaprutil-0.a +%%PORTS_APR%%lib/apache2/libaprutil-0.la +%%PORTS_APR%%lib/apache2/libaprutil-0.so +%%PORTS_APR%%lib/apache2/libaprutil-0.so.9 libexec/apache2/httpd.exp %%MOD_ACCESS%%libexec/apache2/mod_access.so %%MOD_ACTIONS%%libexec/apache2/mod_actions.so @@ -211,12 +211,12 @@ sbin/httpd sbin/logresolve sbin/rotatelogs %%MOD_SUEXEC%%sbin/suexec -share/apache2/build/apr_rules.mk +%%PORTS_APR%%share/apache2/build/apr_rules.mk share/apache2/build/config_vars.mk share/apache2/build/config.nice share/apache2/build/instdso.sh share/apache2/build/library.mk -share/apache2/build/libtool +%%PORTS_APR%%share/apache2/build/libtool share/apache2/build/ltlib.mk share/apache2/build/program.mk share/apache2/build/rules.mk @@ -1552,6 +1552,6 @@ share/apache2/build/special.mk @dirrm share/apache2/build @dirrm share/apache2 @dirrm libexec/apache2 -@dirrm lib/apache2 +%%PORTS_APR%%@dirrm lib/apache2 @dirrm include/apache2 @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2." diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 4ddb92465329..6c58115c3fb7 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -54,7 +54,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ + LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} @@ -101,16 +101,18 @@ CONFIGURE_ARGS+= --with-ldap \ .if defined(WITH_APR_FROM_PORTS) . if defined (WITH_BDB) || defined(WITH_BERKELEYDB) BROKEN= "You can't set WITH_BDB or WITH_BERKELEYDB when WITH_APR_FROM_PORTS is defined" -.endif +. endif LIB_DEPENDS+= apr-0.9:${PORTSDIR}/devel/apr CONFIGURE_ARGS+= --with-apr=${LOCALBASE}/bin/apr-config \ --with-apr-util=${LOCALBASE}/bin/apu-config +PLIST_SUB+= PORTS_APR="@comment " .else . if exists(${LOCALBASE}/lib/libapr-0.so) BROKEN= "apr is installed and may conflict with apache one\ (if you want to use apr port define WITH_APR_FROM_PORTS,\ at your own risk)" . endif +PLIST_SUB+= PORTS_APR="" .endif WITH_PTHREAD_LIBS?= ${PTHREAD_LIBS:S/-l//} diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc index e8cadaaaf3aa..710f3aa1f774 100644 --- a/www/apache20/Makefile.doc +++ b/www/apache20/Makefile.doc @@ -49,6 +49,7 @@ ## Port-related: ## WITHOUT_WWW: Implies NO_CGI, NO_WWWDATA, NO_ICONS and NO_ERROR ## WITH_CUSTOM_WWW: Let you choose your ${LOCALBASE}/www components: [cgi|errordocs|icons|wwwdata] +## WITH_APR_FROM_PORTS: Utilise apr and apr-utils from ${PORTSDIR}/devel/apr ## ## Available make targets: ## show-options: prints this message diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 5579a070b701..acada35ba310 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -25,68 +25,68 @@ include/apache2/ap_mpm.h include/apache2/ap_provider.h include/apache2/ap_regkey.h include/apache2/ap_release.h -include/apache2/apr.h -include/apache2/apr_allocator.h -include/apache2/apr_anylock.h -include/apache2/apr_atomic.h -include/apache2/apr_base64.h -include/apache2/apr_buckets.h -include/apache2/apr_compat.h -include/apache2/apr_date.h -include/apache2/apr_dbm.h -include/apache2/apr_dso.h -include/apache2/apr_env.h -include/apache2/apr_errno.h -include/apache2/apr_file_info.h -include/apache2/apr_file_io.h -include/apache2/apr_fnmatch.h -include/apache2/apr_general.h -include/apache2/apr_getopt.h -include/apache2/apr_global_mutex.h -include/apache2/apr_hash.h -include/apache2/apr_hooks.h -include/apache2/apr_inherit.h -include/apache2/apr_ldap.h -include/apache2/apr_ldap_url.h -include/apache2/apr_lib.h -include/apache2/apr_md4.h -include/apache2/apr_md5.h -include/apache2/apr_mmap.h -include/apache2/apr_network_io.h -include/apache2/apr_optional.h -include/apache2/apr_optional_hooks.h -include/apache2/apr_poll.h -include/apache2/apr_pools.h -include/apache2/apr_portable.h -include/apache2/apr_proc_mutex.h -include/apache2/apr_queue.h -include/apache2/apr_reslist.h -include/apache2/apr_ring.h -include/apache2/apr_rmm.h -include/apache2/apr_sdbm.h -include/apache2/apr_sha1.h -include/apache2/apr_shm.h -include/apache2/apr_signal.h -include/apache2/apr_strings.h -include/apache2/apr_strmatch.h -include/apache2/apr_support.h -include/apache2/apr_tables.h -include/apache2/apr_thread_cond.h -include/apache2/apr_thread_mutex.h -include/apache2/apr_thread_proc.h -include/apache2/apr_thread_rwlock.h -include/apache2/apr_time.h -include/apache2/apr_uri.h -include/apache2/apr_user.h -include/apache2/apr_uuid.h -include/apache2/apr_version.h -include/apache2/apr_want.h -include/apache2/apr_xlate.h -include/apache2/apr_xml.h -include/apache2/apu.h -include/apache2/apu_compat.h -include/apache2/apu_version.h -include/apache2/apu_want.h +%%PORTS_APR%%include/apache2/apr.h +%%PORTS_APR%%include/apache2/apr_allocator.h +%%PORTS_APR%%include/apache2/apr_anylock.h +%%PORTS_APR%%include/apache2/apr_atomic.h +%%PORTS_APR%%include/apache2/apr_base64.h +%%PORTS_APR%%include/apache2/apr_buckets.h +%%PORTS_APR%%include/apache2/apr_compat.h +%%PORTS_APR%%include/apache2/apr_date.h +%%PORTS_APR%%include/apache2/apr_dbm.h +%%PORTS_APR%%include/apache2/apr_dso.h +%%PORTS_APR%%include/apache2/apr_env.h +%%PORTS_APR%%include/apache2/apr_errno.h +%%PORTS_APR%%include/apache2/apr_file_info.h +%%PORTS_APR%%include/apache2/apr_file_io.h +%%PORTS_APR%%include/apache2/apr_fnmatch.h +%%PORTS_APR%%include/apache2/apr_general.h +%%PORTS_APR%%include/apache2/apr_getopt.h +%%PORTS_APR%%include/apache2/apr_global_mutex.h +%%PORTS_APR%%include/apache2/apr_hash.h +%%PORTS_APR%%include/apache2/apr_hooks.h +%%PORTS_APR%%include/apache2/apr_inherit.h +%%PORTS_APR%%include/apache2/apr_ldap.h +%%PORTS_APR%%include/apache2/apr_ldap_url.h +%%PORTS_APR%%include/apache2/apr_lib.h +%%PORTS_APR%%include/apache2/apr_md4.h +%%PORTS_APR%%include/apache2/apr_md5.h +%%PORTS_APR%%include/apache2/apr_mmap.h +%%PORTS_APR%%include/apache2/apr_network_io.h +%%PORTS_APR%%include/apache2/apr_optional.h +%%PORTS_APR%%include/apache2/apr_optional_hooks.h +%%PORTS_APR%%include/apache2/apr_poll.h +%%PORTS_APR%%include/apache2/apr_pools.h +%%PORTS_APR%%include/apache2/apr_portable.h +%%PORTS_APR%%include/apache2/apr_proc_mutex.h +%%PORTS_APR%%include/apache2/apr_queue.h +%%PORTS_APR%%include/apache2/apr_reslist.h +%%PORTS_APR%%include/apache2/apr_ring.h +%%PORTS_APR%%include/apache2/apr_rmm.h +%%PORTS_APR%%include/apache2/apr_sdbm.h +%%PORTS_APR%%include/apache2/apr_sha1.h +%%PORTS_APR%%include/apache2/apr_shm.h +%%PORTS_APR%%include/apache2/apr_signal.h +%%PORTS_APR%%include/apache2/apr_strings.h +%%PORTS_APR%%include/apache2/apr_strmatch.h +%%PORTS_APR%%include/apache2/apr_support.h +%%PORTS_APR%%include/apache2/apr_tables.h +%%PORTS_APR%%include/apache2/apr_thread_cond.h +%%PORTS_APR%%include/apache2/apr_thread_mutex.h +%%PORTS_APR%%include/apache2/apr_thread_proc.h +%%PORTS_APR%%include/apache2/apr_thread_rwlock.h +%%PORTS_APR%%include/apache2/apr_time.h +%%PORTS_APR%%include/apache2/apr_uri.h +%%PORTS_APR%%include/apache2/apr_user.h +%%PORTS_APR%%include/apache2/apr_uuid.h +%%PORTS_APR%%include/apache2/apr_version.h +%%PORTS_APR%%include/apache2/apr_want.h +%%PORTS_APR%%include/apache2/apr_xlate.h +%%PORTS_APR%%include/apache2/apr_xml.h +%%PORTS_APR%%include/apache2/apu.h +%%PORTS_APR%%include/apache2/apu_compat.h +%%PORTS_APR%%include/apache2/apu_version.h +%%PORTS_APR%%include/apache2/apu_want.h %%WORKER%%include/apache2/fdqueue.h include/apache2/http_config.h include/apache2/http_connection.h @@ -128,18 +128,18 @@ include/apache2/util_md5.h include/apache2/util_script.h include/apache2/util_time.h include/apache2/util_xml.h -lib/apache2/apr-config -lib/apache2/apr.exp -lib/apache2/aprutil.exp -lib/apache2/apu-config -lib/apache2/libapr-0.a -lib/apache2/libapr-0.la -lib/apache2/libapr-0.so -lib/apache2/libapr-0.so.9 -lib/apache2/libaprutil-0.a -lib/apache2/libaprutil-0.la -lib/apache2/libaprutil-0.so -lib/apache2/libaprutil-0.so.9 +%%PORTS_APR%%lib/apache2/apr-config +%%PORTS_APR%%lib/apache2/apr.exp +%%PORTS_APR%%lib/apache2/aprutil.exp +%%PORTS_APR%%lib/apache2/apu-config +%%PORTS_APR%%lib/apache2/libapr-0.a +%%PORTS_APR%%lib/apache2/libapr-0.la +%%PORTS_APR%%lib/apache2/libapr-0.so +%%PORTS_APR%%lib/apache2/libapr-0.so.9 +%%PORTS_APR%%lib/apache2/libaprutil-0.a +%%PORTS_APR%%lib/apache2/libaprutil-0.la +%%PORTS_APR%%lib/apache2/libaprutil-0.so +%%PORTS_APR%%lib/apache2/libaprutil-0.so.9 libexec/apache2/httpd.exp %%MOD_ACCESS%%libexec/apache2/mod_access.so %%MOD_ACTIONS%%libexec/apache2/mod_actions.so @@ -211,12 +211,12 @@ sbin/httpd sbin/logresolve sbin/rotatelogs %%MOD_SUEXEC%%sbin/suexec -share/apache2/build/apr_rules.mk +%%PORTS_APR%%share/apache2/build/apr_rules.mk share/apache2/build/config_vars.mk share/apache2/build/config.nice share/apache2/build/instdso.sh share/apache2/build/library.mk -share/apache2/build/libtool +%%PORTS_APR%%share/apache2/build/libtool share/apache2/build/ltlib.mk share/apache2/build/program.mk share/apache2/build/rules.mk @@ -1552,6 +1552,6 @@ share/apache2/build/special.mk @dirrm share/apache2/build @dirrm share/apache2 @dirrm libexec/apache2 -@dirrm lib/apache2 +%%PORTS_APR%%@dirrm lib/apache2 @dirrm include/apache2 @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2." |