summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorjlam <jlam>2004-11-22 22:52:53 +0000
committerjlam <jlam>2004-11-22 22:52:53 +0000
commit6609a89cf1bfe1fb8e6d1aac64c657a5c8e080f6 (patch)
tree7b7e5069f7adf5399a51819883ef0cab5705b5fd /www/apache2
parent7f4cb87570771c0eaeda7f5aa147589c55e28e1b (diff)
downloadpkgsrc-6609a89cf1bfe1fb8e6d1aac64c657a5c8e080f6.tar.gz
* 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 (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile25
1 files changed, 20 insertions, 5 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index fcbd8bebfe0..53a87f9393e 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -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 @@ BUILD_DEFS+= USE_INET6
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 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr}
.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_FILES.paths= config.layout
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 @@ CONFIGURE_ARGS+= ${_AP_CFG_ARGS.${_ap_mod}}
. endif
.endfor
+post-extract:
+ ${TOUCH} ${WRKSRC}/libtool
+
pre-install:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
${MAKE_PROGRAM} install-conf sysconfdir="${EGDIR}"