Fix ownership permissions on installed files

Change behaviour of APACHE_MODULES and DFLT_APACHE_MODULES

If you do not define APACHE_MODULES this change will not impact you, the
default behaviour of the package modules has not been changed.

The new functionality is as follows:

1) If you need to add an additional module to be installed with apache
   you would use:

   APACHE_MODULES+= spelling

   This would include mod_spelling as a static module in addition to the
   default modules installed.

2) If you need a highly customised version of apache and would like to
   explicitly list which modules are installed by default you would use:

   APACHE_MODULES= spelling access auth include env autoindex

   This would install _only_ the listed modules as static modules with
   apache.

   If you use APACHE_MODULES= please read the apache documentation at:

	http://httpd.apache.org/docs/2.0/

   To determine which modules you will need to install to get the level
   of functionality you require. By default when using APACHE_MODULES=
   apache only includes with the following static modules:

	core.c
	prefork.c
	http_core.c
	mod_so.c

1 files changed, 37 insertions, 2 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index fa6ad497682..326e0c9adec 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.98 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.99 2006/04/23 11:42:38 adrianp Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	apache-${APACHE_VERSION}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	www
 
 HOMEPAGE=	http://httpd.apache.org/
@@ -48,9 +48,30 @@ PLIST_SUBST+=			${PLIST_SUBST.${_mpm_}}
 .endfor
 PLIST_SUBST.${APACHE_MPM}=	MPM_COMMENT.${APACHE_MPM}=
 
+CONFIGURE_ARGS+=	--disable-access
+CONFIGURE_ARGS+=	--disable-auth
+CONFIGURE_ARGS+=	--disable-include
+CONFIGURE_ARGS+=	--disable-log-config
+CONFIGURE_ARGS+=	--disable-env
+CONFIGURE_ARGS+=	--disable-mime
+CONFIGURE_ARGS+=	--disable-setenvif
+CONFIGURE_ARGS+=	--disable-status
+CONFIGURE_ARGS+=	--disable-autoindex
+CONFIGURE_ARGS+=	--disable-asis
+CONFIGURE_ARGS+=	--disable-cgi
+CONFIGURE_ARGS+=	--disable-negotiation
+CONFIGURE_ARGS+=	--disable-dir
+CONFIGURE_ARGS+=	--disable-imap
+CONFIGURE_ARGS+=	--disable-actions
+CONFIGURE_ARGS+=	--disable-userdir
+CONFIGURE_ARGS+=	--disable-alias
+
 DFLT_APACHE_MODULES=	all
 DFLT_APACHE_MODULES+=	proxy proxy_connect proxy_ftp proxy_http
 DFLT_APACHE_MODULES+=	ssl deflate
+DFLT_APACHE_MODULES+=	access auth include log_config env mime setenvif
+DFLT_APACHE_MODULES+=	status autoindex asis cgi negotiation dir imap
+DFLT_APACHE_MODULES+=	actions userdir alias
 
 # LDAP support
 .if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
@@ -86,6 +107,10 @@ OWN_DIRS= 		${VARBASE}/log/httpd
 OWN_DIRS+=		${VARBASE}/db/httpd
 OWN_DIRS_PERMS+=	${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 FIX_PERMS=		apachectl apxs dbmmanage envvars-std mkcert
+FIX_MAN_PERMS=		man1/htdbm.1 man1/htpasswd.1 man1/htdigest.1
+FIX_MAN_PERMS+=		man1/dbmmanage.1 man8/httpd.8 man8/suexec.8
+FIX_MAN_PERMS+=		man8/rotatelogs.8 man8/logresolve.8 man8/apxs.8
+FIX_MAN_PERMS+=		man8/apachectl.8 man8/ab.8
 
 # Fix paths in the apache manpages.
 SUBST_CLASSES+=		man
@@ -196,4 +221,14 @@ post-install:
 		${CHMOD} ${BINMODE} ${PREFIX}/sbin/$$file; \
 	done
 
+	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/httpd
+	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/include/httpd
+	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/lib/httpd
+	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/test-cgi
+	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/libexec/cgi-bin/printenv
+
+	for file in ${FIX_MAN_PERMS}; do \
+		${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/${PKGMANDIR}/$$file; \
+	done
+
 .include "../../mk/bsd.pkg.mk"