Sat Feb 22 17:28:34 2014 UTC ()
Enable MPMs select.
It is disabled by my misunderstanding.
The default binary is not changed.


(ryoon)
diff -r1.1 -r1.2 pkgsrc/www/apache24/MESSAGE
diff -r1.12 -r1.13 pkgsrc/www/apache24/PLIST
diff -r1.8 -r1.9 pkgsrc/www/apache24/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/www/apache24/MESSAGE (expand / switch to unified diff)

--- pkgsrc/www/apache24/MESSAGE 2012/08/26 12:37:34 1.1
+++ pkgsrc/www/apache24/MESSAGE 2014/02/22 17:28:34 1.2
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.1 2012/08/26 12:37:34 ryoon Exp $ 2$NetBSD: MESSAGE,v 1.2 2014/02/22 17:28:34 ryoon Exp $
3 3
4After apache-2.4.3, --enable-mpms-shared='event prefork worker' is 4After apache-2.4.3, --enable-mpms-shared='${MPMS}' is
5passed to configure script, then three multi-process model is built 5passed to configure script, then these multi-process model is built
6and you can select the model in configuraton file. 6and you can select the model in configuraton file.
7 7
8The mod_cgi.so module conflicts with non-prefork multi-process model, 8The mod_cgi.so module conflicts with non-prefork multi-process model,
9and mod_cgi.so module is not built anymore. 9and mod_cgi.so module is not built anymore.
10You can use mod_cgid.so module instead. 10You can use mod_cgid.so module instead.
11=========================================================================== 11===========================================================================
cvs diff -r1.12 -r1.13 pkgsrc/www/apache24/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache24/PLIST 2013/12/01 10:02:34 1.12
+++ pkgsrc/www/apache24/PLIST 2014/02/22 17:28:34 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2013/12/01 10:02:34 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.13 2014/02/22 17:28:34 ryoon Exp $
2bin/ab 2bin/ab
3bin/apxs 3bin/apxs
4bin/dbmmanage 4bin/dbmmanage
5bin/htdbm 5bin/htdbm
6bin/htdigest 6bin/htdigest
7bin/htpasswd 7bin/htpasswd
8bin/httxt2dbm 8bin/httxt2dbm
9bin/logresolve 9bin/logresolve
10bin/mkcert 10bin/mkcert
11include/httpd/ap_compat.h 11include/httpd/ap_compat.h
12include/httpd/ap_config.h 12include/httpd/ap_config.h
13include/httpd/ap_config_auto.h 13include/httpd/ap_config_auto.h
14include/httpd/ap_config_layout.h 14include/httpd/ap_config_layout.h
@@ -123,29 +123,29 @@ lib/httpd/mod_info.so @@ -123,29 +123,29 @@ lib/httpd/mod_info.so
123lib/httpd/mod_lbmethod_bybusyness.so 123lib/httpd/mod_lbmethod_bybusyness.so
124lib/httpd/mod_lbmethod_byrequests.so 124lib/httpd/mod_lbmethod_byrequests.so
125lib/httpd/mod_lbmethod_bytraffic.so 125lib/httpd/mod_lbmethod_bytraffic.so
126lib/httpd/mod_lbmethod_heartbeat.so 126lib/httpd/mod_lbmethod_heartbeat.so
127${PLIST.ldap}lib/httpd/mod_ldap.so 127${PLIST.ldap}lib/httpd/mod_ldap.so
128lib/httpd/mod_log_config.so 128lib/httpd/mod_log_config.so
129lib/httpd/mod_log_debug.so 129lib/httpd/mod_log_debug.so
130lib/httpd/mod_log_forensic.so 130lib/httpd/mod_log_forensic.so
131lib/httpd/mod_logio.so 131lib/httpd/mod_logio.so
132${PLIST.lua}lib/httpd/mod_lua.so 132${PLIST.lua}lib/httpd/mod_lua.so
133lib/httpd/mod_macro.so 133lib/httpd/mod_macro.so
134lib/httpd/mod_mime.so 134lib/httpd/mod_mime.so
135lib/httpd/mod_mime_magic.so 135lib/httpd/mod_mime_magic.so
136lib/httpd/mod_mpm_event.so 136${PLIST.event}lib/httpd/mod_mpm_event.so
137lib/httpd/mod_mpm_prefork.so 137${PLIST.prefork}lib/httpd/mod_mpm_prefork.so
138lib/httpd/mod_mpm_worker.so 138${PLIST.worker}lib/httpd/mod_mpm_worker.so
139lib/httpd/mod_negotiation.so 139lib/httpd/mod_negotiation.so
140${PLIST.privileges}lib/httpd/mod_privileges.so 140${PLIST.privileges}lib/httpd/mod_privileges.so
141lib/httpd/mod_proxy.so 141lib/httpd/mod_proxy.so
142lib/httpd/mod_proxy_ajp.so 142lib/httpd/mod_proxy_ajp.so
143lib/httpd/mod_proxy_balancer.so 143lib/httpd/mod_proxy_balancer.so
144lib/httpd/mod_proxy_connect.so 144lib/httpd/mod_proxy_connect.so
145lib/httpd/mod_proxy_express.so 145lib/httpd/mod_proxy_express.so
146lib/httpd/mod_proxy_fcgi.so 146lib/httpd/mod_proxy_fcgi.so
147lib/httpd/mod_proxy_fdpass.so 147lib/httpd/mod_proxy_fdpass.so
148lib/httpd/mod_proxy_ftp.so 148lib/httpd/mod_proxy_ftp.so
149lib/httpd/mod_proxy_http.so 149lib/httpd/mod_proxy_http.so
150lib/httpd/mod_proxy_scgi.so 150lib/httpd/mod_proxy_scgi.so
151lib/httpd/mod_proxy_wstunnel.so 151lib/httpd/mod_proxy_wstunnel.so
cvs diff -r1.8 -r1.9 pkgsrc/www/apache24/options.mk (expand / switch to unified diff)

