diff options
author | Clement Laforet <clement@FreeBSD.org> | 2005-02-11 20:43:04 +0000 |
---|---|---|
committer | Clement Laforet <clement@FreeBSD.org> | 2005-02-11 20:43:04 +0000 |
commit | d2f4ba1b1e24e931a789192ff92e21678bfc6df8 (patch) | |
tree | 37cead469cb82e949f32d9187e229ba3450e71ec | |
parent | 28c6384f4ef0d51d10179d663b02e904d926426a (diff) | |
download | ports-d2f4ba1b1e24e931a789192ff92e21678bfc6df8.tar.gz ports-d2f4ba1b1e24e931a789192ff92e21678bfc6df8.zip |
- don't create httpd.conf.bak
- remove httpd.conf.bak if exists
Approved by: portmgr (krion, kris)
Notes
Notes:
svn path=/head/; revision=128539
-rw-r--r-- | russian/apache13-modssl/files/patch-aj | 15 | ||||
-rw-r--r-- | russian/apache13-modssl/pkg-plist | 1 | ||||
-rw-r--r-- | russian/apache13/files/patch-aj | 15 | ||||
-rw-r--r-- | russian/apache13/pkg-plist | 1 | ||||
-rw-r--r-- | www/apache13+ipv6/files/patch-aj | 15 | ||||
-rw-r--r-- | www/apache13+ipv6/pkg-plist | 3 | ||||
-rw-r--r-- | www/apache13/files/patch-aj | 15 | ||||
-rw-r--r-- | www/apache13/pkg-plist | 1 |
8 files changed, 65 insertions, 1 deletions
diff --git a/russian/apache13-modssl/files/patch-aj b/russian/apache13-modssl/files/patch-aj new file mode 100644 index 000000000000..9c1596e0cb70 --- /dev/null +++ b/russian/apache13-modssl/files/patch-aj @@ -0,0 +1,15 @@ +--- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 ++++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 +@@ -604,12 +604,10 @@ + print FP $content; + close(FP); + if ($^O ne "MSWin32") { +- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); + push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); + push(@cmds, "rm $cfgbase.conf.new"); + } else { + $cfgbase =~ s|/|\\|g; +- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); + push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); + push(@cmds, "del \"$cfgbase.conf.new\""); + } diff --git a/russian/apache13-modssl/pkg-plist b/russian/apache13-modssl/pkg-plist index 12c238c9f984..33a80a8f5275 100644 --- a/russian/apache13-modssl/pkg-plist +++ b/russian/apache13-modssl/pkg-plist @@ -902,6 +902,7 @@ www/icons/world2.png @dirrm etc/apache/tables/ukrainian @dirrm etc/apache/tables/ukrainian2 @dirrm etc/apache/tables +@unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache diff --git a/russian/apache13/files/patch-aj b/russian/apache13/files/patch-aj new file mode 100644 index 000000000000..9c1596e0cb70 --- /dev/null +++ b/russian/apache13/files/patch-aj @@ -0,0 +1,15 @@ +--- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 ++++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 +@@ -604,12 +604,10 @@ + print FP $content; + close(FP); + if ($^O ne "MSWin32") { +- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); + push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); + push(@cmds, "rm $cfgbase.conf.new"); + } else { + $cfgbase =~ s|/|\\|g; +- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); + push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); + push(@cmds, "del \"$cfgbase.conf.new\""); + } diff --git a/russian/apache13/pkg-plist b/russian/apache13/pkg-plist index 0d1c1a7e066b..3377c75f2b96 100644 --- a/russian/apache13/pkg-plist +++ b/russian/apache13/pkg-plist @@ -810,6 +810,7 @@ www/icons/world2.png @dirrm etc/apache/tables/ukrainian @dirrm etc/apache/tables/ukrainian2 @dirrm etc/apache/tables +@unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache diff --git a/www/apache13+ipv6/files/patch-aj b/www/apache13+ipv6/files/patch-aj new file mode 100644 index 000000000000..9c1596e0cb70 --- /dev/null +++ b/www/apache13+ipv6/files/patch-aj @@ -0,0 +1,15 @@ +--- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 ++++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 +@@ -604,12 +604,10 @@ + print FP $content; + close(FP); + if ($^O ne "MSWin32") { +- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); + push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); + push(@cmds, "rm $cfgbase.conf.new"); + } else { + $cfgbase =~ s|/|\\|g; +- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); + push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); + push(@cmds, "del \"$cfgbase.conf.new\""); + } diff --git a/www/apache13+ipv6/pkg-plist b/www/apache13+ipv6/pkg-plist index d7ee87de4836..53f1407cd60f 100644 --- a/www/apache13+ipv6/pkg-plist +++ b/www/apache13+ipv6/pkg-plist @@ -1,4 +1,4 @@ -@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.22 2004-11-08 08:52:43 sumikawa Exp $ +@comment $FreeBSD: /tmp/pcvs/ports/www/apache13+ipv6/Attic/pkg-plist,v 1.23 2005-02-11 20:43:04 clement Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -661,6 +661,7 @@ www/icons/world2.png @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi +@unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache diff --git a/www/apache13/files/patch-aj b/www/apache13/files/patch-aj new file mode 100644 index 000000000000..9c1596e0cb70 --- /dev/null +++ b/www/apache13/files/patch-aj @@ -0,0 +1,15 @@ +--- src/support/apxs.pl.orig Mon Nov 29 21:05:12 2004 ++++ src/support/apxs.pl Mon Nov 29 21:05:56 2004 +@@ -604,12 +604,10 @@ + print FP $content; + close(FP); + if ($^O ne "MSWin32") { +- push(@cmds, "cp $cfgbase.conf $cfgbase.conf.bak"); + push(@cmds, "cp $cfgbase.conf.new $cfgbase.conf"); + push(@cmds, "rm $cfgbase.conf.new"); + } else { + $cfgbase =~ s|/|\\|g; +- push(@cmds, "copy \"$cfgbase.conf\" \"$cfgbase.conf.bak\""); + push(@cmds, "copy \"$cfgbase.conf.new\" \"$cfgbase.conf\""); + push(@cmds, "del \"$cfgbase.conf.new\""); + } diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 3ee091a25e18..e8b7e7dc9581 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -659,6 +659,7 @@ www/icons/world2.png @exec mkdir -p %D/www/proxy @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi +@unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true @dirrm etc/apache @dirrm include/apache/xml @dirrm include/apache |