diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-05-08 05:54:13 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-05-08 05:54:13 +0800 |
| commit | 2c4172e43a2bb14351b7f1ee9187ab672db42467 (patch) | |
| tree | 72d8374f4e5708c7b3777b9c708a7e18fcc828ea /www | |
| parent | 586e5962efe40999ed9e974eeb1411945b6c4519 (diff) | |
| download | freebsd-ports-graphics-2c4172e43a2bb14351b7f1ee9187ab672db42467.tar.gz freebsd-ports-graphics-2c4172e43a2bb14351b7f1ee9187ab672db42467.tar.zst freebsd-ports-graphics-2c4172e43a2bb14351b7f1ee9187ab672db42467.zip | |
- That was the wrong patch file, too much git/cvs for me
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache20/files/patch-support__apxs.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/www/apache20/files/patch-support__apxs.in b/www/apache20/files/patch-support__apxs.in index 547b85e9a76..c91f83a6ed6 100644 --- a/www/apache20/files/patch-support__apxs.in +++ b/www/apache20/files/patch-support__apxs.in @@ -12,16 +12,22 @@ # check for open <containers>, so that the new LoadModule # directive always appears *outside* of an <container>. -@@ -611,7 +614,7 @@ +@@ -611,7 +614,13 @@ } } else { # replace already existing LoadModule line - $content =~ s|^(.*\n)#?\s*$lmd[^\n]*\n|$1$c$lmd\n|s; -+ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; ++ # Custom FreeBSD mod ++ if ($opt_A) { ++ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; ++ } ++ else { ++ $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|s; ++ } } $lmd =~ m|LoadModule\s+(.+?)_module.*|; notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); -@@ -628,8 +631,7 @@ +@@ -628,8 +637,7 @@ if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { print FP $content; close(FP); |