Date: Mon, 16 Jul 2012 20:13:35 -0300 From: Marcello Coutinho <marcellocoutinho@gmail.com> To: apache@freebsd.org Cc: ports@freebsd.org Subject: Re: merge apache22 MPM modules on make config Message-ID: <CAEjMxNFP4ZgvXRAyihCD7rZUR75mvcBbRATs=obTmqZZ2=cR-A@mail.gmail.com> In-Reply-To: <CAEjMxNHsUPQyRwn2F14as9w6mcB2CxQxbpMNn5JEs8Z49WBXpg@mail.gmail.com> References: <CAEjMxNHsUPQyRwn2F14as9w6mcB2CxQxbpMNn5JEs8Z49WBXpg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
I forgot to test make package.
These are the files with all changes together
[-- Attachment #2 --]
--- Makefile.modules.orig 2012-07-16 21:45:52.000000000 +0000
+++ Makefile.modules 2012-07-16 23:05:38.000000000 +0000
@@ -44,38 +44,61 @@
.endif
+. if (!defined(WITH_MPM_WORKER) && !defined(WITH_MPM_ITK) && !defined(WITH_MPM_EVENT) && !defined (WITH_MPM_PERUSER))
+PLIST_SUB+= PREFORK="" WORKER="@comment " EVENT="@comment "
+.endif
+
.if defined(_PREMKINCLUDED)
# MPM section:
-# << TO BE WRITTEN >>
-.if defined (SLAVE_PORT_MPM)
-PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "
-PKGNAMESUFFIX= -${SLAVE_PORT_MPM}
-.else
-. if ${WITH_MPM} != "prefork"
-PKGNAMESUFFIX= -${WITH_MPM:L}
-. if ${WITH_MPM} != "itk"
-WITH_THREADS= yes
-WITH_THREADS_MODULES= yes
-WITHOUT_MODULES+= cgi
-. endif
-. if ${WITH_MPM:L} == "worker"
+.if defined(WITH_MPM_WORKER)
+. if (defined(WITH_MPM_ITK) || defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER))
+IGNORE+= Select only one MPM module to compile.
+. endif
+. if (!defined(WITH_THREADS))
+IGNORE+= mpm_worker requires WITH_THREADS.
+. endif
PLIST_SUB+= PREFORK="@comment " WORKER="" EVENT="@comment "
-. elif ${WITH_MPM:L} == "event"
-PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT=""
-. elif ${WITH_MPM:L} == "itk"
+WITH_MPM= worker
+WITHOUT_MODULES+= cgi
+.endif
+
+.if defined(WITH_MPM_ITK)
+. if (defined(WITH_MPM_EVENT) || defined (WITH_MPM_PERUSER))
+IGNORE+= Select only one MPM module to compile.
+. endif
+. if defined(WITH_THREADS)
+IGNORE+= mpm_itk conflicts with WITH_THREADS option.
+. endif
PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "
-EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-${MPM_ITK_VERSION}
-. if defined (WITH_ITK_PERDIR_REGEX)
-EXTRA_PATCHES+= ${PATCHDIR}/mpm-itk-perdir-regex
-. endif
-. else
-IGNORE= "Unknown MPM: ${WITH_MPM}"
-. endif
-. else
-PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment "
-. endif
-.else
+WITH_MPM= itk
+EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-${MPM_ITK_VERSION}
+EXTRA_PATCHES+= ${.CURDIR}/files/mpm-itk-perdir-regex
+.endif
+
+.if defined(WITH_MPM_EVENT)
+. if defined (WITH_MPM_PERUSER)
+IGNORE+= Select only one MPM module to compile.
+. endif
+. if (!defined(WITH_THREADS))
+IGNORE+= mpm_event requires WITH_THREADS.
+. endif
+PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT=""
+WITHOUT_MODULES+= cgi
+WITH_MPM= event
+.endif
+
+.if defined(WITH_MPM_PERUSER)
+. if (!defined(WITH_THREADS))
+IGNORE+= mpm_event requires WITH_THREADS.
+. endif
+#PLIST_SUB+= PREFORK="@comment " WORKER="@comment " THREADPOOL="@comment " EVENT="@comment "
PLIST_SUB+= PREFORK="@comment " WORKER="@comment " EVENT="@comment "
+WITHOUT_MODULES+= cgi
+WITH_MPM= peruser
+WITH_SLAVE_MPM= peruser
+EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0.patch
+EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3.patch
+EXTRA_PATCHES+= ${.CURDIR}/files/httpd-2.2.3-peruser-0.3.0-dc3-r57.patch
.endif
# xDBM section
[-- Attachment #3 --]
--- Makefile.options.orig 2012-07-16 21:46:30.000000000 +0000
+++ Makefile.options 2012-07-16 23:04:40.000000000 +0000
@@ -1,4 +1,8 @@
OPTIONS+= \
+ MPM_WORKER "Enable worker MPM module" OFF \
+ MPM_ITK "Enable EXPERIMENTAL itk MPM module" OFF \
+ MPM_EVENT "Enable EXPERIMENTAL event MPM module" OFF \
+ MPM_PERUSER "Enable EXPERIMENTAL peruser MPM module" OFF \
AUTH_BASIC "Enable mod_auth_basic" ON \
AUTH_DIGEST "Enable mod_auth_digest" ON \
AUTHN_FILE "Enable mod_authn_file" ON \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAEjMxNFP4ZgvXRAyihCD7rZUR75mvcBbRATs=obTmqZZ2=cR-A>