--- a/components/php-5_3/php-sapi/Makefile	Fri Oct 10 10:07:08 2014 -0700
+++ b/components/php-5_3/php-sapi/Makefile	Thu Nov 20 15:41:15 2014 -0800
@@ -100,6 +100,7 @@
 CONFIGURE_ENV += $(CONF_ENVLINE)
 
 COMPONENT_POST_BUILD_ACTION = ( \
+	set -e; \
 	cat $(BUILD_DIR_32)/scripts/phpize | \
 	 sed -e "s,^\#!/bin/sh,\#!$(CONFIG_SHELL)," | \
 	 sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
@@ -112,13 +113,15 @@
 	 sed -e "s%^builddir=.*%builddir=$(BUILD_DIR_32)%" \
 	 > phpize-proto ; \
 	chmod 755 phpize-proto ) ; \
-	( cat $(BUILD_DIR_32)/scripts/php-config | \
+	( set -e; \
+	 cat $(BUILD_DIR_32)/scripts/php-config | \
 	 sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
 	 sed -e "s%^prefix=.*%prefix=$(BUILD_DIR_32)%" | \
 	 sed -e "s%^include_dir=.*%include_dir=$(BUILD_DIR_32)%" \
 	 > php-config-proto ; \
 	chmod 755 php-config-proto ) ; \
-	( cat $(BUILD_DIR_32)/scripts/php-config | \
+	( set -e; \
+	 cat $(BUILD_DIR_32)/scripts/php-config | \
 	 sed -e "s,^\#! /bin/sh,\#!$(CONFIG_SHELL)," | \
 	 sed -e "s%^prefix=.*%prefix=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
 	 sed -e "s%^include_dir=.*%include_dir=$(COMPONENT_DIR)/../php-nsapi/$(COMPONENT_SRC)%" | \
@@ -127,6 +130,7 @@
 	chmod 755 php-config-proto.zts )
 
 ADD_APACHE2_MODULE_SUPPORT = ( \
+	set -e; \
 	$(MKDIR) $(PROTO_DIR)/$(APACHE2_PHP); \
 	$(INSTALL) -m 0644 $(COMPONENT_DIR)/../Solaris/php$(PHP_REL).conf \
 		$(PROTO_DIR)/$(APACHE2_PHP)/php$(PHP_REL).conf; \
@@ -139,19 +143,26 @@
 	)
 
 # Ship a default php.ini to simplify ease of use.
+# Replace the php.ini-production symlink with a copy of the real file because
+# gpatch no longer follows symlinks.
 FIX_CONFIG_FILES = ( \
+	set -e; \
 	cd $(BUILD_DIR_32); \
+	$(RM) php.ini-production; \
+	$(CP) $(SOURCE_DIR)/php.ini-production .; \
 	$(GPATCH) -p0 -o php.ini-patched -i ../../patches-other/php_ini.patch; \
 	$(GSED) -e "s@<<VERSION>>@$(PHP_REL)@g" < php.ini-patched > php.ini; \
 	$(INSTALL) -m 644 php.ini $(PROTO_DIR)/$(CONF_DIR)/php.ini; \
 	)
 
 INSTALL_DOCS = ( \
+	set -e; \
 	$(MKDIR) $(PROTO_DIR)/$(DOCDIR); \
 	$(UNPACK) -r $(PROTO_DIR)/$(DOCDIR) $(COMPONENT_ARCHIVE_1); \
 	)
 
 INSTALL_SAMPLES = ( \
+	set -e; \
 	$(MKDIR) $(PROTO_DIR)/$(SCRIPTS_DIR); \
 	$(MKDIR) $(COMPONENT_DIR)/tmp; \
 	cd $(COMPONENT_DIR); \
@@ -172,6 +183,7 @@
 
 # patch installation to support pear installation.
 PATCH_PEAR = ( \
+	set -e; \
 	cd $(PROTO_DIR)/$(PHP_BIN); \
 	$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_pecl.patch; \
 	$(GPATCH) -N -i $(COMPONENT_DIR)/patches-other/pear_php_config.patch; \
@@ -186,6 +198,7 @@
 # Create symbolic links
 # Not strictly necessary but makes the proto area more correct.
 CREATE_SYMLINKS = ( \
+	set -e; \
 	cd $(PROTO_DIR)/usr/php; \
 	$(RM) bin lib include modules doc man; \
 	$(SYMLINK) $(PHP_REL)/bin . ; \
@@ -204,6 +217,7 @@
 	)
 
 COMPONENT_POST_INSTALL_ACTION = ( \
+	set -e; \
 	$(ADD_APACHE2_MODULE_SUPPORT); \
 	$(FIX_CONFIG_FILES); \
 	$(FIX_CONFIG_FILES_2); \