diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-07-11 19:09:18 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-07-11 19:09:18 +0000 |
| commit | 4449ebb67e77bdf8270d0669dab0a0abbc1b068f (patch) | |
| tree | 020ebb36b70cf0e7b1d2eab091be4a85d86dde9f /www | |
| parent | dd1afaf4b499c212d56912ecaaf0d822844f73d2 (diff) | |
| download | pkgsrc-4449ebb67e77bdf8270d0669dab0a0abbc1b068f.tar.gz | |
Bump PKGREVISION
Fix PR pkg/46691 and some module related problems.
* Remove all apache-shared-modules conditionals
* Fix PLIST, mod_suexec.so is installed.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache24/Makefile | 8 | ||||
| -rw-r--r-- | www/apache24/PLIST | 3 | ||||
| -rw-r--r-- | www/apache24/options.mk | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index a3a34752b1a..ab740fd29a6 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2012/07/05 12:50:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.9 2012/07/11 19:09:18 ryoon Exp $ DISTNAME= httpd-2.4.2 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ @@ -57,7 +57,7 @@ FIND_PREFIX:= APRDIR=apr # LDAP support PLIST_VARS+= ldap -.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la) || !empty(PKG_OPTIONS:Mapache-shared-modules) +.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la) DFLT_APACHE_MODULES+= ldap authnz_ldap PLIST.ldap= yes .endif @@ -146,11 +146,9 @@ SUBST_SED.abs_srcdir= -e 's|^\(abs_srcdir =\) .*|\1 ${PREFIX}/share/httpd|' REPLACE_PERL= docs/cgi-examples/printenv -.if !empty(PKG_OPTIONS:Mapache-shared-modules) . include "../../devel/zlib/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-z=${BUILDLINK_PREFIX.zlib} -.endif post-extract: ${TOUCH} ${WRKSRC}/build/libtool diff --git a/www/apache24/PLIST b/www/apache24/PLIST index a6524d0fabe..f0c73787a07 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2012/04/18 11:27:01 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/07/11 19:09:18 ryoon Exp $ bin/ab bin/apxs bin/dbmmanage @@ -160,6 +160,7 @@ lib/httpd/mod_speling.so lib/httpd/mod_ssl.so lib/httpd/mod_status.so lib/httpd/mod_substitute.so +${PLIST.suexec}lib/httpd/mod_suexec.so lib/httpd/mod_unique_id.so lib/httpd/mod_unixd.so lib/httpd/mod_userdir.so diff --git a/www/apache24/options.mk b/www/apache24/options.mk index c66d317aa8b..16bdc8b9427 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2012/04/15 12:23:49 ryoon Exp $ +# $NetBSD: options.mk,v 1.4 2012/07/11 19:09:18 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_OPTIONS_REQUIRED_GROUPS= mpm @@ -47,11 +47,9 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \ --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE} -. 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 |