1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00

- don't create httpd.conf.bak

- remove httpd.conf.bak if exists

Approved by:	portmgr (krion, kris)
This commit is contained in:
Clement Laforet 2005-02-11 20:43:04 +00:00
parent 28c6384f4e
commit d2f4ba1b1e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=128539
8 changed files with 65 additions and 1 deletions

View File

@ -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\"");
}

View File

@ -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

View File

@ -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\"");
}

View File

@ -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

View File

@ -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\"");
}

View File

@ -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

View File

@ -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\"");
}

View File

@ -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