Regenerate patch-aa to obtain correct offsets so this works with Linux 'patch'.

No functional change (other than building again on Linux)

2 files changed, 13 insertions, 13 deletions

diff --git a/www/apache/distinfo b/www/apache/distinfo
index f8ba4d9eefc..726805c820c 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2004/05/13 11:39:09 taca Exp $
+$NetBSD: distinfo,v 1.34 2004/05/13 21:21:27 abs Exp $
 
 SHA1 (apache_1.3.31.tar.gz) = a5d4298e8f99cae220ba65b5ef128d5742c7298d
 Size (apache_1.3.31.tar.gz) = 2467371 bytes
@@ -6,7 +6,7 @@ SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (mod_ssl-2.8.17-1.3.31.tar.gz) = 942ca41a95f1e671ecabf90a8704b85de42d5d42
 Size (mod_ssl-2.8.17-1.3.31.tar.gz) = 754472 bytes
-SHA1 (patch-aa) = fa3f41ea33fc0088166b067bf68fb807ac53af96
+SHA1 (patch-aa) = 3a655678f5e99769f27fca06a8279b14a8e8e8be
 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 25aaeae7530..8c22c8af907 100644
--- a/www/apache/patches/patch-aa
+++ b/www/apache/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
+$NetBSD: patch-aa,v 1.23 2004/05/13 21:21:27 abs Exp $
 
---- 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 @@
+--- Makefile.tmpl.orig	2004-05-13 22:18:11.000000000 +0100
++++ Makefile.tmpl
+@@ -56,6 +56,8 @@ INSTALL_DATA    = $(INSTALL) $(IFLAGS_DA
  PERL            = @PERL@
  TAR		= @TAR@
  TAROPT		= @TAROPT@
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  
  #   installation name of Apache webserver
  TARGET          = @TARGET@
-@@ -324,11 +326,6 @@
+@@ -280,11 +282,6 @@ install-mktree:
  	$(MKDIR) $(root)$(mandir)/man1
  	$(MKDIR) $(root)$(mandir)/man8
  	$(MKDIR) $(root)$(sysconfdir)
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  	$(MKDIR) $(root)$(htdocsdir)
  	$(MKDIR) $(root)$(manualdir)
  	$(MKDIR) $(root)$(iconsdir)
-@@ -340,9 +337,9 @@
+@@ -296,9 +293,9 @@ install-mktree:
  	$(MKDIR) $(root)$(proxycachedir)
  	-@if [ "x`$(AUX)/getuid.sh`" = "x0" ]; then \
  		echo "chown $(conf_user) $(root)$(proxycachedir)"; \
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  	fi
  	@echo "<=== [mktree]"
  
-@@ -387,34 +384,6 @@
+@@ -343,34 +340,6 @@ install-programs:
  			file=`echo $${mod} | sed -e 's;^.*/\([^/]*\);\1;'`; \
  			echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
  			$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
@@ -70,7 +70,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  		done; \
  	fi
  	@echo "<=== [programs]"
-@@ -464,9 +433,9 @@
+@@ -420,9 +389,9 @@ install-support:
  	    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"; \
@@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  	    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 @@
+@@ -464,9 +433,9 @@ install-binsupport:
  	    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"; \
@@ -94,7 +94,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  	    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 @@
+@@ -489,21 +458,25 @@ install-include:
  #   icons and distributed CGI scripts.
  install-data:
  	@echo "===> [data: Installing initial data files]"
@@ -125,7 +125,7 @@ $NetBSD: patch-aa,v 1.22 2004/02/28 22:15:30 snj Exp $
  	fi
  	-@if [ -f $(root)$(cgidir)/printenv ]; then \
  		echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-@@ -555,23 +528,25 @@
+@@ -511,23 +484,25 @@ install-data:
  		for script in printenv test-cgi; do \
  			cat $(TOP)/cgi-bin/$${script} |\
  			sed -e 's;^#!/.*perl;#!$(PERL);' \