diff options
Diffstat (limited to 'www/apache13+ipv6/files/patch-ab')
| -rw-r--r-- | www/apache13+ipv6/files/patch-ab | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/www/apache13+ipv6/files/patch-ab b/www/apache13+ipv6/files/patch-ab new file mode 100644 index 000000000000..e4448f1e47ca --- /dev/null +++ b/www/apache13+ipv6/files/patch-ab @@ -0,0 +1,84 @@ +--- Makefile.tmpl.orig Tue Jan 11 22:47:41 2000 ++++ Makefile.tmpl Mon Jan 24 19:50:42 2000 +@@ -123,6 +123,7 @@ + runtimedir = @runtimedir@ + logfiledir = @logfiledir@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + + libexecdir_relative = @libexecdir_relative@ + +@@ -266,9 +267,9 @@ + $(MKDIR) $(root)$(mandir)/man1 + $(MKDIR) $(root)$(mandir)/man8 + $(MKDIR) $(root)$(sysconfdir) +- $(MKDIR) $(root)$(htdocsdir) ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(iconsdir) +- $(MKDIR) $(root)$(cgidir) ++ $(MKDIR) $(root)$(cgidir).default + $(MKDIR) $(root)$(includedir) + $(MKDIR) $(root)$(includedir)/xml + $(MKDIR) $(root)$(runtimedir) +@@ -452,25 +453,33 @@ + # icons and distributed CGI scripts. + install-data: + @echo "===> [data: Installing initial data files]" +- -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ +- else \ +- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \ ++# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \ ++# else \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(doc_prefix)/"; \ + (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\ +- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \ +- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \ +- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \ +- fi +- -@if [ -f $(root)$(cgidir)/printenv ]; then \ +- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ +- else \ ++ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ ++ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ ++ find $(root)$(doc_prefix)/ -type f -exec chmod a+r {} \; ; \ ++# fi ++ if [ ! -d $(root)$(htdocsdir) ]; then \ ++ $(LN) -sf $(root)$(doc_prefix) $(root)$(htdocsdir); \ ++ fi ++ $(RM) $(root)$(htdocsdir).default ++ $(LN) -s $(root)$(doc_prefix) $(root)$(htdocsdir).default ++# -@if [ -f $(root)$(cgidir)/printenv ]; then \ ++# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \ ++# else \ + for script in printenv test-cgi; do \ + cat $(TOP)/cgi-bin/$${script} |\ + sed -e 's;^#!/.*perl;#!$(PERL);' \ + > $(TOP)/$(SRC)/.apaci.install.tmp; \ +- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \ +- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \ ++ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir).default/$${script}"; \ ++ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir).default/$${script}; \ + done; \ ++# fi ++ if [ ! -d $(root)$(cgidir) ]; then \ ++ $(LN) -sf $(root)$(cgidir).default $(root)$(cgidir); \ + fi + @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ + (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ +@@ -509,10 +518,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/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)/$${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;User nobody;User $(conf_user);' \ |