From 39397efb397f7494e6a4887f58b9b26502ee72f4 Mon Sep 17 00:00:00 2001 From: bad Date: Sat, 17 Jan 2004 12:36:03 +0000 Subject: Update ap2-perl to mod_perl-1.99_12. * reams of bug fixes. See the Changes file. * works with perl-5.8.1. --- www/ap2-perl/Makefile | 8 ++-- www/ap2-perl/PLIST | 88 +++++++++++++++++++++++++++++++------------ www/ap2-perl/distinfo | 7 ++-- www/ap2-perl/patches/patch-aa | 37 ------------------ 4 files changed, 71 insertions(+), 69 deletions(-) delete mode 100644 www/ap2-perl/patches/patch-aa (limited to 'www') diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index 05aebaa15d6..f7f1363c4eb 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2003/12/03 15:40:02 epg Exp $ +# $NetBSD: Makefile,v 1.9 2004/01/17 12:36:03 bad Exp $ # # NOTE: This package is *BETA*. If it doesn't work, then check the # modperl-2.0 mailing lists for help. -DISTNAME= mod_perl-1.99_08 -PKGNAME= ap2-perl-1.99.8 +DISTNAME= mod_perl-1.99_12 +PKGNAME= ap2-perl-1.99.12 PKGREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ @@ -17,7 +17,7 @@ CONFLICTS= ap-perl-[0-9]* USE_BUILDLINK2= # defined APACHE_MODULE= # defined -PERL5_REQD= 5.6.0 +PERL5_REQD?= 5.6.0 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mod_perl/.packlist MAKE_PARAMS+= MP_APXS=${APXS} diff --git a/www/ap2-perl/PLIST b/www/ap2-perl/PLIST index 5b036cb1edd..161a46c6e1e 100644 --- a/www/ap2-perl/PLIST +++ b/www/ap2-perl/PLIST @@ -1,33 +1,46 @@ -@comment $NetBSD: PLIST,v 1.5 2003/08/04 06:16:36 jmc Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/01/17 12:36:03 bad Exp $ lib/httpd/mod_perl.so ${PERL5_ARCHLIB}/perllocal.pod share/doc/html/mod_perl/TODO +share/doc/html/mod_perl/api/APR.pod +share/doc/html/mod_perl/api/APR/Const.pod +share/doc/html/mod_perl/api/APR/PerlIO.pod +share/doc/html/mod_perl/api/APR/Table.pod share/doc/html/mod_perl/api/AUTOGENERATION -share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/PerlRun.pod -share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/Registry.pod -share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryBB.pod -share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryCooker.pod -share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl/RegistryLoader.pod +share/doc/html/mod_perl/api/Apache/Access.pod +share/doc/html/mod_perl/api/Apache/Const.pod +share/doc/html/mod_perl/api/Apache/Directive.pod +share/doc/html/mod_perl/api/Apache/Filter.pod +share/doc/html/mod_perl/api/Apache/FilterRec.pod +share/doc/html/mod_perl/api/Apache/Log.pod +share/doc/html/mod_perl/api/Apache/PerlSections.pod +share/doc/html/mod_perl/api/Apache/Reload.pod +share/doc/html/mod_perl/api/Apache/RequestRec.pod +share/doc/html/mod_perl/api/Apache/RequestUtil.pod +share/doc/html/mod_perl/api/Apache/ServerUtil.pod +share/doc/html/mod_perl/api/Apache/Status.pod +share/doc/html/mod_perl/api/Apache/SubProcess.pod +share/doc/html/mod_perl/api/Apache/compat.pod +share/doc/html/mod_perl/api/Apache/porting.pod +share/doc/html/mod_perl/api/ModPerl/BuildMM.pod +share/doc/html/mod_perl/api/ModPerl/MM.pod +share/doc/html/mod_perl/api/ModPerl/MethodLookup.pod +share/doc/html/mod_perl/api/ModPerl/PerlRun.pod +share/doc/html/mod_perl/api/ModPerl/Registry.pod +share/doc/html/mod_perl/api/ModPerl/RegistryBB.pod +share/doc/html/mod_perl/api/ModPerl/RegistryCooker.pod +share/doc/html/mod_perl/api/ModPerl/RegistryLoader.pod +share/doc/html/mod_perl/api/ModPerl/Util.pod share/doc/html/mod_perl/api/README share/doc/html/mod_perl/api/config.cfg share/doc/html/mod_perl/api/index_bot.html -share/doc/html/mod_perl/api/mod_perl-2.0/APR/PerlIO.pod -share/doc/html/mod_perl/api/mod_perl-2.0/APR/Table.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/Log.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/Reload.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/RequestRec.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/ServerUtil.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/SubProcess.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Apache/compat.pod -share/doc/html/mod_perl/api/mod_perl-2.0/Makefile -share/doc/html/mod_perl/api/mod_perl-2.0/Makefile.PL -share/doc/html/mod_perl/api/mod_perl-2.0/pm_to_blib share/doc/html/mod_perl/config.cfg share/doc/html/mod_perl/devel/Changes.pod share/doc/html/mod_perl/devel/config.cfg share/doc/html/mod_perl/devel/core/apache_integration.pod share/doc/html/mod_perl/devel/core/coding_style.pod share/doc/html/mod_perl/devel/core/explained.pod +share/doc/html/mod_perl/devel/core/mod_perl_specific.pod share/doc/html/mod_perl/devel/core/mpms.pod share/doc/html/mod_perl/devel/debug/c.pod share/doc/html/mod_perl/devel/debug/perl.pod @@ -35,6 +48,7 @@ share/doc/html/mod_perl/devel/help/help.pod share/doc/html/mod_perl/devel/performance/size_matters.pod share/doc/html/mod_perl/devel/performance/speed_matters.pod share/doc/html/mod_perl/devel/porting/porting.pod +share/doc/html/mod_perl/index_top.html share/doc/html/mod_perl/os/config.cfg share/doc/html/mod_perl/os/win32/Changes.pod share/doc/html/mod_perl/os/win32/config.cfg @@ -45,7 +59,7 @@ share/doc/html/mod_perl/os/win32/install.pod share/doc/html/mod_perl/os/win32/mpinstall share/doc/html/mod_perl/user/Changes.pod share/doc/html/mod_perl/user/coding/coding.pod -share/doc/html/mod_perl/user/compat/compat.pod +share/doc/html/mod_perl/user/coding/cooking.pod share/doc/html/mod_perl/user/config.cfg share/doc/html/mod_perl/user/config/config.pod share/doc/html/mod_perl/user/config/custom.pod @@ -56,13 +70,32 @@ share/doc/html/mod_perl/user/handlers/bucket_brigades.png share/doc/html/mod_perl/user/handlers/connection_cycle.dia share/doc/html/mod_perl/user/handlers/connection_cycle.gif share/doc/html/mod_perl/user/handlers/connection_cycle.png +share/doc/html/mod_perl/user/handlers/connection_cycle_time.dia +share/doc/html/mod_perl/user/handlers/connection_cycle_time.gif +share/doc/html/mod_perl/user/handlers/connection_cycle_time.png +share/doc/html/mod_perl/user/handlers/filter_life_camera.jpg +share/doc/html/mod_perl/user/handlers/filter_life_cigarrette.jpg +share/doc/html/mod_perl/user/handlers/filter_life_coffee.jpg +share/doc/html/mod_perl/user/handlers/filter_life_goggles.jpg +share/doc/html/mod_perl/user/handlers/filter_life_mask.jpg +share/doc/html/mod_perl/user/handlers/filter_life_player.jpg +share/doc/html/mod_perl/user/handlers/filter_life_shower.jpg +share/doc/html/mod_perl/user/handlers/filter_logic.dia +share/doc/html/mod_perl/user/handlers/filter_logic.gif +share/doc/html/mod_perl/user/handlers/filter_logic.png share/doc/html/mod_perl/user/handlers/filters.pod share/doc/html/mod_perl/user/handlers/general.pod share/doc/html/mod_perl/user/handlers/http.pod share/doc/html/mod_perl/user/handlers/http_cycle.dia share/doc/html/mod_perl/user/handlers/http_cycle.gif share/doc/html/mod_perl/user/handlers/http_cycle.png +share/doc/html/mod_perl/user/handlers/in_filter_stream.dia +share/doc/html/mod_perl/user/handlers/in_filter_stream.gif +share/doc/html/mod_perl/user/handlers/in_filter_stream.png share/doc/html/mod_perl/user/handlers/intro.pod +share/doc/html/mod_perl/user/handlers/out_filter_stream.dia +share/doc/html/mod_perl/user/handlers/out_filter_stream.gif +share/doc/html/mod_perl/user/handlers/out_filter_stream.png share/doc/html/mod_perl/user/handlers/protocols.pod share/doc/html/mod_perl/user/handlers/server.pod share/doc/html/mod_perl/user/handlers/server_life_cycle.dia @@ -72,15 +105,24 @@ share/doc/html/mod_perl/user/help/help.pod share/doc/html/mod_perl/user/install/install.pod share/doc/html/mod_perl/user/intro/overview.pod share/doc/html/mod_perl/user/intro/start_fast.pod +share/doc/html/mod_perl/user/performance/mpm.pod +share/doc/html/mod_perl/user/performance/prevent.pod +share/doc/html/mod_perl/user/porting/code/apache_mp3_2.diff +share/doc/html/mod_perl/user/porting/code/apache_mp3_7.diff +share/doc/html/mod_perl/user/porting/code/apache_mp3_9.diff +share/doc/html/mod_perl/user/porting/compat.pod +share/doc/html/mod_perl/user/porting/porting.pod share/doc/html/mod_perl/user/troubleshooting/troubleshooting.pod @dirrm share/doc/html/mod_perl/user/troubleshooting +@dirrm share/doc/html/mod_perl/user/porting/code +@dirrm share/doc/html/mod_perl/user/porting +@dirrm share/doc/html/mod_perl/user/performance @dirrm share/doc/html/mod_perl/user/intro @dirrm share/doc/html/mod_perl/user/install @dirrm share/doc/html/mod_perl/user/help @dirrm share/doc/html/mod_perl/user/handlers @dirrm share/doc/html/mod_perl/user/design @dirrm share/doc/html/mod_perl/user/config -@dirrm share/doc/html/mod_perl/user/compat @dirrm share/doc/html/mod_perl/user/coding @dirrm share/doc/html/mod_perl/user @dirrm share/doc/html/mod_perl/os/win32 @@ -91,10 +133,8 @@ share/doc/html/mod_perl/user/troubleshooting/troubleshooting.pod @dirrm share/doc/html/mod_perl/devel/debug @dirrm share/doc/html/mod_perl/devel/core @dirrm share/doc/html/mod_perl/devel -@dirrm share/doc/html/mod_perl/api/mod_perl-2.0/Apache -@dirrm share/doc/html/mod_perl/api/mod_perl-2.0/APR -@dirrm share/doc/html/mod_perl/api/mod_perl-2.0 -@dirrm share/doc/html/mod_perl/api/ModPerl-Registry/ModPerl -@dirrm share/doc/html/mod_perl/api/ModPerl-Registry +@dirrm share/doc/html/mod_perl/api/ModPerl +@dirrm share/doc/html/mod_perl/api/Apache +@dirrm share/doc/html/mod_perl/api/APR @dirrm share/doc/html/mod_perl/api @dirrm share/doc/html/mod_perl diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index c4cb6054deb..7e6378c9564 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.3 2003/06/03 19:17:19 epg Exp $ +$NetBSD: distinfo,v 1.4 2004/01/17 12:36:03 bad Exp $ -SHA1 (mod_perl-1.99_08.tar.gz) = 3789332cfe9625209a67aece7443aa37d6d4a61b -Size (mod_perl-1.99_08.tar.gz) = 653469 bytes -SHA1 (patch-aa) = 636688981b26c7e517cd49d2d780ba487f64fb07 +SHA1 (mod_perl-1.99_12.tar.gz) = 0707b0edef1003534709ba1066043276b012ac5d +Size (mod_perl-1.99_12.tar.gz) = 1113684 bytes diff --git a/www/ap2-perl/patches/patch-aa b/www/ap2-perl/patches/patch-aa deleted file mode 100644 index 3ac748331b3..00000000000 --- a/www/ap2-perl/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/06/03 19:17:20 epg Exp $ - ---- lib/Apache/Build.pm.orig Fri Jan 10 23:16:12 2003 -+++ lib/Apache/Build.pm -@@ -771,6 +771,14 @@ my %wanted_apr_config = map { $_, 1} qw( - HAS_INLINE HAS_FORK - ); - -+sub get_apr_includes { -+ $_ = `apr-config --includes`; -+ chomp; -+ s/^\s*-I//; -+ s/\s*$//; -+ return $_; -+} -+ - sub get_apr_config { - my $self = shift; - -@@ -779,7 +787,7 @@ sub get_apr_config { - my $dir = $self->ap_includedir; - - my $header; -- for my $d ($dir, "$dir/../srclib/apr/include") { -+ for my $d ($dir, "$dir/../srclib/apr/include", get_apr_includes()) { - $header = "$d/apr.h"; - last if -e $header; - } -@@ -1150,6 +1158,8 @@ sub includes { - my @inc = $self->file_path("src/modules/perl", "xs"); - - push @inc, $self->mp_include_dir; -+ -+ push @inc, get_apr_includes(); - - unless ($self->ap_prefix_is_source_tree) { - my $ainc = $self->apxs('-q' => 'INCLUDEDIR'); -- cgit v1.2.3