diff options
Diffstat (limited to 'www/mod_perl2')
-rw-r--r-- | www/mod_perl2/Makefile | 12 | ||||
-rw-r--r-- | www/mod_perl2/distinfo | 4 | ||||
-rw-r--r-- | www/mod_perl2/files/patch-ab | 11 | ||||
-rw-r--r-- | www/mod_perl2/pkg-plist | 33 |
4 files changed, 46 insertions, 14 deletions
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile index c5eaef60f0a1..bb79df0f173f 100644 --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_perl -PORTVERSION= 1.99r14 +PORTVERSION= 1.99r16 CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ \ http://perl.apache.org/dist/old/ @@ -24,8 +24,9 @@ CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs \ MP_INST_APACHE2=1 PREFIX=${PREFIX} MAN3= Apache::Build.3 Apache::Test.3 Apache::TestConfig.3 \ - Apache::TestMM.3 Apache::TestReport.3 Apache::TestRequest.3 \ - Apache::TestRun.3 Apache::TestRunPerl.3 Apache::TestSmoke.3 \ + Apache::TestMB.3 Apache::TestMM.3 Apache::TestReport.3 \ + Apache::TestRequest.3 Apache::TestRun.3 \ + Apache::TestRunPerl.3 Apache::TestSmoke.3 \ Apache::TestTrace.3 Apache::TestUtil.3 Bundle::Apache2.3 \ Bundle::ApacheTest.3 ModPerl::CScan.3 ModPerl::Code.3 \ ModPerl::Config.3 mod_perl.3 @@ -37,6 +38,11 @@ MAN3= Apache::Build.3 Apache::Test.3 Apache::TestConfig.3 \ IGNORE= requires perl 5.8.x or later. Install lang/perl5.8 then try again .endif +# no idea why r16 requires this - the perl build should do this copy +pre-install: + ${CP} ${WRKSRC}/WrapXS/APR/ThreadMutex/ThreadMutex.pm \ + ${WRKSRC}/blib/lib/Apache2/APR/ + post-install: ${MKDIR} ${PREFIX}/include/apache2/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ diff --git a/www/mod_perl2/distinfo b/www/mod_perl2/distinfo index e1d34195674e..599a6537e9e7 100644 --- a/www/mod_perl2/distinfo +++ b/www/mod_perl2/distinfo @@ -1,2 +1,2 @@ -MD5 (mod_perl-1.99_14.tar.gz) = 116dce5c909701b3812ae4ad6d91c6bd -SIZE (mod_perl-1.99_14.tar.gz) = 1264246 +MD5 (mod_perl-1.99_16.tar.gz) = 94da0f0301e127e8ef8cf77f7c11b1b4 +SIZE (mod_perl-1.99_16.tar.gz) = 1352516 diff --git a/www/mod_perl2/files/patch-ab b/www/mod_perl2/files/patch-ab new file mode 100644 index 000000000000..78c14cd3023d --- /dev/null +++ b/www/mod_perl2/files/patch-ab @@ -0,0 +1,11 @@ +--- ./xs/APR/aprext/Makefile.PL Wed Sep 1 19:52:04 2004 ++++ ./xs/APR/aprext/Makefile.PL.orig Wed Sep 1 19:51:51 2004 +@@ -19,7 +19,7 @@ + $src{$cfile} = "$srcdir/$cfile"; + } + +-my @skip = qw(dynamic test); ++my @skip = qw(test); + push @skip, q{static} + unless (Apache::Build::BUILD_APREXT); + diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist index 3bcf1d2fbe1e..789010b54c77 100644 --- a/www/mod_perl2/pkg-plist +++ b/www/mod_perl2/pkg-plist @@ -3,13 +3,20 @@ bin/mp2doc include/apache2/modules/perl/mod_perl.h include/apache2/modules/perl/modperl_apache_compat.h include/apache2/modules/perl/modperl_apache_includes.h +include/apache2/modules/perl/modperl_apr_includes.h include/apache2/modules/perl/modperl_bucket.h include/apache2/modules/perl/modperl_callback.h include/apache2/modules/perl/modperl_cgi.h include/apache2/modules/perl/modperl_cmd.h +include/apache2/modules/perl/modperl_common_debug.h +include/apache2/modules/perl/modperl_common_includes.h +include/apache2/modules/perl/modperl_common_log.h +include/apache2/modules/perl/modperl_common_types.h +include/apache2/modules/perl/modperl_common_util.h include/apache2/modules/perl/modperl_config.h include/apache2/modules/perl/modperl_const.h include/apache2/modules/perl/modperl_constants.h +include/apache2/modules/perl/modperl_debug.h include/apache2/modules/perl/modperl_directives.h include/apache2/modules/perl/modperl_env.h include/apache2/modules/perl/modperl_error.h @@ -52,6 +59,7 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestConfigPerl.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHandler.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestHarness.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestMB.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestMM.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestPerlDB.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestReport.pm @@ -71,11 +79,12 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Base64.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Brigade.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Bucket.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/BucketType.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Const.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Date.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Error.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Finfo.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/NetLib.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/IpSubnet.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/OS.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/PerlIO.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Pool.pm @@ -83,6 +92,7 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Socket.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/String.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Table.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/ThreadMutex.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/URI.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/UUID.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR/Util.pm @@ -110,7 +120,7 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/RequestRec.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/RequestUtil.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Response.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Server.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/ServerRec.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/ServerUtil.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/SourceTables.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/Status.pm @@ -153,6 +163,8 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Brigade/Brigade.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Bucket/Bucket.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Bucket/Bucket.so +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/BucketType/BucketType.bs +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/BucketType/BucketType.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Const/Const.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Const/Const.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Date/Date.bs @@ -161,8 +173,8 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Error/Error.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Finfo/Finfo.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Finfo/Finfo.so -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/NetLib/NetLib.bs -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/NetLib/NetLib.so +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/IpSubnet/IpSubnet.bs +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/IpSubnet/IpSubnet.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/OS/OS.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/OS/OS.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/PerlIO/PerlIO.bs @@ -218,8 +230,8 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/RequestUtil/RequestUtil.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Response/Response.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Response/Response.so -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Server/Server.bs -%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Server/Server.so +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerRec/ServerRec.bs +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerRec/ServerRec.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerUtil/ServerUtil.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerUtil/ServerUtil.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/SubProcess/SubProcess.bs @@ -237,14 +249,16 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global/Global.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.so +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext/libaprext.bs +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext/libaprext.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/mod_perl.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache2.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl/.packlist libexec/apache2/mod_perl.so -@unexec rmdir %D/libexec/apache2 2>/dev/null || true @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/libaprext @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Global @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Const @@ -254,7 +268,7 @@ libexec/apache2/mod_perl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/SubRequest @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/SubProcess @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerUtil -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Server +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/ServerRec @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/Response @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/RequestUtil @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/Apache/RequestRec @@ -284,11 +298,12 @@ libexec/apache2/mod_perl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Pool @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/PerlIO @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/OS -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/NetLib +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/IpSubnet @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Finfo @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Error @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Date @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Const +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/BucketType @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Bucket @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Brigade @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR/Base64 |