diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2010-07-26 01:28:40 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2010-07-26 01:28:40 +0000 |
| commit | 4766daabfe201ee2f5e2dc1173831b8777ba24b2 (patch) | |
| tree | 64029fe300e36dec57ac51658cc1cf5f5871bb2c /www/apache22 | |
| parent | 7e6e8eecd0094ecfcd9459df4b4c2974765e2229 (diff) | |
| download | ports-4766daabfe201ee2f5e2dc1173831b8777ba24b2.tar.gz ports-4766daabfe201ee2f5e2dc1173831b8777ba24b2.zip | |
Notes
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 3 | ||||
| -rw-r--r-- | www/apache22/distinfo | 6 | ||||
| -rw-r--r-- | www/apache22/files/patch-support__apxs.in | 30 |
3 files changed, 9 insertions, 30 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index c25e0eecd2f0..478daa564033 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -8,8 +8,7 @@ # PORTNAME= apache -PORTVERSION= 2.2.15 -PORTREVISION= 9 +PORTVERSION= 2.2.16 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} diff --git a/www/apache22/distinfo b/www/apache22/distinfo index 95750274808a..40b888e5b8d8 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,3 +1,3 @@ -MD5 (apache22/httpd-2.2.15.tar.bz2) = 016cec97337eccead2aad6a7c27f2e14 -SHA256 (apache22/httpd-2.2.15.tar.bz2) = 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7 -SIZE (apache22/httpd-2.2.15.tar.bz2) = 4959582 +MD5 (apache22/httpd-2.2.16.tar.bz2) = c8ff2a07c884300bc7766a2e7f662d33 +SHA256 (apache22/httpd-2.2.16.tar.bz2) = 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52 +SIZE (apache22/httpd-2.2.16.tar.bz2) = 4775545 diff --git a/www/apache22/files/patch-support__apxs.in b/www/apache22/files/patch-support__apxs.in index 975586835a90..6d00017ff58e 100644 --- a/www/apache22/files/patch-support__apxs.in +++ b/www/apache22/files/patch-support__apxs.in @@ -1,30 +1,10 @@ ---- ./support/apxs.in.orig 2006-07-11 23:38:44.000000000 -0400 -+++ ./support/apxs.in 2010-05-12 20:57:31.242745632 -0400 -@@ -83,7 +83,6 @@ - my ($argumentative, @ARGV) = @_; - my $errs = 0; - local $_; -- local $[ = 0; - - my @args = split / */, $argumentative; - while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) { -@@ -547,7 +546,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>. - -@@ -610,7 +612,13 @@ +--- support/apxs.in.orig 2010-07-26 08:42:53.271215110 +0900 ++++ support/apxs.in 2010-07-26 08:43:37.927545200 +0900 +@@ -612,7 +612,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$c$lmd\n|s; + # Custom FreeBSD mod + if ($opt_A) { + $content =~ s|^(.*\n)#?\s*$lmd_re[^\n]*\n|$1|s; @@ -35,7 +15,7 @@ } $lmd =~ m|LoadModule\s+(.+?)_module.*|; notice("[$what module `$1' in $CFG_SYSCONFDIR/$CFG_TARGET.conf]"); -@@ -619,8 +627,7 @@ +@@ -621,8 +627,7 @@ if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) { print FP $content; close(FP); |