diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2007-12-11 20:22:16 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2007-12-11 20:22:16 +0000 |
| commit | 2c8b7a533018888e1f5dd5f9301883d3ba0e3f91 (patch) | |
| tree | b3a82bb931f909fa13f8c65db036b6b9f7f0d6df /www/apache22/files | |
| parent | f87d8a57e32608164ddf1110f02a3d48ab5527c6 (diff) | |
- Fix slave ports [1]
- Fix plist [2]
- Fix CONFLICTS with devel/apr-svn [3]
- Fix install when index.html is modified
- Bump PORT_REVISION
PR: ports/118348 [1], ports/118338 [2],ports/117097 [2]
ports/90088 [3], ports/118349 [3]
Submitted by: Andrey Beresovsky <and at sfedu dot ru> [1],
Dimitry Andric <dimitry at andric dot com> [2],
YAMAMOTO Takao <yamamoto at computec dot co dot jp>
Melvyn Sopacua <melvyn atmelvyn dot homeunix dot org> [3],
Dominic Fandrey <lon_kamikaze at gmx dot de> [3]
Notes
Notes:
svn path=/head/; revision=202992
Diffstat (limited to 'www/apache22/files')
| -rw-r--r-- | www/apache22/files/patch-Makefile.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in index d401ae9b84ec..14bf7f150465 100644 --- a/www/apache22/files/patch-Makefile.in +++ b/www/apache22/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2007-04-24 13:08:01.000000000 +0200 -+++ Makefile.in 2007-09-20 08:47:23.000000000 +0200 +--- Makefile.in.orig 2007-04-24 11:08:01.000000000 +0000 ++++ Makefile.in 2007-12-03 21:15:51.000000000 +0000 @@ -31,9 +31,11 @@ install-conf: @echo Installing configuration files @@ -31,7 +31,7 @@ fi; \ fi; \ done ; \ -@@ -117,48 +119,28 @@ +@@ -117,48 +119,29 @@ doxygen $(top_srcdir)/docs/doxygen.conf install-htdocs: @@ -48,8 +48,9 @@ - cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \ - fi; \ - fi ++ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \ + test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \ -+ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) ++ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true install-error: - -@if [ -d $(DESTDIR)$(errordir) ]; then \ @@ -89,7 +90,7 @@ install-other: @test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir) -@@ -206,12 +188,14 @@ +@@ -206,12 +189,14 @@ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) @cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1 @cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8 |