diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-11-29 09:38:45 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-11-29 09:38:45 +0000 |
| commit | 7c168732cc7957159f9e1f4fb392ba0a11f35b8b (patch) | |
| tree | 75c9d1b44ab4f42d28b592bfbdb2e9d508f1ff6b /www/apache20 | |
| parent | e5db96d167762b57099ab17aadb3ce4d09f559ff (diff) | |
| download | ports-7c168732cc7957159f9e1f4fb392ba0a11f35b8b.tar.gz ports-7c168732cc7957159f9e1f4fb392ba0a11f35b8b.zip | |
- As discussed on apache@, don't create httpd.conf.bak, and remove stalled
httpd.conf.bak file at deinstall time.
Notes
Notes:
svn path=/head/; revision=122743
Diffstat (limited to 'www/apache20')
| -rw-r--r-- | www/apache20/files/patch-support:apxs.in | 12 | ||||
| -rw-r--r-- | www/apache20/pkg-plist | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/www/apache20/files/patch-support:apxs.in b/www/apache20/files/patch-support:apxs.in new file mode 100644 index 000000000000..db8081fa4fc5 --- /dev/null +++ b/www/apache20/files/patch-support:apxs.in @@ -0,0 +1,12 @@ +--- support/apxs.in.orig Mon Nov 29 10:24:23 2004 ++++ support/apxs.in Mon Nov 29 10:25:05 2004 +@@ -629,8 +629,7 @@ + if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { + print FP $content; + close(FP); +- system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf $CFG_SYSCONFDIR/$CFG_TARGET.conf.bak && " . +- "cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . ++ system("cp $CFG_SYSCONFDIR/$CFG_TARGET.conf.new $CFG_SYSCONFDIR/$CFG_TARGET.conf && " . + "rm $CFG_SYSCONFDIR/$CFG_TARGET.conf.new"); + } else { + notice("unable to open configuration file"); diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index b662d4185fdc..129f80464599 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -526,4 +526,5 @@ share/apache2/build/special.mk @dirrm include/apache2 @exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true @unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true +@unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2." |