diff options
| author | adrianp <adrianp> | 2005-05-18 19:10:01 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2005-05-18 19:10:01 +0000 |
| commit | b423ec5fb67915ca5045a2b2e2f3419cb0ac3c69 (patch) | |
| tree | 072929452bdeb08ce953f51bc2c0ae4003447ed8 /www | |
| parent | 46b130182e2a132e3e3ff9708746b9bae17b63f5 (diff) | |
| download | pkgsrc-b423ec5fb67915ca5045a2b2e2f3419cb0ac3c69.tar.gz | |
- Add an option ${APACHE_SUEXEC_LOGFILE} so the user can specify
where they would like the suexec logfile to go. Ok'ed tron@
- Bump pkgrevision
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile.common | 3 | ||||
| -rw-r--r-- | www/apache2/options.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/www/apache2/Makefile.common b/www/apache2/Makefile.common index 3484f2e6694..a81a62b1e67 100644 --- a/www/apache2/Makefile.common +++ b/www/apache2/Makefile.common @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.common,v 1.16 2005/04/25 09:13:14 adam Exp $ +# $NetBSD: Makefile.common,v 1.17 2005/05/18 19:10:01 adrianp Exp $ DISTNAME= httpd-${APACHE_VERSION} +PKGREVISION= 1 EXTRACT_SUFX= .tar.bz2 # When updating this version be sure to update the checksum and remove # any PKGREVISION for devel/apr also. diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 3730e8817d7..8953f8cd4e5 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2005/05/18 19:10:01 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec @@ -8,12 +8,13 @@ PKG_SUPPORTED_OPTIONS= suexec .if !empty(PKG_OPTIONS:Msuexec) APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin +APACHE_SUEXEC_LOGFILE?= ${VARBASE}/log/httpd/suexec.log APACHE_SUEXEC_CONFIGURE_ARGS+= \ --with-suexec-bin=${PREFIX}/sbin/suexec \ --with-suexec-caller=${APACHE_USER} \ --with-suexec-safepath='${APACHE_SUEXEC_PATH}' \ --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT} \ - --with-suexec-logfile=${VARBASE}/log/httpd/suexec.log + --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE} APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} |