diff options
| author | epg <epg@pkgsrc.org> | 2003-06-03 19:17:19 +0000 |
|---|---|---|
| committer | epg <epg@pkgsrc.org> | 2003-06-03 19:17:19 +0000 |
| commit | a010fb6cebfe806151115d0c57d9531ab096dce6 (patch) | |
| tree | 84c528e455d7c0596374f26dd3c5054ba814d0ad /www/ap2-perl | |
| parent | e8fe086d5211bb5f926341705d1028e6bfdf45bb (diff) | |
| download | pkgsrc-a010fb6cebfe806151115d0c57d9531ab096dce6.tar.gz | |
Teach ap2-perl and ap2-php4 how to find apr's includes. They need to
find this separately now that apr is provided in a separate package.
Diffstat (limited to 'www/ap2-perl')
| -rw-r--r-- | www/ap2-perl/distinfo | 3 | ||||
| -rw-r--r-- | www/ap2-perl/patches/patch-aa | 37 |
2 files changed, 39 insertions, 1 deletions
diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index f8656ad84b3..c4cb6054deb 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2003/02/03 20:18:03 drochner Exp $ +$NetBSD: distinfo,v 1.3 2003/06/03 19:17:19 epg Exp $ SHA1 (mod_perl-1.99_08.tar.gz) = 3789332cfe9625209a67aece7443aa37d6d4a61b Size (mod_perl-1.99_08.tar.gz) = 653469 bytes +SHA1 (patch-aa) = 636688981b26c7e517cd49d2d780ba487f64fb07 diff --git a/www/ap2-perl/patches/patch-aa b/www/ap2-perl/patches/patch-aa new file mode 100644 index 00000000000..3ac748331b3 --- /dev/null +++ b/www/ap2-perl/patches/patch-aa @@ -0,0 +1,37 @@ +$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'); |