diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-06-21 23:47:25 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-06-21 23:47:25 +0000 |
commit | 159c4b801224bec8621be5613c590929f233999b (patch) | |
tree | d0822e4305cfa8b30de65ee705e96dea0123a23e /www/apache22/files/patch-Makefile.in | |
parent | 245c03c769956d1bd4400cbf0dcf93e26b2deb0d (diff) | |
download | ports-159c4b801224bec8621be5613c590929f233999b.tar.gz ports-159c4b801224bec8621be5613c590929f233999b.zip |
- Sync www/apache13's change (.default -> -dist)
- Change default to WITH_BULDLED_EXPAT
- Reorder .if .endif blocks (.if WITH_MPM must appear earlier than .if
WITHOUT_CACHE)
- Some minor style fixes
- Bump PORTREVISION
PR: ports/39635
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=61713
Diffstat (limited to 'www/apache22/files/patch-Makefile.in')
-rw-r--r-- | www/apache22/files/patch-Makefile.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in index 1ce27f5cdf55..78a67b909c46 100644 --- a/www/apache22/files/patch-Makefile.in +++ b/www/apache22/files/patch-Makefile.in @@ -6,8 +6,8 @@ for i in mime.types magic; do \ - $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ + test -f $(DESTDIR)$(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \ -+ cp -f $$i $$i.default; \ -+ $(INSTALL_DATA) $$i.default $(DESTDIR)$(sysconfdir); \ ++ cp -f $$i $$i-dist; \ ++ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(sysconfdir); \ done; \ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ cd $$j ; \ @@ -23,15 +23,15 @@ @echo Installing HTML documents - @test -d $(DESTDIR)$(htdocsdir) || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) - @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) -+ @test -d $(DESTDIR)$(htdocsdir).default || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir).default -+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir).default) -+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir).default $(DESTDIR)$(htdocsdir) ++ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist ++ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist) ++ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir) +.if !defined(NOPORTDOCS) @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) - -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf +.endif -+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir).default && find . -name "CVS" -print | xargs rm -rf ++ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name "CVS" -print | xargs rm -rf install-error: @echo Installing error documents @@ -42,10 +42,10 @@ - @test -d $(DESTDIR)$(cgidir) || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) - @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) - -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf -+ @test -d $(DESTDIR)$(cgidir).default || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir).default -+ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir).default -+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir).default $(DESTDIR)$(cgidir) -+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir).default && find . -name "CVS" -print | xargs rm -rf ++ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist ++ @cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist ++ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir) ++ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name "CVS" -print | xargs rm -rf install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) |