mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-24 09:25:01 +00:00
887bc73476
- backport ab from 2.4.x - fix mode for suexec, cgi test files - adopt http-ssl.conf.in from upstream trunk - rebuild some patches
28 lines
1.3 KiB
Plaintext
28 lines
1.3 KiB
Plaintext
--- support/apxs.in.orig 2010-05-10 20:02:56 UTC
|
|
+++ support/apxs.in
|
|
@@ -612,7 +612,13 @@ if ($opt_i or $opt_e) {
|
|
}
|
|
} else {
|
|
# replace already existing LoadModule line
|
|
- $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1$c$lmd\n|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]");
|
|
@@ -621,8 +627,7 @@ if ($opt_i or $opt_e) {
|
|
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");
|