- Add share/httpd/htdocs/index.html.lb.utf8 to PLIST.

- Prevent chown whole files under ${PREFIX}/share/httpd.

5 files changed, 71 insertions, 12 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index e1b17c38df1..c361a7381b0 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2002/06/19 15:22:36 tron Exp $
+# $NetBSD: Makefile,v 1.100 2002/06/20 17:12:36 taca 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).
@@ -46,6 +46,7 @@ CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ENV+=		OPTIM="${APACHE_CUSTOM_CFLAGS}"
 CONFIGURE_ENV+=		EAPI_MM="${BUILDLINK_DIR}"
+CONFIGURE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -169,7 +170,6 @@ 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
 
 .include "../../devel/libmm/buildlink.mk"
 .include "../../textproc/expat/buildlink.mk"
diff --git a/www/apache/PLIST b/www/apache/PLIST
index d9531ef8431..b7c37dcfef4 100644
--- a/www/apache/PLIST
+++ b/www/apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/06/19 10:17:59 jdolecek Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/06/20 17:12:37 taca Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
@@ -87,6 +87,7 @@ share/httpd/htdocs/index.html.he.iso8859-8
 share/httpd/htdocs/index.html.it
 share/httpd/htdocs/index.html.ja.jis
 share/httpd/htdocs/index.html.kr.iso-kr
+share/httpd/htdocs/index.html.lb.utf8
 share/httpd/htdocs/index.html.nl
 share/httpd/htdocs/index.html.nn
 share/httpd/htdocs/index.html.no
diff --git a/www/apache/distinfo b/www/apache/distinfo
index c9fc8fdf165..b86af59b9de 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2002/06/19 11:03:59 jdolecek Exp $
+$NetBSD: distinfo,v 1.20 2002/06/20 17:12:37 taca Exp $
 
 SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f
 Size (apache_1.3.26.tar.gz) = 2303147 bytes
@@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (mod_ssl-2.8.9-1.3.26.tar.gz) = 3075124cce758f06b292baa754d55eab639cdfc9
 Size (mod_ssl-2.8.9-1.3.26.tar.gz) = 752613 bytes
-SHA1 (patch-aa) = 9ebfc626364271a60a4db4b1b0c28c92060a9f35
+SHA1 (patch-aa) = d188ab15483eb9e099a9398083413267570b9f9b
 SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd
 SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
@@ -19,3 +19,4 @@ SHA1 (patch-aj) = 1cdd2f010d381ec9c13f59b31caab7d1f6f63100
 SHA1 (patch-ak) = 8f790a692ed9b2dd6943be43fa1cf7629c673955
 SHA1 (patch-al) = a27b9676998621229dc3a1d920ea44b8e622feb2
 SHA1 (patch-am) = d05f7c30b73c0e90daf17d9d1c4838be7fd73b02
+SHA1 (patch-ao) = 5930f9ea0f5080b260a6e0c66a37c6d1ad0df4d4
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
index 77a85fc98e9..7b5809cd53e 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
+$NetBSD: patch-aa,v 1.19 2002/06/20 17:12:37 taca Exp $
 
---- Makefile.tmpl.orig	Fri Feb  1 10:05:43 2002
+--- Makefile.tmpl.orig	Fri Jun 21 02:02:43 2002
 +++ Makefile.tmpl
-@@ -324,11 +324,6 @@
+@@ -100,6 +100,8 @@
+ PERL            = @PERL@
+ TAR		= @TAR@
+ TAROPT		= @TAROPT@
++BINOWN		= @BINOWN@
++BINGRP		= @BINGRP@
+ 
+ #   installation name of Apache webserver
+ TARGET          = @TARGET@
+@@ -324,11 +326,6 @@
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
@@ -14,7 +23,7 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
  	$(MKDIR) $(root)$(htdocsdir)
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
-@@ -387,34 +382,6 @@
+@@ -387,34 +384,6 @@
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -49,7 +58,7 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -533,7 +500,7 @@
+@@ -533,7 +502,7 @@
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -58,7 +67,25 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
  		echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
  	else \
  		echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
-@@ -555,9 +522,10 @@
+@@ -541,6 +510,8 @@
+ 		(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} ; \
+ 	fi
+ 	-@if [ -d $(TOP)/htdocs/manual ]; then \
+ 		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+@@ -548,6 +519,8 @@
+ 		(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} ; \
+ 	fi
+ 	-@if [ -f $(root)$(cgidir)/printenv ]; then \
+ 		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
+@@ -555,23 +528,25 @@
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \
@@ -71,7 +98,15 @@ $NetBSD: patch-aa,v 1.18 2002/02/01 16:04:39 jlam Exp $
  		done; \
  	fi
  	@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
-@@ -571,7 +539,7 @@
+ 	(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
+ 	(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
+ 	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)/.
+ 	@echo "<=== [data]"
+ 
+ #   create the initial configuration by providing default files
  #   and initial config files while preserving existing ones.
  install-config:
  	@echo "===> [config: Installing Apache configuration files]"
diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao
new file mode 100644
index 00000000000..f2ca851a12c
--- /dev/null
+++ b/www/apache/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2002/06/20 17:12:37 taca Exp $
+
+--- configure.orig	Thu Jun 20 20:56:07 2002
++++ configure
+@@ -227,6 +227,8 @@
+     fi
+ fi
+ 
++BINOWN=${BINOWN:-root}
++BINGRP=${BINGRP:-wheel}
+ ##
+ ##  determine default parameters
+ ##
+@@ -1300,6 +1302,8 @@
+ -e "s%@PLATFORM@%$PLATFORM%g" \
+ -e "s%@PERL@%$PERL%g" \
+ -e "s%@TAR@%$TAR%g" \
++-e "s%@BINOWN@%$BINOWN%g" \
++-e "s%@BINGRP@%$BINGRP%g" \
+ -e "s%@TAROPT@%$TAROPT%g" \
+ -e "s%@SRC@%$src%g" \
+ -e "s%@MKF@%$mkf%g" \