Changes 2.0.5:

* Prepare modperl for the upcoming perl 5.14
* Add lib/ModPerl/MethodLookup.pm to MANIFEST via lib/ModPerl/Manifest.pm
* PerlIOApache_write() now throws an APR::Error object, rather than just
  a string error, if modperl_wbucket_write() fails.
* Authentication tests fail with LWP 5.815 and later
* Concise test won't perform unless StatusTerse is set to ON
* Look for a usable apxs in $ENV{PATH} if all other options fail, then prompt
  the user for one.
* Work around bootstrap warnings when Apache2::BuildConfig has not been
  created yet.
* Remove Apache::test compatibility (part of mod_perl 1.2.7), that code causes
  build issues and is 4 versions out of date.
* Make sure perl is built either with multiplicity and ithreads or without both
* Support for "install_vendor" and "install_site" make targets
* Run tests on bundled pure perl Apache::* modules
* Implement a mini-preprocess language for map-files in xs/maps.
* Implement APR::Socket::fileno
* Export PROXYREQ_RESPONSE, a missing PROXYREQ_* constant
* Make sure standard file descriptors are preserved by the perl-script handler
* Fix the filter init handler attribute check in
  modperl_filter_resolve_init_handler()
* Make sure buffer is a valid SV in modperl_filter_read()
* Move modperl_response_finish() out of modperl_response_handler_run in
  mod_perl.c

4 files changed, 12 insertions, 69 deletions

diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile
index 55c102237f5..71c97fd2a82 100644
--- a/www/ap2-perl/Makefile
+++ b/www/ap2-perl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2010/08/21 16:36:30 seb Exp $
+# $NetBSD: Makefile,v 1.37 2011/04/04 09:24:14 adam Exp $
 
-DISTNAME=	mod_perl-2.0.4
-PKGREVISION=	7
+DISTNAME=	mod_perl-2.0.5
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/
@@ -9,6 +8,7 @@ MASTER_SITES=	http://perl.apache.org/dist/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://perl.apache.org/
 COMMENT=	Module that embeds a Perl interpreter into Apache
+LICENSE=	apache-2.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -16,17 +16,14 @@ CONFLICTS=	ap-perl-[0-9]* p5-Apache-Test-[0-9]*
 
 PKG_APACHE_ACCEPTED=	apache2 apache22
 
-APACHE_MODULE=		# empty
+APACHE_MODULE=		yes
 PERL5_PACKLIST=		auto/mod_perl2/.packlist
 
 MAKE_PARAMS+=		MP_APXS=${APXS}
 
-MODPERLDOCSDIR=	${PREFIX}/share/doc/mod_perl
+MODPERLDOCSDIR=		${PREFIX}/share/doc/mod_perl
 INSTALLATION_DIRS=	${MODPERLDOCSDIR}
 
-pre-configure:
-	${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM}
-
 post-install:
 	${CP} -R ${WRKSRC}/docs/* ${DESTDIR}${MODPERLDOCSDIR}
 
diff --git a/www/ap2-perl/buildlink3.mk b/www/ap2-perl/buildlink3.mk
index 43c2dc77937..df8ac07dd9d 100644
--- a/www/ap2-perl/buildlink3.mk
+++ b/www/ap2-perl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2011/04/04 09:24:14 adam Exp $
 
 BUILDLINK_TREE+=	ap2-perl
 
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	ap2-perl
 AP2_PERL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ap2-perl+=	${APACHE_PKG_PREFIX}-perl>=2.0.1
-BUILDLINK_ABI_DEPENDS.ap2-perl?=	${APACHE_PKG_PREFIX}-perl>=2.0.3
-BUILDLINK_PKGSRCDIR.ap2-perl?=	../../www/ap2-perl
+BUILDLINK_ABI_DEPENDS.ap2-perl+=	${APACHE_PKG_PREFIX}-perl>=2.0.3
+BUILDLINK_PKGSRCDIR.ap2-perl?=		../../www/ap2-perl
 
 .include "../../mk/apache.mk"
 .endif # AP2_PERL_BUILDLINK3_MK
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo
index e69d981f7d8..84a56d87a80 100644
--- a/www/ap2-perl/distinfo
+++ b/www/ap2-perl/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2009/06/15 17:38:21 he Exp $
+$NetBSD: distinfo,v 1.14 2011/04/04 09:24:14 adam Exp $
 
-SHA1 (mod_perl-2.0.4.tar.gz) = 65299a16ec414a690a48a2bbe63acaa3c6bb897b
-RMD160 (mod_perl-2.0.4.tar.gz) = 111b8f33e2dcc43ef7a0a7d557ceb467f0c55c6d
-Size (mod_perl-2.0.4.tar.gz) = 3727717 bytes
-SHA1 (patch-aa) = 1aba55afc0adfc3a1fe7a694099e09584d2979b0
+SHA1 (mod_perl-2.0.5.tar.gz) = e749e2d7236273217f33cbe7fcd704a662e532d1
+RMD160 (mod_perl-2.0.5.tar.gz) = d659db1c64200ed9c8863c6e283360dfdd0c8384
+Size (mod_perl-2.0.5.tar.gz) = 3778910 bytes
diff --git a/www/ap2-perl/patches/patch-aa b/www/ap2-perl/patches/patch-aa
deleted file mode 100644
index 74b5750aeaa..00000000000
--- a/www/ap2-perl/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/06/15 17:38:21 he Exp $
-
-This is revision 760926 from modperl's svn repository:
-http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?view=log&pathrev=761081
-Fix an XSS bug in Apache2::Status, ref. CVE-2009-0796.
-
---- lib/Apache2/Status.pm.orig	2007/12/31 08:05:11	607697
-+++ lib/Apache2/Status.pm	2009/04/01 15:39:56	760926
-@@ -29,7 +29,7 @@
- 
- use Apache2::Const -compile => qw(OK);
- 
--$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0
-+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0
- 
- use constant IS_WIN32 => ($^O eq "MSWin32");
- 
-@@ -126,7 +126,7 @@
-         $r->print(symdump($r, $qs));
-     }
-     else {
--        my $uri = $r->uri;
-+        my $uri = $r->location;
-         $r->print('<p>');
-         $r->print(
-             map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status
-@@ -198,7 +198,7 @@
- sub status_inc {
-     my ($r) = @_;
- 
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my @retval = (
-         '<table border="1">',
-         "<tr>",
-@@ -289,7 +289,7 @@
-     my ($r) = @_;
- 
-     local $_;
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $cache = __PACKAGE__->registry_cache;
- 
-     my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>";
-@@ -765,7 +765,7 @@
-     my ($self, $package, $r) = @_;
- 
-     my @m = qw(<table>);
--    my $uri = $r->uri;
-+    my $uri = $r->location;
-     my $is_main = $package eq "main";
- 
-     my $do_dump = has($r, "dumper");