diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2000-11-15 16:10:38 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2000-11-15 16:10:38 +0000 |
| commit | 7102926a312e7d8f1dd4018bc1d54bf7aac7410e (patch) | |
| tree | 221bb0cadfb9c0c42fb670bedb3b5ffa95d321bb /www/apache13-modssl/files/patch-ai | |
| parent | Update to version 0.4.4 (diff) | |
Gently persuade apache13-modssl to install in the same filesystem
space as www/apache13 does, so that other apache-dependendent ports
DTRT regardless of which one is installed.
Nothing concrete (other than we're working on a real cleanup of the
apache ports) has been heard from any of the maintainers. Obviously
that is the best solution, but with 4.2-RELEASE just around the
corner, we have an opportunity here to at least remove a few bogons.
Both times I've raised this issue on -ports, however, there has been
significant interest in the patches, and now plenty of confirmations
that the modifications do not break the port in other ways.
Notes
Notes:
svn path=/head/; revision=35170
Diffstat (limited to 'www/apache13-modssl/files/patch-ai')
| -rw-r--r-- | www/apache13-modssl/files/patch-ai | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/www/apache13-modssl/files/patch-ai b/www/apache13-modssl/files/patch-ai new file mode 100644 index 000000000000..11517ba25548 --- /dev/null +++ b/www/apache13-modssl/files/patch-ai @@ -0,0 +1,65 @@ +--- Makefile.tmpl.orig Thu Oct 19 11:30:46 2000 ++++ Makefile.tmpl Thu Oct 19 11:43:48 2000 +@@ -125,2 +125,3 @@ + proxycachedir = @proxycachedir@ ++doc_prefix = $(prefix)/share/doc/apache + +@@ -327,5 +328,5 @@ + $(MKDIR) $(root)$(sysconfdir)/ssl.prm +- $(MKDIR) $(root)$(htdocsdir) ++ $(MKDIR) $(root)$(doc_prefix) + $(MKDIR) $(root)$(iconsdir) +- $(MKDIR) $(root)$(cgidir) ++ $(MKDIR) $(root)$(cgidir).default + $(MKDIR) $(root)$(includedir) +@@ -528,14 +529,18 @@ + @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 \ ++# -@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)/"; \ + (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 ++ $(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 \ +@@ -544,5 +549,8 @@ + > $(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 +@@ -594,6 +602,6 @@ + -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;' \ |