--- a/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 07:12:51 2009 +0200
+++ b/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 14:24:34 2009 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)Makefile.sfw	1.28	09/10/29 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.31	09/11/20 SMI"
 
 PHP_REL=5.2
 #
@@ -52,9 +52,6 @@
 IDN_VERSION=0.2.0
 IDN_DIR=idn-$(IDN_VERSION)
 
-DTRACE_VERSION=1.0.3
-DTRACE_DIR=dtrace-$(DTRACE_VERSION)
-
 APC_VERSION=3.0.19
 APC_DIR=APC-$(APC_VERSION)
 
@@ -91,7 +88,7 @@
 		$(ROOT)/$(TOP_DIR) $(ROOT)/$(CONF_DIR)
 
 clean_php_extensions: 
-	-rm -rf $(SUHOSIN_DIR) $(TCPWRAP_DIR) $(IDN_DIR) $(DTRACE_DIR) \
+	-rm -rf $(SUHOSIN_DIR) $(TCPWRAP_DIR) $(IDN_DIR) \
 		$(APC_DIR) $(XDEBUG_DIR) $(MEMCACHE_DIR) 
 
 clean_pear: 
@@ -368,12 +365,12 @@
 # ----- Main extension targets -----
 
 build_php_extensions: extensions_setup \
-			build_suhosin build_tcpwrap build_idn build_dtrace \
+			build_suhosin build_tcpwrap build_idn \
 			build_apc build_xdebug build_memcache
 
 
 install_php_extensions: build_php_extensions \
-            install_suhosin install_tcpwrap install_idn install_dtrace \
+            install_suhosin install_tcpwrap install_idn \
             install_apc install_xdebug install_memcache
 
 extensions_setup: phpize-proto php-config-proto
@@ -464,28 +461,6 @@
 	touch $(IDN_DIR)/configure
 
 
-# ----- Extension targets for: dtrace -----
-
-build_dtrace: extensions_setup $(DTRACE_DIR)/config.status
-	(cd $(DTRACE_DIR); $(CCSMAKE) -e)
-
-install_dtrace: build_dtrace
-	/usr/ucb/install $(DTRACE_DIR)/modules/dtrace.so \
-		$(ROOT)/$(TOP_DIR)/modules/
-
-$(DTRACE_DIR)/config.status: $(DTRACE_DIR)/configure
-	(cd $(DTRACE_DIR); \
-	    env - $(ENVLINE) ../phpize-proto; \
-	    env - $(ENVLINE) sh ./configure \
-		--with-dtrace \
-		--with-php-config=../php-config-proto )
-
-$(DTRACE_DIR)/configure: $(DTRACE_DIR).tar.gz
-	gzip -dc $(DTRACE_DIR).tar.gz | tar xopf -
-	(cd $(DTRACE_DIR); \
-	    gpatch -i ../patches/dtrace.patch)
-	touch $(DTRACE_DIR)/configure
-
 # ----- Extension targets for: APC -----
 
 build_apc: extensions_setup $(APC_DIR)/config.status
@@ -513,7 +488,8 @@
 		gpatch -p1 -i ../patches/apc_pool.c.patch && \
 		gpatch -p1 -i ../patches/apc_cache.c.patch && \
 		gpatch -p1 -i ../patches/apc_main.c.patch && \
-		gpatch -p1 -i ../patches/apc_sem.c.patch )
+		gpatch -p1 -i ../patches/apc_sem.c.patch && \
+		gpatch -p1 -i ../patches/apc_reserved_offset.patch)
 	touch $(APC_DIR)/configure