3 files changed, 22 insertions, 8 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 50ebda4f2e35..78c521cf0b25 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mod_perl
-# Version required:			1.21
+# Version required:			1.21_02
 # Date created:				November 5th 1999
 # Whom:	      				Sheldon Hearn <sheldonh@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mod_perl-1.21
+DISTNAME=	mod_perl-1.21_02
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 USE_PERL5=	YES
 
 MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
-		Apache::FakeRequest.3 Apache::Leak.3 \
+		Apache::FakeRequest.3 Apache::File.3 Apache::Leak.3 \
 		Apache::Log.3 Apache::Options.3 \
 		Apache::PerlRun.3 Apache::PerlRunXS.3 \
 		Apache::RedirectLogFix.3 \
@@ -34,7 +34,11 @@ MAN3=		Apache.3 Apache::Constants.3  Apache::ExtUtils.3 \
 		mod_perl_tuning.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 400000
 BROKEN=		"see PR 14924; use p5-Apache instead"
+.endif
 
 do-configure:
 	@ cd ${WRKSRC}; \
@@ -48,4 +52,4 @@ post-install:
 	    ${PREFIX}/include/apache/modules/perl
 	${SH} ${PKGINSTALL}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index 5617eb59a45d..1223844dd822 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1 +1 @@
-MD5 (mod_perl-1.21.tar.gz) = 3695bb66e8eecf6cceec97e54d48f48e
+MD5 (mod_perl-1.21_02.tar.gz) = fcb243aed6c7ce25a380850f2ce54c0c
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index bcb52606dca8..c8cdb673b9e8 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -1,3 +1,4 @@
+include/apache/modules/perl/apache_inc.h
 include/apache/modules/perl/mod_perl.h
 include/apache/modules/perl/mod_perl_version.h
 include/apache/modules/perl/mod_perl_xs.h
@@ -44,6 +45,14 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak/Leak.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol/Symbol.so
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/ap_config_auto.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/apache_inc.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_version.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/mod_perl_xs.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl/perl_PL.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/mod_perl.exp
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/typemap
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/cgi_to_mod_perl.pod
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl.pm
@@ -57,10 +66,11 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/mod_perl_tuning.pod
 libexec/apache/libperl.so
 @dirrm include/apache/modules/perl
 @dirrm include/apache/modules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache/Constants
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Apache
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Bundle
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Constants
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Leak
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/Symbol
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules/perl
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include/modules
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache/include
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Apache
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/mod_perl