diff options
| author | veego <veego> | 2001-10-19 09:52:22 +0000 |
|---|---|---|
| committer | veego <veego> | 2001-10-19 09:52:22 +0000 |
| commit | 5f566adacef90e72498fa443005e153ef16b6462 (patch) | |
| tree | 481afcd23f3403d12a834438cb64ace307477e8d /www/apache | |
| parent | 4a9961bf612cdf1a4fed3eeda0737fd414b78da0 (diff) | |
| download | pkgsrc-5f566adacef90e72498fa443005e153ef16b6462.tar.gz | |
Define a ROOT_GROUP, which defaults to root on SunOS, otherwise to wheel.
Using -o 0 and -g 0 doesn't work with the ucb install on Solaris.
Diffstat (limited to 'www/apache')
| -rw-r--r-- | www/apache/Makefile | 15 | ||||
| -rw-r--r-- | www/apache/distinfo | 4 | ||||
| -rw-r--r-- | www/apache/patches/patch-ai | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/www/apache/Makefile b/www/apache/Makefile index 01ca7de5faf..9188fdd5d04 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2001/10/17 19:17:00 jlam Exp $ +# $NetBSD: Makefile,v 1.79 2001/10/19 09:52:22 veego 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,6 +39,12 @@ 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 @@ -136,6 +142,11 @@ pre-patch: | ${PATCH} ${PATCH_ARGS} ${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 + pre-configure: ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/config.layout > ${WRKDIR}/config.layout @@ -158,6 +169,8 @@ 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 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 c95a821dcac..c02db9097da 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2001/10/17 19:17:00 jlam Exp $ +$NetBSD: distinfo,v 1.8 2001/10/19 09:52:23 veego 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) = a5e66d9e64aa2fe59dc2a2186ae169bcb8e5e071 +SHA1 (patch-ai) = f2fe8fa447ffa240e03ddd9ebe2acb3edf1fd9c1 SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955 diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai index c4a2f26909e..068f4102b64 100644 --- a/www/apache/patches/patch-ai +++ b/www/apache/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.5 2001/06/09 06:36:43 jlam Exp $ +$NetBSD: patch-ai,v 1.6 2001/10/19 09:52:23 veego 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.5 2001/06/09 06:36:43 jlam 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 0 -g 0 $f $CFG_LIBEXECDIR/$t"); ++ push(@cmds, "install -c -m 555 -o root -g @ROOT_GROUP@ $f $CFG_LIBEXECDIR/$t"); } } else { |