Make this use ${CHOWN}, ${CHMOD}, ${XARGS} and ${FIND}, rather than the

hard-coded commands, which may not be in the PATH depending on the operating
system.  This partly addresses PR pkg/19804.

3 files changed, 61 insertions, 20 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 5dc117fdaaa..0483168f514 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2002/12/22 13:04:39 grant Exp $
+# $NetBSD: Makefile,v 1.118 2003/01/20 22:58:26 jschauma 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).
@@ -154,6 +154,9 @@ OWN_DIRS_PERMS+=	/var/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 PKG_GROUPS=		${APACHE_GROUP}
 PKG_USERS=		${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
 
+MAKE_ENV+=		CHMOD=${CHMOD} CHOWN=${CHOWN} XARGS=${XARGS}
+MAKE_ENV+=		FIND=${FIND}
+
 post-extract:
 	${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
 	${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
diff --git a/www/apache/distinfo b/www/apache/distinfo
index d79d9f6879c..a220cd27425 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2002/10/25 09:00:29 tron Exp $
+$NetBSD: distinfo,v 1.25 2003/01/20 22:58:26 jschauma Exp $
 
 SHA1 (apache_1.3.27.tar.gz) = 2e3a2c8acd546d84f0c4a42de2b1f69dca6828f8
 Size (apache_1.3.27.tar.gz) = 2306052 bytes
@@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (mod_ssl-2.8.12-1.3.27.tar.gz) = 76842c9cb12442d845bfb8e6920da28809da74bd
 Size (mod_ssl-2.8.12-1.3.27.tar.gz) = 753529 bytes
-SHA1 (patch-aa) = d188ab15483eb9e099a9398083413267570b9f9b
+SHA1 (patch-aa) = 6b6d52025ac8625421f209c42da866557719b282
 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 ea099ea49b5..fdf8316b02f 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
+$NetBSD: patch-aa,v 1.21 2003/01/20 22:58:26 jschauma Exp $
 
---- Makefile.tmpl.orig	Fri Jun 21 02:02:43 2002
-+++ Makefile.tmpl
+--- Makefile.tmpl.orig	Mon Jan 20 17:12:39 2003
++++ Makefile.tmpl	Mon Jan 20 17:15:27 2003
 @@ -100,6 +100,8 @@
  PERL            = @PERL@
  TAR		= @TAR@
@@ -23,6 +23,15 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  	$(MKDIR) $(root)$(htdocsdir)
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
+@@ -340,7 +337,7 @@
+ 	$(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); \
+ 	fi
 @@ -387,34 +384,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
@@ -58,7 +67,31 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -533,7 +502,7 @@
+@@ -464,9 +433,9 @@
+ 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
+ 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
+ 	    echo "chown root $(root)$(sbindir)/suexec"; \
+-	    chown root $(root)$(sbindir)/suexec; \
++	    ${CHOWN} root $(root)$(sbindir)/suexec; \
+ 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
+-	    chmod 4711 $(root)$(sbindir)/suexec; \
++	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
+ 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
+ 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
+ 	fi
+@@ -508,9 +477,9 @@
+ 	    echo "$(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec"; \
+ 	    $(INSTALL_PROGRAM) $(TOP)/$(SRC)/support/suexec $(root)$(sbindir)/suexec; \
+ 	    echo "chown root $(root)$(sbindir)/suexec"; \
+-	    chown root $(root)$(sbindir)/suexec; \
++	    ${CHOWN} root $(root)$(sbindir)/suexec; \
+ 	    echo "chmod 4711 $(root)$(sbindir)/suexec"; \
+-	    chmod 4711 $(root)$(sbindir)/suexec; \
++	    ${CHMOD} 4711 $(root)$(sbindir)/suexec; \
+ 	    echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8"; \
+ 	    $(INSTALL_DATA) $(TOP)/$(SRC)/support/suexec.8 $(root)$(mandir)/man8/suexec.8; \
+ 	fi
+@@ -533,21 +502,25 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -67,21 +100,25 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -541,6 +510,8 @@
+ 		(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
  		(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
- 		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-+		find $(root)$(htdocsdir)/ -print | \
-+			xargs chown ${BINOWN}:${BINGRP} ; \
+-		find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
++		${FIND} $(root)$(htdocsdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
++		${FIND} $(root)$(htdocsdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
++		${FIND} $(root)$(htdocsdir)/ -print | \
++			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
  	fi
  	-@if [ -d $(TOP)/htdocs/manual ]; then \
  		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
-@@ -548,6 +519,8 @@
+ 		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
  		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
- 		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- 		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
-+		find $(root)$(manualdir)/ -print | \
-+			xargs chown ${BINOWN}:${BINGRP} ; \
+-		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
++		${FIND} $(root)$(manualdir)/ -type d -exec ${CHMOD} a+rx {} \; ; \
++		${FIND} $(root)$(manualdir)/ -type f -print | ${XARGS} ${CHMOD} a+r ; \
++		${FIND} $(root)$(manualdir)/ -print | \
++			${XARGS} ${CHOWN} ${BINOWN}:${BINGRP} ; \
  	fi
  	-@if [ -f $(root)$(cgidir)/printenv ]; then \
  		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
@@ -100,10 +137,11 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:40:19 jlam Exp $
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
  	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
  	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
- 	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
+-	find $(root)$(iconsdir)/ -type d -exec chmod a+rx {} \; ;\
 -	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \;
-+	find $(root)$(iconsdir)/ -type f -exec chmod a+r {} \; ;\
-+	chown -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
++	${FIND} $(root)$(iconsdir)/ -type d -exec ${CHMOD} a+rx {} \; ;\
++	${FIND} $(root)$(iconsdir)/ -type f -exec ${CHMOD} a+r {} \; ;\
++	${CHOWN} -R ${BINOWN}:${BINGRP} $(root)$(iconsdir)/.
  	@echo "<=== [data]"
  
  #   create the initial configuration by providing default files