summaryrefslogtreecommitdiff
path: root/www/apache
diff options
context:
space:
mode:
authorsnj <snj@pkgsrc.org>2004-02-28 22:15:30 +0000
committersnj <snj@pkgsrc.org>2004-02-28 22:15:30 +0000
commit2fa06a3ed2051b097092e105e73ad48a825fae7f (patch)
tree9c2bf933d12832cdc1233d704324a7abcac293ae /www/apache
parent82a69c3fd260d48c7f36b4b53aeafbced1976d8a (diff)
downloadpkgsrc-2fa06a3ed2051b097092e105e73ad48a825fae7f.tar.gz
Use ${CHGRP} instead of chgrp. From Georg Schwarz in PR pkg/24594.
Diffstat (limited to 'www/apache')
-rw-r--r--www/apache/distinfo4
-rw-r--r--www/apache/patches/patch-aa13
2 files changed, 10 insertions, 7 deletions
diff --git a/www/apache/distinfo b/www/apache/distinfo
index 0f09ab49844..18c22e87a5f 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2003/11/02 05:36:56 grant Exp $
+$NetBSD: distinfo,v 1.30 2004/02/28 22:15:30 snj Exp $
SHA1 (apache_1.3.29.tar.gz) = 0fb055dfd8c86457996edb36f19fb66f09dccd6a
Size (apache_1.3.29.tar.gz) = 2435809 bytes
@@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
Size (sitedrivenby.gif) = 8519 bytes
SHA1 (mod_ssl-2.8.16-1.3.29.tar.gz) = c098dfffd81a6e5959f414c5c3eec291f58d3e44
Size (mod_ssl-2.8.16-1.3.29.tar.gz) = 754325 bytes
-SHA1 (patch-aa) = 6b6d52025ac8625421f209c42da866557719b282
+SHA1 (patch-aa) = fa3f41ea33fc0088166b067bf68fb807ac53af96
SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index fdf8316b02f..25aaeae7530 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.21 2003/01/20 22:58:26 jschauma Exp $
+$NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
---- Makefile.tmpl.orig Mon Jan 20 17:12:39 2003
-+++ Makefile.tmpl Mon Jan 20 17:15:27 2003
+--- Makefile.tmpl.orig 2004-02-28 14:06:16.000000000 -0800
++++ Makefile.tmpl 2004-02-28 14:06:16.000000000 -0800
@@ -100,6 +100,8 @@
PERL = @PERL@
TAR = @TAR@
@@ -23,15 +23,18 @@ $NetBSD: patch-aa,v 1.21 2003/01/20 22:58:26 jschauma Exp $
$(MKDIR) $(root)$(htdocsdir)
$(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
-@@ -340,7 +337,7 @@
+@@ -340,9 +337,9 @@
$(MKDIR) $(root)$(proxycachedir)
-@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
echo "chown $(conf_user) $(root)$(proxycachedir)"; \
- chown $(conf_user) $(root)$(proxycachedir); \
+ ${CHOWN} $(conf_user) $(root)$(proxycachedir); \
echo "chgrp $(conf_group) $(root)$(proxycachedir)"; \
- chgrp "$(conf_group)" $(root)$(proxycachedir); \
+- chgrp "$(conf_group)" $(root)$(proxycachedir); \
++ ${CHGRP} "$(conf_group)" $(root)$(proxycachedir); \
fi
+ @echo "<=== [mktree]"
+
@@ -387,34 +384,6 @@
file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \