diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-02-22 17:28:34 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-02-22 17:28:34 +0000 |
| commit | 4e14632803797946e008d23e648e9ea4443dd4b4 (patch) | |
| tree | 69885f7fc7735e50276926ee5da3f0f28db6eaf7 /www | |
| parent | c37b8c7c7b36e4b9800ca777fa86cb1ad3d309b6 (diff) | |
| download | pkgsrc-4e14632803797946e008d23e648e9ea4443dd4b4.tar.gz | |
Enable MPMs select.
It is disabled by my misunderstanding.
The default binary is not changed.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache24/MESSAGE | 6 | ||||
| -rw-r--r-- | www/apache24/PLIST | 8 | ||||
| -rw-r--r-- | www/apache24/options.mk | 16 |
3 files changed, 16 insertions, 14 deletions
diff --git a/www/apache24/MESSAGE b/www/apache24/MESSAGE index de839c10fb7..fc1662be7c7 100644 --- a/www/apache24/MESSAGE +++ b/www/apache24/MESSAGE @@ -1,8 +1,8 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2012/08/26 12:37:34 ryoon Exp $ +$NetBSD: MESSAGE,v 1.2 2014/02/22 17:28:34 ryoon Exp $ -After apache-2.4.3, --enable-mpms-shared='event prefork worker' is -passed to configure script, then three multi-process model is built +After apache-2.4.3, --enable-mpms-shared='${MPMS}' is +passed to configure script, then these multi-process model is built and you can select the model in configuraton file. The mod_cgi.so module conflicts with non-prefork multi-process model, diff --git a/www/apache24/PLIST b/www/apache24/PLIST index e230a6b86eb..71f5f710c98 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2013/12/01 10:02:34 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.13 2014/02/22 17:28:34 ryoon Exp $ bin/ab bin/apxs bin/dbmmanage @@ -133,9 +133,9 @@ ${PLIST.lua}lib/httpd/mod_lua.so lib/httpd/mod_macro.so lib/httpd/mod_mime.so lib/httpd/mod_mime_magic.so -lib/httpd/mod_mpm_event.so -lib/httpd/mod_mpm_prefork.so -lib/httpd/mod_mpm_worker.so +${PLIST.event}lib/httpd/mod_mpm_event.so +${PLIST.prefork}lib/httpd/mod_mpm_prefork.so +${PLIST.worker}lib/httpd/mod_mpm_worker.so lib/httpd/mod_negotiation.so ${PLIST.privileges}lib/httpd/mod_privileges.so lib/httpd/mod_proxy.so diff --git a/www/apache24/options.mk b/www/apache24/options.mk index 7c5df17904e..c8034deff25 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.8 2013/06/04 22:08:20 fhajny Exp $ +# $NetBSD: options.mk,v 1.9 2014/02/22 17:28:34 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker -PKG_SUGGESTED_OPTIONS= apache-mpm-prefork +PKG_SUGGESTED_OPTIONS= apache-mpm-event apache-mpm-prefork \ + apache-mpm-worker .if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9]) PKG_SUPPORTED_OPTIONS+= privileges @@ -24,23 +25,24 @@ PKG_SUPPORTED_OPTIONS+= privileges # PLIST_VARS+= worker prefork event -CONFIGURE_ARGS+= --enable-mpms-shared='event prefork worker' - .if !empty(PKG_OPTIONS:Mapache-mpm-event) -CONFIGURE_ARGS+= --with-mpm=event +MPMS+= event PLIST.event= yes .endif .if !empty(PKG_OPTIONS:Mapache-mpm-worker) -CONFIGURE_ARGS+= --with-mpm=worker +MPMS+= worker PLIST.worker= yes .endif .if !empty(PKG_OPTIONS:Mapache-mpm-prefork) -CONFIGURE_ARGS+= --with-mpm=prefork +MPMS+= prefork PLIST.prefork= yes .endif +CONFIGURE_ARGS+= --enable-mpms-shared='${MPMS}' +MESSAGE_SUBST+= MPMS=${MPMS:Q} + BUILD_DEFS+= APACHE_MODULES PLIST_VARS+= suexec |