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 /www/apache13 | |
| 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
Diffstat (limited to 'www/apache13')
| -rw-r--r-- | www/apache13/files/patch-aj | 15 | ||||
| -rw-r--r-- | www/apache13/pkg-plist | 1 |
2 files changed, 16 insertions, 0 deletions
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 |