diff options
author | dwcjr <dwcjr@FreeBSD.org> | 2002-01-23 00:01:35 +0800 |
---|---|---|
committer | dwcjr <dwcjr@FreeBSD.org> | 2002-01-23 00:01:35 +0800 |
commit | 67a08803d97edc376992b82cf9f191ff869efe70 (patch) | |
tree | 5ce035bab51002048c278db276e9e5071420352e /www/apache2 | |
parent | a95669073084538a71516568e6fd3232e83b4349 (diff) | |
download | freebsd-ports-gnome-67a08803d97edc376992b82cf9f191ff869efe70.tar.gz freebsd-ports-gnome-67a08803d97edc376992b82cf9f191ff869efe70.tar.zst freebsd-ports-gnome-67a08803d97edc376992b82cf9f191ff869efe70.zip |
Fix problem where installation would overwrite existing config files
Bump PORTREVISION
Submitted by: maintainer
Diffstat (limited to 'www/apache2')
-rw-r--r-- | www/apache2/Makefile | 2 | ||||
-rw-r--r-- | www/apache2/files/patch-Makefile.in | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 847c715eb25d..d7ecd43e8bc3 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 2.0.28 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www ipv6 MASTER_SITES= http://www.apache.org/dist/httpd/ \ http://apache.mirrorcentral.com/dist/httpd/ \ diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in index 4c26f2dcc806..a9d597aaa827 100644 --- a/www/apache2/files/patch-Makefile.in +++ b/www/apache2/files/patch-Makefile.in @@ -1,5 +1,14 @@ --- Makefile.in.orig Mon Oct 22 21:46:29 2001 -+++ Makefile.in Sat Nov 17 01:36:38 2001 ++++ Makefile.in Tue Jan 22 19:02:30 2002 +@@ -32,7 +32,7 @@ + @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir) + @cd $(top_srcdir)/docs/conf; \ + for i in mime.types magic; do \ +- $(INSTALL_DATA) $$i $(sysconfdir); \ ++ test -f $(sysconfdir)/$$i || $(INSTALL_DATA) $$i $(sysconfdir); \ + done; \ + for i in *-std* ssl.conf; do \ + [ -f $$i ] || continue; \ @@ -51,7 +51,7 @@ < $$i; \ for j in $(DSO_MODULES) "^EOL^"; do \ |