Files
bsdports/net/apache/files/patch-x-support-apxs.in
2019-12-26 07:26:06 +00:00

34 lines
1.5 KiB
Plaintext

--- ./support/apxs.in.orig 2013-12-26 21:01:53.000000000 +0300
+++ ./support/apxs.in 2018-07-09 14:37:29.652448000 +0200
@@ -1,4 +1,4 @@
-#!@perlbin@ -w
+#!@perlbin@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -636,7 +636,13 @@
}
} 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]");
@@ -645,8 +651,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");