diff options
| author | ryoon <ryoon@pkgsrc.org> | 2015-06-26 19:25:12 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2015-06-26 19:25:12 +0000 |
| commit | c8c7e97a7bb1da51de73e38c3723c5ee812ea182 (patch) | |
| tree | b2999ca32d7e57a584574c1a8d6258b54f032b52 /www/apache24 | |
| parent | e7b859fa61f96dc6b16c9417a76d37883c09cc55 (diff) | |
| download | pkgsrc-c8c7e97a7bb1da51de73e38c3723c5ee812ea182.tar.gz | |
Fix configure stage error when both of -apache-mpm-event and
-apache-mpm-worker is set.
And fix PLIST mismatch error.
Diffstat (limited to 'www/apache24')
| -rw-r--r-- | www/apache24/PLIST | 5 | ||||
| -rw-r--r-- | www/apache24/options.mk | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/www/apache24/PLIST b/www/apache24/PLIST index fb61d2ceced..1a82e5395a7 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2015/02/02 14:45:51 adam Exp $ +@comment $NetBSD: PLIST,v 1.18 2015/06/26 19:25:12 ryoon Exp $ bin/ab bin/apxs bin/dbmmanage @@ -98,7 +98,8 @@ lib/httpd/mod_buffer.so lib/httpd/mod_cache.so lib/httpd/mod_cache_disk.so lib/httpd/mod_cache_socache.so -lib/httpd/mod_cgid.so +${PLIST.only-prefork}lib/httpd/mod_cgi.so +${PLIST.not-only-prefork}lib/httpd/mod_cgid.so lib/httpd/mod_charset_lite.so lib/httpd/mod_data.so lib/httpd/mod_dav.so diff --git a/www/apache24/options.mk b/www/apache24/options.mk index c8034deff25..e9bd612e7cf 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2014/02/22 17:28:34 ryoon Exp $ +# $NetBSD: options.mk,v 1.10 2015/06/26 19:25:12 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker @@ -23,7 +23,7 @@ PKG_SUPPORTED_OPTIONS+= privileges # prefork non-threaded, pre-forking web server # worker hybrid multi-threaded multi-process web server # -PLIST_VARS+= worker prefork event +PLIST_VARS+= worker prefork event only-prefork not-only-prefork .if !empty(PKG_OPTIONS:Mapache-mpm-event) MPMS+= event @@ -42,6 +42,15 @@ PLIST.prefork= yes CONFIGURE_ARGS+= --enable-mpms-shared='${MPMS}' MESSAGE_SUBST+= MPMS=${MPMS:Q} +# If only prefork mpm is supported, ... +.if empty(PKG_OPTIONS:Mapache-mpm-event) && \ + empty(PKG_OPTIONS:Mapache-mpm-worker) && \ + !empty(PKG_OPTIONS:Mapache-mpm-prefork) +CONFIGURE_ARGS+= --with-mpm=prefork +PLIST.only-prefork= yes +.else +PLIST.not-only-prefork= yes +.endif BUILD_DEFS+= APACHE_MODULES |