3 files changed, 42 insertions, 15 deletions
diff --git a/lang/php4/files/patch-configure.in b/lang/php4/files/patch-configure.in
index b3e0c11e4777..8359580c8dfe 100644
--- a/lang/php4/files/patch-configure.in
+++ b/lang/php4/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Fri May  5 08:06:58 2006
-+++ configure.in	Fri May  5 08:09:15 2006
-@@ -261,7 +261,6 @@ dnl ## Apache module, CGI etc.)
+--- configure.in.orig	Sat Jan 20 10:56:56 2007
++++ configure.in	Sat Jan 20 10:57:33 2007
+@@ -261,7 +261,6 @@
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAME
  PHP_SAPI=default
-@@ -287,7 +286,6 @@ AC_MSG_RESULT([$PHP_SAPI])
+@@ -287,7 +286,6 @@
  
  if test "$enable_experimental_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
@@ -16,7 +16,16 @@
  fi
  
  if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-@@ -1235,18 +1233,15 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libto
+@@ -1058,7 +1056,7 @@
+ EXPANDED_DATADIR=$datadir
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
+-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
++INCLUDE_PATH=.:${prefix}/share/pear
+ 
+ exec_prefix=$old_exec_prefix
+ libdir=$old_libdir
+@@ -1235,18 +1233,15 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in
index dc9a457f077c..cb22e3f33844 100644
--- a/lang/php5/files/patch-configure.in
+++ b/lang/php5/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Wed Apr 26 16:08:26 2006
-+++ configure.in	Thu May  4 08:55:35 2006
-@@ -222,7 +222,6 @@
+--- configure.in.orig	Sat Jan 20 10:52:51 2007
++++ configure.in	Sat Jan 20 10:55:48 2007
+@@ -227,7 +227,6 @@
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_SAPI=default
-@@ -247,7 +246,6 @@
+@@ -252,7 +251,6 @@
  
  if test "$enable_maintainer_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
@@ -16,7 +16,16 @@
  fi
  
  if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-@@ -1248,25 +1246,22 @@
+@@ -1100,7 +1098,7 @@
+ EXPANDED_DATADIR=$datadir
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
+-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
++INCLUDE_PATH=.:${prefix}/share/pear
+ 
+ exec_prefix=$old_exec_prefix
+ libdir=$old_libdir
+@@ -1271,25 +1269,22 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
diff --git a/lang/php53/files/patch-configure.in b/lang/php53/files/patch-configure.in
index dc9a457f077c..cb22e3f33844 100644
--- a/lang/php53/files/patch-configure.in
+++ b/lang/php53/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Wed Apr 26 16:08:26 2006
-+++ configure.in	Thu May  4 08:55:35 2006
-@@ -222,7 +222,6 @@
+--- configure.in.orig	Sat Jan 20 10:52:51 2007
++++ configure.in	Sat Jan 20 10:55:48 2007
+@@ -227,7 +227,6 @@
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_SAPI=default
-@@ -247,7 +246,6 @@
+@@ -252,7 +251,6 @@
  
  if test "$enable_maintainer_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
@@ -16,7 +16,16 @@
  fi
  
  if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-@@ -1248,25 +1246,22 @@
+@@ -1100,7 +1098,7 @@
+ EXPANDED_DATADIR=$datadir
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
+-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
++INCLUDE_PATH=.:${prefix}/share/pear
+ 
+ exec_prefix=$old_exec_prefix
+ libdir=$old_libdir
+@@ -1271,25 +1269,22 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"