Always install apache htdocs, instead of checking to preserve any existing

htdocs.  Fixes PR 20153.

2 files changed, 46 insertions, 9 deletions

diff --git a/www/apache2/distinfo b/www/apache2/distinfo
index 3d30fc4e433..0a57d8a4f03 100644
--- a/www/apache2/distinfo
+++ b/www/apache2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2003/01/28 14:21:57 martti Exp $
+$NetBSD: distinfo,v 1.14 2003/02/02 09:59:09 jlam Exp $
 
 SHA1 (httpd-2.0.44.tar.gz) = 606a8a371c753e0bc452dacf7512e3e117818e78
 Size (httpd-2.0.44.tar.gz) = 5505246 bytes
-SHA1 (patch-aa) = 9d74b4ddeab96761f1bb3a7d39a5ab9001e3ea84
+SHA1 (patch-aa) = 368740503e36e158f88bee8df8463f9fd76ae620
 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74
diff --git a/www/apache2/patches/patch-aa b/www/apache2/patches/patch-aa
index 13d59af98ad..3882913addf 100644
--- a/www/apache2/patches/patch-aa
+++ b/www/apache2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/08/29 14:12:29 martti Exp $
+$NetBSD: patch-aa,v 1.8 2003/02/02 09:59:09 jlam Exp $
 
---- Makefile.in.orig	Thu Jul 25 17:47:12 2002
-+++ Makefile.in	Mon Aug 12 15:01:27 2002
-@@ -14,7 +14,7 @@
+--- Makefile.in.orig	Mon Sep 30 08:34:40 2002
++++ Makefile.in
+@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  PHONY_TARGETS   = $(srcdir)/buildmark.c
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2002/08/29 14:12:29 martti Exp $
  	install-other install-cgi install-include install-suexec install-man \
  	install-build
  
-@@ -71,6 +71,7 @@
+@@ -71,6 +71,7 @@ install-conf:
  	    				< $$i; \
  	    		fi \
  	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.7 2002/08/29 14:12:29 martti Exp $
  	    	chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
  	    	file=`echo $$i|sed s/-std//`; \
  	    	if [ "$$file" = "httpd.conf" ]; then \
-@@ -79,12 +80,15 @@
+@@ -79,13 +80,16 @@ install-conf:
  	    	if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
  	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
@@ -31,7 +31,44 @@ $NetBSD: patch-aa,v 1.7 2002/08/29 14:12:29 martti Exp $
 +	    if false; then \
  	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
  	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
-+	    fi ; \
  	    fi ; \
++	    fi ; \
+ 	fi
+ 
+ install-build:
+@@ -106,7 +110,7 @@ dox::
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
+ 
+ install-htdocs:
+-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
++	-@if false; then \
+            echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
+         else \
+ 	    echo Installing HTML documents ; \
+@@ -116,7 +120,7 @@ install-htdocs:
+ 	fi
+ 
+ install-error:
+-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
++	-@if false; then \
+            echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
+         else \
+ 	    echo Installing error documents ; \
+@@ -126,7 +130,7 @@ install-error:
+ 	fi
+ 
+ install-icons:
+-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
++	-@if false; then \
+            echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
+         else \
+ 	    echo Installing icons ; \
+@@ -136,7 +140,7 @@ install-icons:
  	fi
  
+ install-cgi:
+-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
++	-@if false; then \
+ 	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
+ 	else \
+ 	   echo Installing CGIs ; \