From fe80b0be189eb941e1fed6cce48ae370f0da9c4d Mon Sep 17 00:00:00 2001 From: clement Date: Fri, 11 Feb 2005 20:43:04 +0000 Subject: - don't create httpd.conf.bak - remove httpd.conf.bak if exists Approved by: portmgr (krion, kris) --- www/apache13+ipv6/files/patch-aj | 15 +++++++++++++++ www/apache13+ipv6/pkg-plist | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 www/apache13+ipv6/files/patch-aj (limited to 'www/apache13+ipv6') 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 -- cgit