summaryrefslogtreecommitdiff
path: root/www/apache13-fp/files/patch-ab
diff options
context:
space:
mode:
authorClement Laforet <clement@FreeBSD.org>2004-08-20 07:50:11 +0000
committerClement Laforet <clement@FreeBSD.org>2004-08-20 07:50:11 +0000
commit2c81e95b5c0b3f7451b5130a4bc8839aba7d4985 (patch)
tree2747b7ab202a5c9dc635c266493ea29ccb5a1730 /www/apache13-fp/files/patch-ab
parent- Move notif2 from x11-toolkits to x11-themes. (diff)
- Remove www/apache13-fp
Notes
Notes: svn path=/head/; revision=116740
Diffstat (limited to 'www/apache13-fp/files/patch-ab')
-rw-r--r--www/apache13-fp/files/patch-ab162
1 files changed, 0 insertions, 162 deletions
diff --git a/www/apache13-fp/files/patch-ab b/www/apache13-fp/files/patch-ab
deleted file mode 100644
index 838a13835bc4..000000000000
--- a/www/apache13-fp/files/patch-ab
+++ /dev/null
@@ -1,162 +0,0 @@
---- Makefile.tmpl.orig Wed Nov 28 09:02:12 2001
-+++ Makefile.tmpl Tue Feb 12 23:07:11 2002
-@@ -127,6 +127,7 @@
- runtimedir = @runtimedir@
- logfiledir = @logfiledir@
- proxycachedir = @proxycachedir@
-+docsdir = $(prefix)/share/doc/apache
-
- libexecdir_relative = @libexecdir_relative@
-
-@@ -270,10 +271,10 @@
- $(MKDIR) $(root)$(mandir)/man1
- $(MKDIR) $(root)$(mandir)/man8
- $(MKDIR) $(root)$(sysconfdir)
-- $(MKDIR) $(root)$(htdocsdir)
-+ $(MKDIR) $(root)$(docsdir)
- $(MKDIR) $(root)$(manualdir)
- $(MKDIR) $(root)$(iconsdir)
-- $(MKDIR) $(root)$(cgidir)
-+ $(MKDIR) $(root)$(cgidir).default
- $(MKDIR) $(root)$(includedir)
- $(MKDIR) $(root)$(includedir)/xml
- $(MKDIR) $(root)$(runtimedir)
-@@ -329,19 +330,34 @@
- echo "$(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}"; \
- $(INSTALL_DSO) $(TOP)/$(SRC)/$${mod} $(root)$(libexecdir)/$${file}; \
- name=`$(TOP)/$(AUX)/fmn.sh $(TOP)/$(SRC)/$${mod}`; \
-+ if [ ".$$name" = .frontpage_module ]; then \
-+ echo "<IfDefine MOD_FP>" >>$(SRC)/.apaci.install.conf; \
-+ fi; \
- echo dummy | awk '{ printf("LoadModule %-18s %s\n", modname, modpath); }' \
- modname="$${name}" modpath="$(libexecdir_relative)$${file}" >>$(SRC)/.apaci.install.conf; \
-+ if [ ".$$name" = .frontpage_module ]; then \
-+ echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
-+ fi; \
- done; \
- echo "" >>$(SRC)/.apaci.install.conf; \
- echo "# Reconstruction of the complete module list from all available modules" >>$(SRC)/.apaci.install.conf; \
- echo "# (static and shared ones) to achieve correct module execution order." >>$(SRC)/.apaci.install.conf; \
- echo "# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]" >>$(SRC)/.apaci.install.conf; \
- echo "ClearModuleList" >>$(SRC)/.apaci.install.conf; \
-- egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
-- sed -e 's:SharedModule:AddModule:' \
-- -e 's:modules/[^/]*/::' \
-- -e 's:[ ]lib: mod_:' \
-- -e 's:\.[soam].*$$:.c:' >>$(SRC)/.apaci.install.conf; \
-+ for mod in `egrep "^[ ]*(Add|Shared)Module" $(SRC)/Configuration.apaci |\
-+ sed -e 's:[ ]*SharedModule::' \
-+ -e 's:[ ]*AddModule::' \
-+ -e 's:modules/[^/]*/::' \
-+ -e 's:[ ]lib: mod_:' \
-+ -e 's:\.[soam].*$$:.c:'`; do \
-+ if [ ".$$mod" = .mod_frontpage.c ]; then \
-+ echo "<IfDefine MOD_FP>" >>$(SRC)/.apaci.install.conf; \
-+ fi; \
-+ echo "AddModule $$mod" >>$(SRC)/.apaci.install.conf; \
-+ if [ ".$$mod" = .mod_frontpage.c ]; then \
-+ echo "</IfDefine>" >>$(SRC)/.apaci.install.conf; \
-+ fi; \
-+ done; \
- fi
- @echo "<=== [programs]"
-
-@@ -411,6 +427,7 @@
- echo "$(INSTALL_SCRIPT) $(TOP)/$(SRC)/support/apachectl[*] $(root)$(sbindir)/$${apachectl}"; \
- sed -e 's;PIDFILE=.*;PIDFILE=$(runtimedir)/$(TARGET).pid;' \
- -e 's;HTTPD=.*;HTTPD=$(sbindir)/$(TARGET);' \
-+ -e 's;LD_LIBRARY_PATH=.*;LD_LIBRARY_PATH=/usr/lib\:$(prefix)/lib;' \
- < $(TOP)/$(SRC)/support/apachectl > $(TOP)/$(SRC)/.apaci.install.tmp && \
- $(INSTALL_SCRIPT) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sbindir)/$${apachectl}; \
- echo "$(INSTALL_DATA) $(TOP)/$(SRC)/support/apachectl.8 $(root)$(mandir)/man8/$${apachectl}.8"; \
-@@ -459,15 +476,15 @@
- # 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)$(docsdir)/"; \
- (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
-- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
-- find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
-- find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
-- fi
-+ (cd $(root)$(docsdir)/ && $(TAR) -xf -); \
-+ find $(root)$(docsdir)/ -type d -exec chmod a+rx {} \; ; \
-+ find $(root)$(docsdir)/ -type f -print | xargs chmod a+r ; \
-+# fi
- -@if [ -d $(TOP)/htdocs/manual ]; then \
- echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
- (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
-@@ -475,17 +492,17 @@
- find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
- fi
-- -@if [ -f $(root)$(cgidir)/printenv ]; then \
-- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
-- else \
-+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
-+# echo "[PRESERVING EXISTING CGI 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
-+# fi
- @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
- (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
- (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -519,15 +536,17 @@
- -e 's;@@ServerRoot@@/icons;$(iconsdir);' \
- -e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
- -e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
-+ -e 's;@@ServerRoot@@/srm.conf;/dev/null;' \
-+ -e 's;@@ServerRoot@@/access.conf;/dev/null;' \
- -e 's;@@ServerRoot@@;$(prefix);g' \
- -e 's;httpd\.conf;$(TARGET).conf;' \
- -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)/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;conf/magic;$(sysconfdir)/magic;' \
- -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
- -e 's;User nobody;User $(conf_user);' \
-@@ -539,13 +558,14 @@
- > $(TOP)/$(SRC)/.apaci.install.tmp && \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
-- if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
-- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
-- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
-- else \
-- echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
-- fi; \
- done
-+# if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
-+# echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
-+# $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
-+# else \
-+# echo "[PRESERVING EXISTING CONFIG FILE: $(root)$(sysconfdir)/$${target_conf}]"; \
-+# fi; \
-+# done
- -@for conf in mime.types magic; do \
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \