diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-05-08 05:48:58 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-05-08 05:48:58 +0800 |
| commit | 586e5962efe40999ed9e974eeb1411945b6c4519 (patch) | |
| tree | 9c5d887b2e4ce4f2f942293621a419892a25fc79 /www/apache20 | |
| parent | 8f7a14eacca4d967adf3c47450383904968deba7 (diff) | |
| download | freebsd-ports-gnome-586e5962efe40999ed9e974eeb1411945b6c4519.tar.gz freebsd-ports-gnome-586e5962efe40999ed9e974eeb1411945b6c4519.tar.zst freebsd-ports-gnome-586e5962efe40999ed9e974eeb1411945b6c4519.zip | |
- Fix -A and -a options for apxs to correctly ignore whitespace.
This will fix about 100 pkg-plist left overs for httpd.conf
apxs -A comments out the LoadModule line
This adds custom FreeBSD mod to 'DELETE' the line so that it works with
our pkg-plists in packages.
- Remove -s form the cmp httpd.conf in pkg-plist to be blatant about why
it didn't get removed
- Bump PORTREVISION
- This will be in 2.0.64
PR: ports/133704
Obtained from: http://svn.apache.org/viewvc?rev=942211&view=rev
Reported by: olli hauer <ohauer@gmx.de> (and very good pr!)
With Hat: apache@
Diffstat (limited to 'www/apache20')
| -rw-r--r-- | www/apache20/Makefile | 2 | ||||
| -rw-r--r-- | www/apache20/files/patch-support__apxs.in | 23 | ||||
| -rw-r--r-- | www/apache20/pkg-plist | 2 |
3 files changed, 24 insertions, 3 deletions
diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 98815f463cdf..9cb6c518c158 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -9,7 +9,7 @@ PORTNAME= apache PORTVERSION= 2.0.63 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \ ${MASTER_SITE_LOCAL:S/$/:powerlogo/} diff --git a/www/apache20/files/patch-support__apxs.in b/www/apache20/files/patch-support__apxs.in index dc9cffb31f00..547b85e9a768 100644 --- a/www/apache20/files/patch-support__apxs.in +++ b/www/apache20/files/patch-support__apxs.in @@ -1,6 +1,27 @@ --- ./support/apxs.in.orig 2006-07-12 03:40:55.000000000 -0400 +++ ./support/apxs.in 2010-05-06 16:06:03.795832133 -0400 -@@ -628,8 +628,7 @@ +@@ -548,7 +548,10 @@ + $c = '#' if ($opt_A); + foreach $lmd (@lmd) { + my $what = $opt_A ? "preparing" : "activating"; +- if ($content !~ m|\n#?\s*$lmd|) { ++ my $lmd_re = $lmd; ++ $lmd_re =~ s/\s+/\\s+/g; ++ ++ if ($content !~ m|\n#?\s*$lmd_re|) { + # check for open <containers>, so that the new LoadModule + # directive always appears *outside* of an <container>. + +@@ -611,7 +614,7 @@ + } + } 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; + } + $lmd =~ m|LoadModule\s+(.+?)_module.*|; + notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); +@@ -628,8 +631,7 @@ if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { print FP $content; close(FP); diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 21fcb622ac1a..dd84f89e7fd2 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -1,6 +1,6 @@ @comment $FreeBSD$ @exec mkdir -p %D/etc/apache2 2> /dev/null -@unexec if cmp -s %D/etc/apache2/httpd.conf %D/%%EXAMPLESDIR%%/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi +@unexec if cmp %D/etc/apache2/httpd.conf %D/%%EXAMPLESDIR%%/httpd-std.conf; then rm -f %D/etc/apache2/httpd.conf; fi %%EXAMPLESDIR%%/httpd-std.conf @exec [ -f %D/etc/apache2/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/apache2/httpd.conf @unexec if cmp -s %D/etc/apache2/magic %D/%%EXAMPLESDIR%%/magic-dist; then rm -f %D/etc/apache2/magic; fi |