aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2002-01-22 16:01:35 +0000
committerDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2002-01-22 16:01:35 +0000
commitcb24f9843025380ae61ed4d6e57f23881eee3ee7 (patch)
tree6009e57e510bd845ed2c2c6aea7a4f10341c96c3
parent305840f7d28081037dac44161058d49e2fd2e6cc (diff)
downloadports-cb24f9843025380ae61ed4d6e57f23881eee3ee7.tar.gz
ports-cb24f9843025380ae61ed4d6e57f23881eee3ee7.zip
Fix problem where installation would overwrite existing config files
Bump PORTREVISION Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=53580
-rw-r--r--www/apache2/Makefile2
-rw-r--r--www/apache2/files/patch-Makefile.in11
-rw-r--r--www/apache20/Makefile2
-rw-r--r--www/apache20/files/patch-Makefile.in11
-rw-r--r--www/apache21/Makefile2
-rw-r--r--www/apache21/files/patch-Makefile.in11
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/files/patch-Makefile.in11
8 files changed, 44 insertions, 8 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 \
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 847c715eb25d..d7ecd43e8bc3 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/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/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index 4c26f2dcc806..a9d597aaa827 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/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 \
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 847c715eb25d..d7ecd43e8bc3 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/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/apache21/files/patch-Makefile.in b/www/apache21/files/patch-Makefile.in
index 4c26f2dcc806..a9d597aaa827 100644
--- a/www/apache21/files/patch-Makefile.in
+++ b/www/apache21/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 \
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 847c715eb25d..d7ecd43e8bc3 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/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/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 4c26f2dcc806..a9d597aaa827 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/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 \