diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-22 18:02:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-22 18:02:51 +0000 |
| commit | 8b5f62044cdf2acf4d253a1af63b9d54b66c4247 (patch) | |
| tree | 88a91eba4aca4ef4d3b1c3dfeebd6692086fa482 /www | |
| parent | cf50955cd9fa0b95a0b3f07f33e9130b38117f53 (diff) | |
| download | pkgsrc-8b5f62044cdf2acf4d253a1af63b9d54b66c4247.tar.gz | |
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.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache/Makefile | 18 | ||||
| -rw-r--r-- | www/apache/distinfo | 4 | ||||
| -rw-r--r-- | www/apache/patches/patch-ai | 4 |
3 files changed, 10 insertions, 16 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 97fd06dfbc8..8d9c5fc7572 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2001/10/20 17:46:50 jlam Exp $ +# $NetBSD: Makefile,v 1.81 2001/10/22 18:02:51 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -39,12 +39,6 @@ CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" -ROOT_GROUP?= root -.else -ROOT_GROUP?= wheel -.endif - APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd BUILD_DEFS+= APACHE_SYSCONFDIR @@ -143,9 +137,10 @@ pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f post-patch: - ${SED} -e "s|@ROOT_GROUP@|${ROOT_GROUP}|" < ${WRKSRC}/src/support/apxs.pl > \ - ${WRKSRC}/src/support/apxs.pl.sed - ${MV} ${WRKSRC}/src/support/apxs.pl.sed ${WRKSRC}/src/support/apxs.pl + 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 pre-configure: ${SED} ${FILES_SUBST_SED} \ @@ -169,8 +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 root ${PREFIX}/share/httpd - ${CHGRP} -R ${ROOT_GROUP} ${PREFIX}/share/httpd + ${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/apache/distinfo b/www/apache/distinfo index c02db9097da..a7a8af9beeb 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2001/10/19 09:52:23 veego Exp $ +$NetBSD: distinfo,v 1.9 2001/10/22 18:02:52 jlam Exp $ SHA1 (apache_1.3.22.tar.gz) = 5b93c1f8c8cfb703e6082ffa2cd99ea017e1e05e Size (apache_1.3.22.tar.gz) = 2177983 bytes @@ -14,6 +14,6 @@ SHA1 (patch-ae) = 037e24a3019025f031172af0102f043ddf2f0556 SHA1 (patch-af) = ce65ab33ca9996f58cc9c212c565ef4af00bf066 SHA1 (patch-ag) = 5586719f7fa7b5d670d2735e487943c046533ea6 SHA1 (patch-ah) = 553f8f2bf4bf7278adb46ff8749be154f10e39d3 -SHA1 (patch-ai) = f2fe8fa447ffa240e03ddd9ebe2acb3edf1fd9c1 +SHA1 (patch-ai) = 46d9a97fbc248a2bea97943b9f3b2f9f693f3695 SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai index 068f4102b64..13e41ca6a2a 100644 --- a/www/apache/patches/patch-ai +++ b/www/apache/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.6 2001/10/19 09:52:23 veego Exp $ +$NetBSD: patch-ai,v 1.7 2001/10/22 18:02:53 jlam Exp $ --- src/support/apxs.pl.orig Sat Jun 9 01:06:57 2001 +++ src/support/apxs.pl Sat Jun 9 01:11:28 2001 @@ -8,7 +8,7 @@ $NetBSD: patch-ai,v 1.6 2001/10/19 09:52:23 veego Exp $ 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 @ROOT_GROUP@ $f $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "@INSTALL@ $f $CFG_LIBEXECDIR/$t"); } } else { |