--- pkgsrc/www/apache24/options.mk 2013/06/04 22:08:20 1.8
+++ pkgsrc/www/apache24/options.mk 2014/02/22 17:28:34 1.9
@@ -1,56 +1,58 @@ @@ -1,56 +1,58 @@
1# $NetBSD: options.mk,v 1.8 2013/06/04 22:08:20 fhajny Exp $ 1# $NetBSD: options.mk,v 1.9 2014/02/22 17:28:34 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.apache 3PKG_OPTIONS_VAR= PKG_OPTIONS.apache
4PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker 4PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker
5PKG_SUGGESTED_OPTIONS= apache-mpm-prefork 5PKG_SUGGESTED_OPTIONS= apache-mpm-event apache-mpm-prefork \
 6 apache-mpm-worker
6 7
7.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9]) 8.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.1[0-9])
8PKG_SUPPORTED_OPTIONS+= privileges 9PKG_SUPPORTED_OPTIONS+= privileges
9# Disabled until DTrace support is fully implemented/fixed 10# Disabled until DTrace support is fully implemented/fixed
10# PKG_SUPPORTED_OPTIONS+= dtrace 11# PKG_SUPPORTED_OPTIONS+= dtrace
11.endif 12.endif
12 13
13.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
14 15
15# Set the "Multi-Processing Model" used by Apache to handle requests. 16# Set the "Multi-Processing Model" used by Apache to handle requests.
16# Valid values are: 17# Valid values are:
17# event multi-threaded based in worker, designed 18# event multi-threaded based in worker, designed
18# to allow more requests to be served 19# to allow more requests to be served
19# simultaneously by passing off some processing 20# simultaneously by passing off some processing
20# work to supporting threads. 21# work to supporting threads.
21# BEWARE: does not work with SSL or input filters. 22# BEWARE: does not work with SSL or input filters.
22# prefork non-threaded, pre-forking web server 23# prefork non-threaded, pre-forking web server
23# worker hybrid multi-threaded multi-process web server 24# worker hybrid multi-threaded multi-process web server
24# 25#
25PLIST_VARS+= worker prefork event 26PLIST_VARS+= worker prefork event
26 27
27CONFIGURE_ARGS+= --enable-mpms-shared='event prefork worker' 
28 
29.if !empty(PKG_OPTIONS:Mapache-mpm-event) 28.if !empty(PKG_OPTIONS:Mapache-mpm-event)
30CONFIGURE_ARGS+= --with-mpm=event 29MPMS+= event
31PLIST.event= yes 30PLIST.event= yes
32.endif 31.endif
33 32
34.if !empty(PKG_OPTIONS:Mapache-mpm-worker) 33.if !empty(PKG_OPTIONS:Mapache-mpm-worker)
35CONFIGURE_ARGS+= --with-mpm=worker 34MPMS+= worker
36PLIST.worker= yes 35PLIST.worker= yes
37.endif 36.endif
38 37
39.if !empty(PKG_OPTIONS:Mapache-mpm-prefork) 38.if !empty(PKG_OPTIONS:Mapache-mpm-prefork)
40CONFIGURE_ARGS+= --with-mpm=prefork 39MPMS+= prefork
41PLIST.prefork= yes 40PLIST.prefork= yes
42.endif 41.endif
43 42
 43CONFIGURE_ARGS+= --enable-mpms-shared='${MPMS}'
 44MESSAGE_SUBST+= MPMS=${MPMS:Q}
 45
44BUILD_DEFS+= APACHE_MODULES 46BUILD_DEFS+= APACHE_MODULES
45 47
46PLIST_VARS+= suexec 48PLIST_VARS+= suexec
47.if !empty(PKG_OPTIONS:Msuexec) 49.if !empty(PKG_OPTIONS:Msuexec)
48BUILD_DEFS+= APACHE_SUEXEC_PATH 50BUILD_DEFS+= APACHE_SUEXEC_PATH
49BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE 51BUILD_DEFS+= APACHE_SUEXEC_DOCROOT APACHE_SUEXEC_LOGFILE
50 52
51APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs 53APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
52APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin 54APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
53APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log 55APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log
54APACHE_SUEXEC_CONFIGURE_ARGS+= \ 56APACHE_SUEXEC_CONFIGURE_ARGS+= \
55 --with-suexec-bin=${PREFIX}/sbin/suexec \ 57 --with-suexec-bin=${PREFIX}/sbin/suexec \
56 --with-suexec-caller=${APACHE_USER} \ 58 --with-suexec-caller=${APACHE_USER} \