diff options
| -rw-r--r-- | www/apache22/Makefile | 4 | ||||
| -rw-r--r-- | www/apache22/PLIST | 3 | ||||
| -rw-r--r-- | www/apache22/options.mk | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 82fffee4c64..5785ef8abe9 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2010/04/30 16:30:09 tron Exp $ +# $NetBSD: Makefile,v 1.58 2010/05/03 20:10:33 tron Exp $ DISTNAME= httpd-2.2.15 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${DISTNAME:S/httpd/apache/} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ diff --git a/www/apache22/PLIST b/www/apache22/PLIST index c0fa34843ea..1e0bb0968e6 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2010/04/30 16:30:09 tron Exp $ +@comment $NetBSD: PLIST,v 1.18 2010/05/03 20:10:33 tron Exp $ ${PLIST.suexec}sbin/suexec include/httpd/ap_compat.h include/httpd/ap_config.h @@ -119,6 +119,7 @@ ${PLIST.all-shared}lib/httpd/mod_speling.so ${PLIST.all-shared}lib/httpd/mod_ssl.so ${PLIST.all-shared}lib/httpd/mod_status.so ${PLIST.all-shared}lib/httpd/mod_substitute.so +${PLIST.all-shared}${PLIST.suexec}lib/httpd/mod_suexec.so ${PLIST.all-shared}lib/httpd/mod_unique_id.so ${PLIST.all-shared}lib/httpd/mod_userdir.so ${PLIST.all-shared}lib/httpd/mod_usertrack.so diff --git a/www/apache22/options.mk b/www/apache22/options.mk index c536b6513d8..b2255c600fe 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2010/04/30 16:30:09 tron Exp $ +# $NetBSD: options.mk,v 1.8 2010/05/03 20:10:33 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_OPTIONS_REQUIRED_GROUPS= mpm @@ -56,7 +56,11 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \ --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q} +. if !empty(PKG_OPTIONS:Mapache-shared-modules) +CONFIGURE_ARGS+= --enable-modules="all suexec" +. else APACHE_MODULES+= suexec +. endif CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS BUILD_TARGET= all suexec |