Update apache packages with some common changes:

Give Apache a user and group by default, not only with suexec.
The variables for this have changed from APACHE_SUEXEC_USER and
APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP.
Mention 'Apache' in COMMENT.
Use variables for the version number instead of copying it around.
Bump PKGREVISION.

For apache{,6}:
Change paths to /var/httpd instead of /var/spool/httpd.
Honour STRIPFLAG.
Add --without-confadjust as configure argument.
Enable the 'define' module.

For apache:
Enable proxy module on NOPIC platforms.

Some of these changes are based on pkg/17469 by Greg A. Woods, some on
comments by Johnny Lam.

Reviewed by Johnny Lam.

3 files changed, 42 insertions, 15 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 21d82a2b1c2..245de068136 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2002/06/21 23:22:47 itojun Exp $
+# $NetBSD: Makefile,v 1.54 2002/07/30 18:40:15 wiz Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -7,8 +7,10 @@
 # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
 #
 
-DISTNAME=		apache_1.3.26
-PKGNAME=		apache6-1.3.26
+DISTNAME=		apache_${APACHE_VERSION}
+PKGNAME=		apache6-${APACHE_VERSION}
+APACHE_VERSION=		1.3.26
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
@@ -23,9 +25,9 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		itojun@netbsd.org
 HOMEPAGE=		http://httpd.apache.org/
-COMMENT=		HTTP (Web) server with IPv6 support
+COMMENT=		Apache HTTP (Web) server with IPv6 support
 
-CONFLICTS=		apache-[0-9]* apache-*modssl-[0-9]* apache6-[0-9]*
+CONFLICTS=		apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif:N*.diff.gz}
 USE_BUILDLINK_ONLY=	YES
@@ -38,6 +40,7 @@ CONFIGURE_ARGS+=	--enable-module=most \
 			--enable-rule=INET6
 # proxy module is broken with the IPv6 patch
 CONFIGURE_ARGS+=	--disable-module=proxy
+CONFIGURE_ARGS+=	--without-confadjust
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
@@ -50,20 +53,30 @@ BUILD_DEFS+=		USE_INET6
 IGNORE=			"IPv6 only build"
 .endif
 
+.if empty(STRIPFLAG)
+CONFIGURE_ARGS+=	--without-execstrip
+.endif
+
 PKG_SYSCONFSUBDIR?=	httpd
 
+APACHE_USER?=		www
+APACHE_GROUP?=		www
+BUILD_DEFS+=		APACHE_USER
+BUILD_DEFS+=		APACHE_GROUP
+
+CONFIGURE_ARGS+=	--server-uid=${APACHE_USER}
+CONFIGURE_ARGS+=	--server-gid=${APACHE_GROUP}
+
 .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
-APACHE_SUEXEC_USER?=	www
 APACHE_SUEXEC_DOCROOT?=	${PREFIX}/share/httpd/htdocs
 APACHE_SUEXEC_PATH=	/bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
 APACHE_SUEXEC_CONFIGURE_ARGS+=						\
-			--suexec-caller=${APACHE_SUEXEC_USER}		\
+			--suexec-caller=${APACHE_USER}			\
 			--suexec-safepath='${APACHE_SUEXEC_PATH}'	\
 			--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
 CONFIGURE_ARGS+=	--enable-suexec 				\
 			${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
 PLIST_SRC=		${PKGDIR}/PLIST.suexec
-PKG_USERS=		${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user
 BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
 .endif
 
@@ -73,6 +86,12 @@ BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+.if defined(NOPIC)
+PLIST_SUBST+=		SHLIBS="@comment "
+.else
+PLIST_SUBST+=		SHLIBS=""
+.endif
+
 APACHE_CUSTOM_CFLAGS?=	# empty
 
 .if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
@@ -101,6 +120,9 @@ BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
 BUILD_DEFS+=		APACHE_PERF_TUNING
 BUILD_DEFS+=		APACHE_SUEXEC
 
+PKG_GROUPS=		${APACHE_GROUP}
+PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
+
 EGDIR=		${PREFIX}/share/examples/httpd
 
 CONF_FILES=	${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
@@ -108,8 +130,9 @@ SUPPORT_FILES=	${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
 SUPPORT_FILES+=	${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
 RCD_SCRIPTS=	apache
 
-OWN_DIRS=		/var/log/httpd
-OWN_DIRS+=		/var/spool/httpd
+OWN_DIRS+=		${PREFIX}/lib/httpd
+OWN_DIRS+=		/var/httpd
+OWN_DIRS+=		/var/log/httpd
 
 pre-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
diff --git a/www/apache6/PLIST b/www/apache6/PLIST
index 96bc879b12d..8dc35c896d9 100644
--- a/www/apache6/PLIST
+++ b/www/apache6/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/20 07:24:17 itojun Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/30 18:40:15 wiz Exp $
+bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -50,6 +51,7 @@ include/httpd/xml/xmlparse.h
 include/httpd/xml/xmlrole.h
 include/httpd/xml/xmltok.h
 include/httpd/xml/xmltok_impl.h
+${SHLIBS}lib/httpd/httpd.exp
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
 man/man1/dbmmanage.1
@@ -604,7 +606,9 @@ share/httpd/icons/world2.png
 @dirrm share/httpd/htdocs/manual/images
 @dirrm share/httpd/htdocs/manual/howto
 @dirrm share/httpd/htdocs/manual
+@unexec ${RMDIR} %D/share/httpd/htdocs 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/httpd 2>/dev/null || ${TRUE}
 @dirrm share/examples/httpd
+@unexec ${RMDIR} %D/lib/httpd 2>/dev/null || ${TRUE}
 @dirrm include/httpd/xml
 @dirrm include/httpd
-
diff --git a/www/apache6/files/config.layout b/www/apache6/files/config.layout
index 620a76245b0..7f6ab362761 100644
--- a/www/apache6/files/config.layout
+++ b/www/apache6/files/config.layout
@@ -1,4 +1,4 @@
-# $NetBSD: config.layout,v 1.3 2001/11/26 07:34:07 jlam Exp $
+# $NetBSD: config.layout,v 1.4 2002/07/30 18:40:15 wiz Exp $
 
 <Layout pkgsrc>
 prefix: @PREFIX@
@@ -14,8 +14,8 @@ htdocsdir: ${prefix}/share/httpd/htdocs
 manualdir: ${prefix}/share/httpd/htdocs/manual
 cgidir: ${exec_prefix}/libexec/cgi-bin
 includedir: ${prefix}/include/httpd
-localstatedir: /var/run
+localstatedir: /var/httpd
 runtimedir: /var/run
 logfiledir: /var/log/httpd
-proxycachedir: /var/spool/httpd/proxy
+proxycachedir: /var/httpd/proxy
 </Layout>