Minimize the diffs between the apache and apache6 packages:

- Whitespace changes to Makefile
- From the commit log for apache/Makefile:

Don't do the dance with ROOT_GROUP.  Apache extension modules installed by
apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}",
which should do the right thing regardless of the platform.  ${INSTALL} is
replaced with the full path to the install program used by pkgsrc, which
should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris.

This should fix pkg/14232 by Pierre Bourgin.

3 files changed, 21 insertions, 14 deletions

diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 1cab62a6969..8afb89fc35e 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/10/20 17:46:50 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2001/10/22 18:10:28 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -61,6 +61,10 @@ PLIST_SRC=		${PKGDIR}/PLIST.suexec
 BUILD_DEFS+=		APACHE_USER APACHE_SUEXEC_DOCROOT
 .endif
 
+# Note that there is NO static compile module hook here.  This is intentional.
+# Under Apache 1.3, modules can be compiled to link dynamically to the server
+# using the "apxs" program.  See apxs(8).
+
 .if !defined(NOPIC)
 CONFIGURE_ARGS+=	--enable-module=so	# requires dlopen()
 CONFIGURE_ARGS+=	--enable-shared=proxy
@@ -117,14 +121,15 @@ FILES_SUBST+=		RMDIR=${RMDIR:Q}
 FILES_SUBST+=		TRUE=${TRUE:Q}
 FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
 
-# Note that there is NO static compile module hook here.  This is intentional.
-# Under Apache 1.3, modules can be compiled to link dynamically to the server
-# using the "apxs" program.  See apxs(8).
-
 pre-patch:
 	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 post-patch:
+	cd ${WRKSRC}/src/support;					\
+	${SED}	-e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
+		apxs.pl > apxs.pl.sed;					\
+	${MV} apxs.pl.sed apxs.pl
+
 	for file in ${IPV6_PATCH}; do					\
 		${GZCAT} ${_DISTDIR}/$${file} |				\
 		    ${PATCH} ${PATCH_DIST_ARGS}				\
@@ -132,8 +137,10 @@ post-patch:
 	done
 	${CHMOD} +x ${CONFIGURE_SCRIPT}
 	cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
-	${SED} -e 's/#Listen ::/Listen ::/' -e 's/#Listen 0.0.0.0/Listen 0.0.0.0/' \
-	    <${WRKSRC}/conf/httpd.conf-dist- >${WRKSRC}/conf/httpd.conf-dist
+	${SED}	-e "s|#Listen ::|Listen ::|"				\
+		-e "s|#Listen 0.0.0.0|Listen 0.0.0.0|"			\
+		${WRKSRC}/conf/httpd.conf-dist-				\
+		> ${WRKSRC}/conf/httpd.conf-dist
 
 pre-configure:
 	${SED} ${FILES_SUBST_SED}					\
@@ -157,6 +164,7 @@ post-install:
 	done
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
+	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../textproc/expat/buildlink.mk"
diff --git a/www/apache6/distinfo b/www/apache6/distinfo
index e12df69dee7..6e821718f5b 100644
--- a/www/apache6/distinfo
+++ b/www/apache6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/10/17 07:47:53 martti Exp $
+$NetBSD: distinfo,v 1.8 2001/10/22 18:10:28 jlam Exp $
 
 SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e
 Size (apache_1.3.22.tar.gz) = 2177983 bytes
@@ -12,6 +12,5 @@ SHA1 (patch-ac) = d4dd4f5521a7c713a038dec2606dad14356d746f
 SHA1 (patch-ae) = 2e4e7aab1cff7ddc82697946eeb8d13cd3aa1df0
 SHA1 (patch-af) = 8115ea5b59fc86e7354effd25dc22525e7627802
 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3
-SHA1 (patch-ai) = 51d71dfd6706eda420293f2a9f81d8982f789753
-SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
+SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
diff --git a/www/apache6/patches/patch-ai b/www/apache6/patches/patch-ai
index 21f5234b16e..96acd7c90ae 100644
--- a/www/apache6/patches/patch-ai
+++ b/www/apache6/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.2 2001/10/08 13:23:38 martti Exp $
+$NetBSD: patch-ai,v 1.3 2001/10/22 18:10:29 jlam Exp $
 
---- src/support/apxs.pl.orig	Fri May  4 08:22:17 2001
-+++ src/support/apxs.pl	Mon Oct  8 14:35:47 2001
+--- src/support/apxs.pl.orig	Sat Jun  9 01:06:57 2001
++++ src/support/apxs.pl	Sat Jun  9 01:11:28 2001
 @@ -459,8 +459,7 @@
          if ($^O ne "MSWin32") {
              $t =~ s|^.+/([^/]+)$|$1|;
              if ($opt_i) {
 -                push(@cmds, "cp $f $CFG_LIBEXECDIR/$t");
 -                push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-+                push(@cmds, "install -c -m 555 -o root -g wheel $f $CFG_LIBEXECDIR/$t");
++                push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t");
              }
          }
  	else {