diff options
author | tron <tron> | 2009-04-08 17:03:25 +0000 |
---|---|---|
committer | tron <tron> | 2009-04-08 17:03:25 +0000 |
commit | e3e4891d01fd497877a0000cc405b6fa41a0399a (patch) | |
tree | 9f070ac58374ae8646806e20c731db02142c72ef /www/apache22 | |
parent | 1b72d2c2e12d560c955af869218ed796a53451c4 (diff) | |
download | pkgsrc-e3e4891d01fd497877a0000cc405b6fa41a0399a.tar.gz |
Fix support for non-default options:
- If option "suexec" is used we must manually build the binary because
the top level makefile doesn't do that. This fixes PR pkg/41141
by Anton Blajev.
- Move the handling of the "all-shared" option into "options.mk" and
don't use a seperate package list that will cause failure to remove
the "lib/httpd" directory on deinstallation.
Diffstat (limited to 'www/apache22')
-rw-r--r-- | www/apache22/Makefile | 15 | ||||
-rw-r--r-- | www/apache22/PLIST | 73 | ||||
-rw-r--r-- | www/apache22/PLIST.all-shared | 72 | ||||
-rw-r--r-- | www/apache22/options.mk | 19 |
4 files changed, 88 insertions, 91 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index b59d063313c..61e374ae7a0 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2009/02/25 15:39:38 tron Exp $ +# $NetBSD: Makefile,v 1.40 2009/04/08 17:03:25 tron Exp $ DISTNAME= httpd-2.2.11 PKGREVISION= 2 @@ -105,19 +105,6 @@ DFLT_APACHE_MODULES+= ldap authnz_ldap .include "options.mk" -# APACHE_MODULES are the modules that are linked statically into the -# apache httpd executable. -# -#.if ${APACHE_MODULES} == "all-shared" -.if !empty(PKG_OPTIONS:Mapache-shared-modules) -# XXX ldap and suexec? -CONFIGURE_ARGS+= --enable-mods-shared=${DFLT_APACHE_MODULES:Q} -PLIST_SRC+= ${PKGDIR}/PLIST.all-shared -.else -CONFIGURE_ARGS+= --enable-modules=${APACHE_MODULES:Q} -.endif -BUILD_DEFS+= APACHE_MODULES - APACHE_USER?= www APACHE_GROUP?= www PKG_GROUPS= ${APACHE_GROUP} diff --git a/www/apache22/PLIST b/www/apache22/PLIST index 442d68b8fdc..5ae8fe48f15 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/12/28 14:00:59 tron Exp $ +@comment $NetBSD: PLIST,v 1.10 2009/04/08 17:03:25 tron Exp $ ${PLIST.suexec}sbin/suexec include/httpd/ap_compat.h include/httpd/ap_config.h @@ -47,6 +47,77 @@ include/httpd/util_script.h include/httpd/util_time.h include/httpd/util_xml.h lib/httpd/httpd.exp +${PLIST.all-shared}lib/httpd/mod_actions.so +${PLIST.all-shared}lib/httpd/mod_alias.so +${PLIST.all-shared}lib/httpd/mod_asis.so +${PLIST.all-shared}lib/httpd/mod_auth_basic.so +${PLIST.all-shared}lib/httpd/mod_auth_digest.so +${PLIST.all-shared}lib/httpd/mod_authn_alias.so +${PLIST.all-shared}lib/httpd/mod_authn_anon.so +${PLIST.all-shared}lib/httpd/mod_authn_dbd.so +${PLIST.all-shared}lib/httpd/mod_authn_dbm.so +${PLIST.all-shared}lib/httpd/mod_authn_default.so +${PLIST.all-shared}lib/httpd/mod_authn_file.so +${PLIST.all-shared}lib/httpd/mod_authz_dbm.so +${PLIST.all-shared}lib/httpd/mod_authz_default.so +${PLIST.all-shared}lib/httpd/mod_authz_groupfile.so +${PLIST.all-shared}lib/httpd/mod_authz_host.so +${PLIST.all-shared}lib/httpd/mod_authz_owner.so +${PLIST.all-shared}lib/httpd/mod_authz_user.so +${PLIST.all-shared}lib/httpd/mod_autoindex.so +${PLIST.all-shared}lib/httpd/mod_bucketeer.so +${PLIST.all-shared}lib/httpd/mod_cache.so +${PLIST.all-shared}lib/httpd/mod_case_filter.so +${PLIST.all-shared}lib/httpd/mod_case_filter_in.so +${PLIST.all-shared}lib/httpd/mod_cern_meta.so +${PLIST.all-shared}lib/httpd/mod_cgi.so +${PLIST.all-shared}lib/httpd/mod_cgid.so +${PLIST.all-shared}lib/httpd/mod_charset_lite.so +${PLIST.all-shared}lib/httpd/mod_dav.so +${PLIST.all-shared}lib/httpd/mod_dav_fs.so +${PLIST.all-shared}lib/httpd/mod_dav_lock.so +${PLIST.all-shared}lib/httpd/mod_dbd.so +${PLIST.all-shared}lib/httpd/mod_deflate.so +${PLIST.all-shared}lib/httpd/mod_dir.so +${PLIST.all-shared}lib/httpd/mod_disk_cache.so +${PLIST.all-shared}lib/httpd/mod_dumpio.so +${PLIST.all-shared}lib/httpd/mod_echo.so +${PLIST.all-shared}lib/httpd/mod_env.so +${PLIST.all-shared}lib/httpd/mod_example.so +${PLIST.all-shared}lib/httpd/mod_expires.so +${PLIST.all-shared}lib/httpd/mod_ext_filter.so +${PLIST.all-shared}lib/httpd/mod_file_cache.so +${PLIST.all-shared}lib/httpd/mod_filter.so +${PLIST.all-shared}lib/httpd/mod_headers.so +${PLIST.all-shared}lib/httpd/mod_ident.so +${PLIST.all-shared}lib/httpd/mod_imagemap.so +${PLIST.all-shared}lib/httpd/mod_include.so +${PLIST.all-shared}lib/httpd/mod_info.so +${PLIST.all-shared}lib/httpd/mod_isapi.so +${PLIST.all-shared}lib/httpd/mod_log_config.so +${PLIST.all-shared}lib/httpd/mod_log_forensic.so +${PLIST.all-shared}lib/httpd/mod_logio.so +${PLIST.all-shared}lib/httpd/mod_mem_cache.so +${PLIST.all-shared}lib/httpd/mod_mime.so +${PLIST.all-shared}lib/httpd/mod_mime_magic.so +${PLIST.all-shared}lib/httpd/mod_negotiation.so +${PLIST.all-shared}lib/httpd/mod_proxy.so +${PLIST.all-shared}lib/httpd/mod_proxy_ajp.so +${PLIST.all-shared}lib/httpd/mod_proxy_balancer.so +${PLIST.all-shared}lib/httpd/mod_proxy_connect.so +${PLIST.all-shared}lib/httpd/mod_proxy_ftp.so +${PLIST.all-shared}lib/httpd/mod_proxy_http.so +${PLIST.all-shared}lib/httpd/mod_rewrite.so +${PLIST.all-shared}lib/httpd/mod_setenvif.so +${PLIST.all-shared}lib/httpd/mod_speling.so +${PLIST.all-shared}lib/httpd/mod_ssl.so +${PLIST.all-shared}lib/httpd/mod_status.so +${PLIST.all-shared}lib/httpd/mod_substitute.so +${PLIST.all-shared}lib/httpd/mod_unique_id.so +${PLIST.all-shared}lib/httpd/mod_userdir.so +${PLIST.all-shared}lib/httpd/mod_usertrack.so +${PLIST.all-shared}lib/httpd/mod_version.so +${PLIST.all-shared}lib/httpd/mod_vhost_alias.so libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi man/man1/dbmmanage.1 diff --git a/www/apache22/PLIST.all-shared b/www/apache22/PLIST.all-shared deleted file mode 100644 index 26418faf8d7..00000000000 --- a/www/apache22/PLIST.all-shared +++ /dev/null @@ -1,72 +0,0 @@ -@comment $NetBSD: PLIST.all-shared,v 1.2 2008/09/16 01:47:06 epg Exp $ -lib/httpd/mod_actions.so -lib/httpd/mod_alias.so -lib/httpd/mod_asis.so -lib/httpd/mod_auth_basic.so -lib/httpd/mod_auth_digest.so -lib/httpd/mod_authn_alias.so -lib/httpd/mod_authn_anon.so -lib/httpd/mod_authn_dbd.so -lib/httpd/mod_authn_dbm.so -lib/httpd/mod_authn_default.so -lib/httpd/mod_authn_file.so -lib/httpd/mod_authz_dbm.so -lib/httpd/mod_authz_default.so -lib/httpd/mod_authz_groupfile.so -lib/httpd/mod_authz_host.so -lib/httpd/mod_authz_owner.so -lib/httpd/mod_authz_user.so -lib/httpd/mod_autoindex.so -lib/httpd/mod_bucketeer.so -lib/httpd/mod_cache.so -lib/httpd/mod_case_filter.so -lib/httpd/mod_case_filter_in.so -lib/httpd/mod_cern_meta.so -lib/httpd/mod_cgi.so -lib/httpd/mod_cgid.so -lib/httpd/mod_charset_lite.so -lib/httpd/mod_dav.so -lib/httpd/mod_dav_fs.so -lib/httpd/mod_dav_lock.so -lib/httpd/mod_dbd.so -lib/httpd/mod_deflate.so -lib/httpd/mod_dir.so -lib/httpd/mod_disk_cache.so -lib/httpd/mod_dumpio.so -lib/httpd/mod_echo.so -lib/httpd/mod_env.so -lib/httpd/mod_example.so -lib/httpd/mod_expires.so -lib/httpd/mod_ext_filter.so -lib/httpd/mod_file_cache.so -lib/httpd/mod_filter.so -lib/httpd/mod_headers.so -lib/httpd/mod_ident.so -lib/httpd/mod_imagemap.so -lib/httpd/mod_include.so -lib/httpd/mod_info.so -lib/httpd/mod_isapi.so -lib/httpd/mod_log_config.so -lib/httpd/mod_log_forensic.so -lib/httpd/mod_logio.so -lib/httpd/mod_mem_cache.so -lib/httpd/mod_mime.so -lib/httpd/mod_mime_magic.so -lib/httpd/mod_negotiation.so -lib/httpd/mod_proxy.so -lib/httpd/mod_proxy_ajp.so -lib/httpd/mod_proxy_balancer.so -lib/httpd/mod_proxy_connect.so -lib/httpd/mod_proxy_ftp.so -lib/httpd/mod_proxy_http.so -lib/httpd/mod_rewrite.so -lib/httpd/mod_setenvif.so -lib/httpd/mod_speling.so -lib/httpd/mod_ssl.so -lib/httpd/mod_status.so -lib/httpd/mod_substitute.so -lib/httpd/mod_unique_id.so -lib/httpd/mod_userdir.so -lib/httpd/mod_usertrack.so -lib/httpd/mod_version.so -lib/httpd/mod_vhost_alias.so diff --git a/www/apache22/options.mk b/www/apache22/options.mk index 77695d81817..b210a8e4f01 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,15 +1,25 @@ -# $NetBSD: options.mk,v 1.5 2008/09/16 01:47:06 epg Exp $ +# $NetBSD: options.mk,v 1.6 2009/04/08 17:03:25 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= apache-shared-modules suexec .include "../../mk/bsd.options.mk" +# APACHE_MODULES are the modules that are linked statically into the +# apache httpd executable. +# +PLIST_VARS+= all-shared +.if !empty(PKG_OPTIONS:Mapache-shared-modules) +CONFIGURE_ARGS+= --enable-mods-shared=${DFLT_APACHE_MODULES:Q} +PLIST.all-shared= yes +.else +CONFIGURE_ARGS+= --enable-modules=${APACHE_MODULES:Q} +.endif +BUILD_DEFS+= APACHE_MODULES + PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) -PKG_USERS_VARS+= APACHE_USER -PKG_GROUPS_VARS+= APACHE_GROUP -BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH +BUILD_DEFS+= APACHE_SUEXEC_PATH BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs @@ -25,6 +35,7 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS +BUILD_TARGET= all suexec PLIST.suexec= yes SPECIAL_PERMS+= sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510 .endif |