- Update to 2.0.0r6

PR:		ports/81192
Submitted by:	Lars Eggert <lars.eggert@gmx.net> (maintainer)

4 files changed, 37 insertions, 24 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 86c32f154843..7ede289f51df 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mod_perl
-PORTVERSION=	2.0.0r5
+PORTVERSION=	2.0.0r6
 PORTEPOCH=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://perl.apache.org/dist/ \
@@ -31,15 +31,16 @@ MAN3=		APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
 		APR::BucketAlloc.3 APR::BucketType.3 APR::Const.3 \
 		APR::Date.3 APR::Error.3 APR::Finfo.3 APR::IpSubnet.3 \
 		APR::OS.3 APR::PerlIO.3 APR::Pool.3 APR::SockAddr.3 \
-		APR::Socket.3 APR::String.3 APR::Table.3 APR::ThreadMutex.3 \
-		APR::URI.3 APR::UUID.3 APR::Util.3 Apache2::Access.3 \
-		Apache2::Build.3 Apache2::CmdParms.3 Apache2::Command.3 \
-		Apache2::Connection.3 Apache2::Const.3 Apache2::Directive.3 \
-		Apache2::Filter.3 Apache2::FilterRec.3 Apache2::HookRun.3 \
-		Apache2::Log.3 Apache2::Module.3 Apache2::PerlSections.3 \
-		Apache2::Process.3 Apache2::Reload.3 Apache2::RequestIO.3 \
-		Apache2::RequestRec.3 Apache2::RequestUtil.3 \
-		Apache2::Resource.3 Apache2::Response.3 Apache2::ServerRec.3 \
+		APR::Socket.3 APR::Status.3 APR::String.3 APR::Table.3 \
+		APR::ThreadMutex.3 APR::URI.3 APR::UUID.3 APR::Util.3 \
+		Apache2::Access.3 Apache2::Build.3 Apache2::CmdParms.3 \
+		Apache2::Command.3 Apache2::Connection.3 Apache2::Const.3 \
+		Apache2::Directive.3 Apache2::Filter.3 Apache2::FilterRec.3 \
+		Apache2::HookRun.3 Apache2::Log.3 Apache2::Module.3 \
+		Apache2::PerlSections.3 Apache2::Process.3 Apache2::Reload.3 \
+		Apache2::RequestIO.3 Apache2::RequestRec.3 \
+		Apache2::RequestUtil.3 Apache2::Resource.3 \
+		Apache2::Response.3 Apache2::ServerRec.3 \
 		Apache2::ServerUtil.3 Apache2::SizeLimit.3 Apache2::Status.3 \
 		Apache2::SubProcess.3 Apache2::SubRequest.3 Apache2::URI.3 \
 		Apache2::Util.3 Apache2::compat.3 Apache2::porting.3 \
@@ -57,13 +58,13 @@ MAN3=		APR.3 APR::Base64.3 APR::Brigade.3 APR::Bucket.3 \
 
 pre-everything::
 	@${ECHO} "************************************************************"
-	@${ECHO} "NOTE: This version of ${PORTNAME} significantly"
-	@${ECHO} "      changes the API - old code *will* break!"
+	@${ECHO} "NOTE: Version RC5 and higher of ${PORTNAME} significantly"
+	@${ECHO} "      change the API - old code *will* break!"
 	@${ECHO} "      See http://perl.apache.org/docs/2.0/rename.html"
 	@${ECHO} ""
-	@${ECHO} "Hit Ctrl-C now to abort, if this is of concern."
+	@${ECHO} "Hit Ctrl-C to abort now, if this is of concern."
 	@${ECHO} "************************************************************"
-	@sleep 5
+	@sleep 10
 
 .include <bsd.port.pre.mk>
 
@@ -76,6 +77,8 @@ post-install:
 	${MKDIR} ${PREFIX}/include/apache2/modules/perl
 	${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \
 		${PREFIX}/include/apache2/modules/perl
+	${INSTALL_DATA} ${WRKSRC}/xs/*.h ${PREFIX}/include/apache2
+	${INSTALL_DATA} ${WRKSRC}/xs/APR/PerlIO/*.h ${PREFIX}/include/apache2
 	${MKDIR} ${PREFIX}/libexec/apache2
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
 		${PREFIX}/libexec/apache2/mod_perl.so
diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo
index 6041f8ad52ce..c91ee6bbfb68 100644
--- a/www/mod_perl2/distinfo
+++ b/www/mod_perl2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mod_perl-2.0.0-RC5.tar.gz) = a523a60b5a9758a88a0f1bdcd09eb425
-SIZE (mod_perl-2.0.0-RC5.tar.gz) = 1431194
+MD5 (mod_perl-2.0.0-RC6.tar.gz) = 3e7f7aefb19c772a998802990ced15c0
+SIZE (mod_perl-2.0.0-RC6.tar.gz) = 1435432
diff --git a/www/mod_perl2/files/patch-aa b/www/mod_perl2/files/patch-aa
index dba738b342f4..9237d91cbe6a 100644
--- a/www/mod_perl2/files/patch-aa
+++ b/www/mod_perl2/files/patch-aa
@@ -1,11 +1,17 @@
---- m	Wed Dec  1 11:10:30 2004
-+++ Makefile.PL	Wed Dec  1 11:10:41 2004
-@@ -588,7 +588,7 @@
+--- m	Wed May 18 11:55:48 2005
++++ Makefile.PL	Wed May 18 11:56:07 2005
+@@ -668,11 +668,11 @@
  	cd "$(MODPERL_SRC)" && $(MAKE)
  
  modperl_lib_install:
--	cd "$(MODPERL_SRC)" && $(MAKE) install
-+#	cd "$(MODPERL_SRC)" && $(MAKE) install
+-	cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
++#	cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
  
  modperl_xs_h_install:
- 	@$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
+-	@$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+-	$(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
++#	@$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
++#	$(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+ 
+ modperl_src_clean:
+ 	cd "$(MODPERL_SRC)" && $(MAKE) clean
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index 3ec07e13e423..d798962b0a20 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -1,8 +1,8 @@
 bin/mp2bug
 include/apache2/modperl_apr_perlio.h
-include/apache2/modperl_xs_util.h
-include/apache2/modperl_xs_typedefs.h
 include/apache2/modperl_xs_sv_convert.h
+include/apache2/modperl_xs_typedefs.h
+include/apache2/modperl_xs_util.h
 include/apache2/modules/perl/mod_perl.h
 include/apache2/modules/perl/modperl_apache_compat.h
 include/apache2/modules/perl/modperl_apache_includes.h
@@ -67,6 +67,7 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Pool.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/SockAddr.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Socket.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/APR/Status.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/String.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/Table.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/APR/URI.pm
@@ -197,6 +198,8 @@ include/apache2/modules/perl/modperl_util.h
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr/SockAddr.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket/Socket.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status/Status.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status/Status.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String/String.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table/Table.bs
@@ -299,6 +302,7 @@ libexec/apache2/mod_perl.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool