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.

4 files changed, 62 insertions, 18 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');
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 0c704388b5a..ddf72a5b910 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2003/02/21 05:39:03 lukem Exp $
+$NetBSD: distinfo,v 1.20 2003/06/03 19:17:20 epg Exp $
 
 SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
 Size (php-4.2.3.tar.gz) = 3413829 bytes
 SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9
 SHA1 (patch-ab) = daac6888e758b39bc40abed41eba9e55a0fa30e5
 SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b
-SHA1 (patch-ad) = f1d129a8f0ef45f274a42033c5494e4a0a516f66
+SHA1 (patch-ad) = 452ee7c2ef9cb9456653f376c5cc350e227bf10d
 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78
 SHA1 (patch-ag) = a1948af6361e898880e4598654a8ac15fd193b7d
 SHA1 (patch-ah) = 27ac564d2d378852ba328fbc0458d222a4bfdb22
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 57a67d96dbc..68525a192cf 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
-
---- configure.orig	Thu Sep  5 19:40:53 2002
-+++ configure	Sun Jan 12 09:17:58 2003
+--- configure.orig	Thu Sep  5 23:40:53 2002
++++ configure	Fri May 30 10:04:07 2003
 @@ -3220,9 +3220,10 @@
      { echo "configure: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" 1>&2; exit 1; }
    fi
@@ -28,7 +26,15 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
    echo "$ac_t""yes" 1>&6
-@@ -3951,9 +3953,10 @@
+@@ -3794,6 +3796,7 @@
+ 
+ 
+   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
++  INCLUDES="$INCLUDES `apr-config --includes`"
+ 
+ 
+ 
+@@ -3951,9 +3954,10 @@
  	*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
  	*** Pike version:             $PIKE_VERSION"
          
@@ -41,7 +47,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
  
-@@ -4304,9 +4307,10 @@
+@@ -4304,9 +4308,10 @@
  	fi
  	test -f "$ZEUSPATH/web/include/httpext.h" || { echo "configure: error: Unable to find httpext.h in $ZEUSPATH/web/include" 1>&2; exit 1; }
  	
@@ -54,7 +60,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
  	cat >> confdefs.h <<\EOF
-@@ -4424,9 +4428,10 @@
+@@ -4424,9 +4429,10 @@
    fi
  
    
@@ -67,7 +73,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
    cat >> confdefs.h <<\EOF
-@@ -4454,9 +4459,10 @@
+@@ -4454,9 +4460,10 @@
  		{ echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
  	fi
  	
@@ -80,7 +86,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
  	PHTTPD_DIR=$withval
-@@ -4565,9 +4571,10 @@
+@@ -4565,9 +4572,10 @@
  	fi
  	test -f "$PI3PATH/PiAPI/PiAPI.h" || { echo "configure: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" 1>&2; exit 1; }
  	
@@ -93,7 +99,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
  	cat >> confdefs.h <<\EOF
-@@ -4855,9 +4862,10 @@
+@@ -4855,9 +4863,10 @@
    php_build_target=shared
  
      
@@ -106,7 +112,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    fi
  
      echo "$ac_t""yes" 1>&6
-@@ -5396,10 +5404,6 @@
+@@ -5396,10 +5405,6 @@
  
    fi
  
@@ -117,7 +123,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
  INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
  test -d /usr/ucblib && 
    if test "/usr/ucblib" != "/usr/lib"; then
-@@ -26847,19 +26851,10 @@
+@@ -26847,19 +26852,10 @@
  
  
    else
@@ -137,7 +143,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
    echo "$ac_t""no" 1>&6
  
  fi
-@@ -67729,8 +67724,8 @@
+@@ -67729,8 +67725,8 @@
      if test "$lib_build_shared" != "yes"; then
          enable_shared=no
      fi
@@ -148,7 +154,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
  ;;
  shared)
      enable_static=no
-@@ -72831,7 +72826,7 @@
+@@ -72831,7 +72827,7 @@
  
  TSRM_LIB='TSRM/libtsrm.la'
  TSRM_DIR=TSRM
@@ -157,7 +163,7 @@ $NetBSD: patch-ad,v 1.13 2003/01/12 14:31:58 christos Exp $
  
  if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
    cat >> confdefs.h <<\EOF
-@@ -73625,7 +73620,7 @@
+@@ -73625,7 +73621,7 @@
  
  if test "$enable_debug" != "yes"; then