[pkgsrc/trunk]: pkgsrc/www/apache2 * Create APACHE_MPM variable that can be e...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ab245bec324
branches:  trunk
changeset: 484004:5ab245bec324
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 22 22:52:53 2004 +0000

description:
* Create APACHE_MPM variable that can be either "prefork" or "worker"
  (defaulting to "prefork") that chooses the multi-processing model
  for apache to handle requests.  "Prefork" is the method used by
  Apache-1.3, which is non-threaded.  "Worker" uses threads to handle
  requests.

* Fix libtool usage in this package.  Apache uses libtool, but is
  hardcoded to use the libtool installed by devel/apr.  Patch the
  generated makefile fragment to use a local libtool instead, and
  allow the usual libtool wrapper to take its place.

diffstat:

 www/apache2/Makefile |  25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r b533fbe10b42 -r 5ab245bec324 www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Nov 22 22:25:41 2004 +0000
+++ b/www/apache2/Makefile      Mon Nov 22 22:52:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2004/11/22 20:25:26 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2004/11/22 22:52:53 jlam Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 PKGREVISION=           2
@@ -13,16 +13,13 @@
 
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
-
-#USE_LIBTOOL=          YES
-#LIBTOOL_OVERRIDE=     libtool
+USE_LIBTOOL=           YES
 
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-layout=NetBSD
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-port=80
-CONFIGURE_ARGS+=       --with-mpm=prefork
 CONFIGURE_ARGS+=       --enable-so
 
 # Apache Portable Runtime library configure options
@@ -31,6 +28,15 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# Set the "Multi-Processing Model" used by Apache to handle requests.
+# Valid values are:
+#      prefork         non-threaded, pre-forking web server
+#      worker          hybrid multi-threaded multi-process web server
+#
+APACHE_MPM?=           prefork
+CONFIGURE_ARGS+=       --with-mpm=${APACHE_MPM}
+BUILD_DEFS+=           APACHE_MPM
+
 DFLT_APACHE_MODULES=   all
 DFLT_APACHE_MODULES+=  proxy proxy_connect proxy_ftp proxy_http
 DFLT_APACHE_MODULES+=  ssl
@@ -80,6 +86,12 @@
 SUBST_SED.paths=       -e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.paths=   "Fixing paths."
 
+SUBST_CLASSES=         apr-lt
+SUBST_STAGE.apr-lt=    post-configure
+SUBST_FILES.apr-lt=    build/config_vars.mk
+SUBST_SED.apr-lt=      -e "s|^\(LIBTOOL =\) [^ ]*|\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
+SUBST_MESSAGE.apr-lt=  "Fixing libtool references."
+
 SUBST_CLASSES+=                confs
 SUBST_STAGE.confs=     post-install
 SUBST_FILES.confs=     ${EGDIR}/highperformance-std.conf \
@@ -124,6 +136,9 @@
 .  endif
 .endfor
 
+post-extract:
+       ${TOUCH} ${WRKSRC}/libtool
+
 pre-install:
        @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV}                            \
                ${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"