diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1999-09-03 16:07:53 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1999-09-03 16:07:53 +0000 |
| commit | 58f0cad97ae85335cb94cb37174f2f2e41db7935 (patch) | |
| tree | 20bad9c1e0956523be08cf849e888f82edfd3e3d /www/apache2/files/patch-ab | |
| parent | New Free BDF fonts collection for Korean. (diff) | |
upgrade to 1.3.9
Notes
Notes:
svn path=/head/; revision=21215
Diffstat (limited to 'www/apache2/files/patch-ab')
| -rw-r--r-- | www/apache2/files/patch-ab | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/www/apache2/files/patch-ab b/www/apache2/files/patch-ab index 8e8b8a45919c..935f243b62b2 100644 --- a/www/apache2/files/patch-ab +++ b/www/apache2/files/patch-ab @@ -1,14 +1,6 @@ ---- Makefile.tmpl.orig Tue Mar 16 03:38:46 1999 -+++ Makefile.tmpl Thu Mar 25 23:53:46 1999 -@@ -113,13 +113,14 @@ - sysconfdir = @sysconfdir@ - datadir = @datadir@ - iconsdir = $(datadir)/icons --htdocsdir = $(datadir)/htdocs -+htdocsdir = $(datadir)/data - cgidir = $(datadir)/cgi-bin - includedir = @includedir@ - localstatedir = @localstatedir@ +--- Makefile.tmpl.orig Fri Aug 13 10:58:18 1999 ++++ Makefile.tmpl Fri Sep 3 14:57:01 1999 +@@ -120,6 +120,7 @@ runtimedir = @runtimedir@ logfiledir = @logfiledir@ proxycachedir = @proxycachedir@ @@ -16,7 +8,7 @@ libexecdir_relative = @libexecdir_relative@ -@@ -249,9 +250,9 @@ +@@ -255,9 +256,9 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) @@ -26,9 +18,9 @@ - $(MKDIR) $(root)$(cgidir) + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) - $(MKDIR) $(root)$(logfiledir) -@@ -379,26 +380,34 @@ +@@ -441,26 +442,34 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -76,18 +68,18 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -436,10 +445,10 @@ - -e 's;logs/accept.lock;$(runtimedir)/$(TARGET).lock;' \ +@@ -498,10 +507,10 @@ + -e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \ -e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \ - -e 's;logs/httpd.pid;$(runtimedir)/$(TARGET).pid;' \ + -e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \ - -e "s;logs/access_log;$(logfiledir)/$${target_prefix}access_log;" \ - -e "s;logs/error_log;$(logfiledir)/$${target_prefix}error_log;" \ - -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ - -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -+ -e 's;logs/access_log;$(logfiledir)/httpd-access.log;' \ -+ -e 's;logs/error_log;$(logfiledir)/httpd-error.log;' \ -+ -e 's;logs/referer_log;$(logfiledir)/httpd-referer.log;' \ -+ -e 's;logs/agent_log;$(logfiledir)/httpd-agent.log;' \ ++ -e "s;logs/access_log;$(logfiledir)/$${target_prefix}httpd-access.log;" \ ++ -e "s;logs/error_log;$(logfiledir)/$${target_prefix}httpd-error.log;" \ ++ -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}httpd-referer.log;" \ ++ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}httpd-agent.log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ - -e 's;conf/mime.types;$(sysconfdir)/mime.types;' \ - -e 's;Group #-1;Group $(conf_group);' \ + -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ + -e 's;User nobody;User $(conf_user);' \ |