--- a/usr/src/cmd/php5/Makefile.sfw	Sun Feb 17 18:32:42 2013 +0000
+++ b/usr/src/cmd/php5/Makefile.sfw	Sun Feb 17 18:33:31 2013 +0000
@@ -425,7 +425,8 @@
 		gpatch -p1 -i ../patches/php_perf_safe_address.patch && \
 		gpatch -p1 -i ../patches/php_pdo_stmt_race.patch && \
 		gpatch -p1 -i ../patches/php_perf_nsapi.c.patch && \
-		gpatch -p1 -i ../patches/php_run-tests.php.patch)
+		gpatch -p1 -i ../patches/php_run-tests.php.patch && \
+		gpatch -p1 -i ../patches/php_divert.patch)
 	(cd $(PHP_DIR); env - $(PRECONF_ENVLINE) \
 	    $(CONFIG_SHELL) ./buildconf --force )
 	(cd $(PHP_DIR); \
@@ -717,6 +718,8 @@
 
 $(XDEBUG_DIR)/configure: $(XDEBUG_DIR).tar.gz
 	gzip -dc $(XDEBUG_DIR).tar.gz | tar xopf -
+	(cd $(XDEBUG_DIR) && \
+	    gpatch -p1 -i ../patches/xdebug_divert.patch)
 	touch $(XDEBUG_DIR)/configure
 	mkdir -p $(XDEBUG_ZTS)
 	(cd $(XDEBUG_DIR); tar cf - .) | (cd $(XDEBUG_ZTS); tar xpf -)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/php_divert.patch	Sun Feb 17 18:33:31 2013 +0000
@@ -0,0 +1,68 @@
+--- php-5.2.17/configure.in.orig	Thu Jan 19 05:56:12 2012
++++ php-5.2.17/configure.in	Thu Jan 19 05:56:27 2012
+@@ -1,7 +1,6 @@
+ ## $Id: configure.in 307193 2011-01-06 23:01:19Z iliaa $ -*- autoconf -*-
+ dnl ## Process this file with autoconf to produce a configure script.
+ 
+-divert(1)
+ 
+ dnl ## Diversion 1 is the autoconf + automake setup phase. We also
+ dnl ## set the PHP version, deal with platform-specific compile
+@@ -256,7 +255,6 @@
+ sinclude(TSRM/tsrm.m4)
+ 
+ 
+-divert(2)
+ 
+ dnl ## Diversion 2 is where we set PHP-specific options and come up
+ dnl ## with reasonable default values for them. We check for pthreads here
+@@ -295,7 +293,6 @@
+   PTHREADS_FLAGS
+ fi
+ 
+-divert(3)
+ 
+ dnl ## In diversion 3 we check for compile-time options to the PHP
+ dnl ## core and how to deal with different system dependencies.
+@@ -655,7 +652,6 @@
+   PHP_CRYPT_R_STYLE
+ fi
+ 
+-divert(4)
+ 
+ dnl ## In diversion 4 we check user-configurable general settings.
+ 
+@@ -913,7 +909,6 @@
+   AC_MSG_RESULT([using system default])
+ fi
+ 
+-divert(5)
+ 
+ dnl ## In diversion 5 we check which extensions should be compiled.
+ dnl ## All of these are normally in the extension directories.
+--- php-5.2.17/ext/standard/config.m4.orig	Thu Jan 19 05:57:19 2012
++++ php-5.2.17/ext/standard/config.m4	Thu Jan 19 05:59:05 2012
+@@ -1,6 +1,5 @@
+ dnl $Id: config.m4 291364 2009-11-27 23:41:13Z rasmus $ -*- autoconf -*-
+ 
+-divert(3)dnl
+ 
+ dnl
+ dnl Check if flush should be called explicitly after buffered io
+@@ -205,7 +204,6 @@
+ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
+ AC_FUNC_FNMATCH	
+ 
+-divert(5)dnl
+ 
+ dnl
+ dnl Check for regex library type
+--- php-5.2.17/scripts/phpize.m4.orig	Thu Jan 19 05:57:11 2012
++++ php-5.2.17/scripts/phpize.m4	Thu Jan 19 05:58:52 2012
+@@ -1,6 +1,5 @@
+ dnl This file becomes configure.in for self-contained extensions.
+ 
+-divert(1)
+ 
+ AC_PREREQ(2.13)
+ AC_INIT(config.m4)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/xdebug_divert.patch	Sun Feb 17 18:33:31 2013 +0000
@@ -0,0 +1,18 @@
+--- xdebug-2.0.5/debugclient/configure.in.orig	Thu Jan 19 06:10:42 2012
++++ xdebug-2.0.5/debugclient/configure.in	Thu Jan 19 06:11:00 2012
+@@ -3,7 +3,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl
+ 
+-divert(1)
+ 
+ dnl
+ dnl Start
+@@ -19,7 +18,6 @@
+ # This is needed if SUBDIRS is set
+ AC_PROG_MAKE_SET
+ 
+-divert(2)
+ dnl
+ dnl Checks for working compiler and other programs needed.
+ dnl