aboutsummaryrefslogtreecommitdiffstats
path: root/www/apache13-ssl
diff options
context:
space:
mode:
authorclement <clement@FreeBSD.org>2004-11-30 04:14:52 +0800
committerclement <clement@FreeBSD.org>2004-11-30 04:14:52 +0800
commit4568265b8367b101b7a5ccf508ba865ee480bdce (patch)
tree113b500efb5bd31420b913e6f44155e81fd301cd /www/apache13-ssl
parent5a798c22afc4fda029f0a9019947a5e08cc5de4b (diff)
downloadfreebsd-ports-gnome-4568265b8367b101b7a5ccf508ba865ee480bdce.tar.gz
freebsd-ports-gnome-4568265b8367b101b7a5ccf508ba865ee480bdce.tar.zst
freebsd-ports-gnome-4568265b8367b101b7a5ccf508ba865ee480bdce.zip
- Deal with httpsd.conf.bak files, like we did for apache2 previously in the day.
Diffstat (limited to 'www/apache13-ssl')
-rw-r--r--www/apache13-ssl/files/patch-src:support:apxs.pl15
-rw-r--r--www/apache13-ssl/pkg-plist4
2 files changed, 18 insertions, 1 deletions
diff --git a/www/apache13-ssl/files/patch-src:support:apxs.pl b/www/apache13-ssl/files/patch-src:support:apxs.pl
new file mode 100644
index 000000000000..9c1596e0cb70
--- /dev/null
+++ b/www/apache13-ssl/files/patch-src:support:apxs.pl
@@ -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-ssl/pkg-plist b/www/apache13-ssl/pkg-plist
index 552718e00679..96e4ed3c86a2 100644
--- a/www/apache13-ssl/pkg-plist
+++ b/www/apache13-ssl/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
bin/checkgid
bin/dbmmanage
bin/htdigest
@@ -630,7 +631,8 @@ www/icons/world1.png
www/icons/world2.gif
www/icons/world2.png
@exec mkdir -p %D/www/proxy
-@dirrm etc/apache
+@unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true
+@unexec rmdir %D/etc/apache 2> /dev/null || true
@dirrm include/apache/xml
@dirrm include/apache
@dirrm libexec/apache