diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-17 03:20:57 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-10-17 03:20:57 +0000 |
| commit | 6b9dcd719428bfa5636e426d401230fe719c458c (patch) | |
| tree | adac9c30fbd3bd264a97b94d25e9ba0ebec069a3 /www/apache13/files | |
| parent | 91fc81717691a68f485218a9507bc4be8a825272 (diff) | |
| download | ports-6b9dcd719428bfa5636e426d401230fe719c458c.tar.gz ports-6b9dcd719428bfa5636e426d401230fe719c458c.zip | |
Notes
Diffstat (limited to 'www/apache13/files')
| -rw-r--r-- | www/apache13/files/FreeBSD.layout | 2 | ||||
| -rw-r--r-- | www/apache13/files/patch-ab | 38 |
2 files changed, 16 insertions, 24 deletions
diff --git a/www/apache13/files/FreeBSD.layout b/www/apache13/files/FreeBSD.layout index 29ec00a18559..b73ee2ae1484 100644 --- a/www/apache13/files/FreeBSD.layout +++ b/www/apache13/files/FreeBSD.layout @@ -10,7 +10,7 @@ datadir: $prefix/www iconsdir: $datadir/icons htdocsdir: $datadir/data - manualdir: $prefix/share/doc/apache/manual + manualdir: $prefix/share/doc/apache cgidir: $datadir/cgi-bin includedir: $prefix/include/apache localstatedir: /var diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index 8615b1e3f9e0..094541ae3f37 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,27 +1,21 @@ --- Makefile.tmpl.orig Sun Oct 7 02:01:09 2001 -+++ Makefile.tmpl Sun Oct 14 11:14:32 2001 -@@ -127,6 +127,7 @@ - runtimedir = @runtimedir@ - logfiledir = @logfiledir@ - proxycachedir = @proxycachedir@ -+doc_prefix = $(prefix)/share/doc/apache - - libexecdir_relative = @libexecdir_relative@ - -@@ -270,10 +271,10 @@ ++++ Makefile.tmpl Wed Oct 17 06:50:16 2001 +@@ -270,10 +270,12 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) -+ $(MKDIR) $(root)$(doc_prefix) ++ $(RM) -rf $(root)$(htdocsdir).default ++ $(MKDIR) $(root)$(htdocsdir).default $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) ++ $(RM) -rf $(root)$(cgidir).default + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -457,33 +458,41 @@ +@@ -457,33 +459,40 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -32,16 +26,16 @@ +# -@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)/"; \ ++ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir).default/"; \ (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 - -@if [ -d $(TOP)/htdocs/manual ]; then \ -+ (cd $(root)$(doc_prefix)/ && $(TAR) -xf -); \ -+ find $(root)$(doc_prefix)/ -type d -exec chmod a+rx {} \; ; \ -+ find $(root)$(doc_prefix)/ -type f -print | xargs chmod a+r ; \ ++ (cd $(root)$(htdocsdir).default/ && $(TAR) -xf -); \ ++ find $(root)$(htdocsdir).default/ -type d -exec chmod a+rx {} \; ; \ ++ find $(root)$(htdocsdir).default/ -type f -print | xargs chmod a+r ; \ +# fi +# -@if [ -d $(TOP)/htdocs/manual ]; then \ echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \ @@ -49,16 +43,14 @@ (cd $(root)$(manualdir)/ && $(TAR) -xf -); \ find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \ -- fi ++# fi ++ $(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual ++ if [ ! -d $(root)$(htdocsdir) ]; then \ ++ $(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \ + fi - -@if [ -f $(root)$(cgidir)/printenv ]; then \ - echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \ - else \ -+# 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 CGI SUBDIR: $(root)$(cgidir)/]"; \ +# else \ |