--- a/components/php-5_3/Makefile	Wed Dec 10 06:45:39 2014 -0800
+++ b/components/php-5_3/Makefile	Fri Dec 12 13:24:29 2014 -0800
@@ -21,6 +21,9 @@
 # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
+
+TPNO_PHP_SUHOSIN=	17559
+
 include ../../make-rules/ips.mk
 
 ##

--- a/components/php-5_3/php-suhosin.p5m	Wed Dec 10 06:45:39 2014 -0800
+++ b/components/php-5_3/php-suhosin.p5m	Fri Dec 12 13:24:29 2014 -0800
@@ -38,7 +38,7 @@
     com.oracle.info.description="the Suhosin extension module for PHP" \
     com.oracle.info.name=php-suhosin \
     com.oracle.info.version=0.9.33 \
-    com.oracle.info.tpno=17131
+    com.oracle.info.tpno=$(TPNO_PHP_SUHOSIN)
 
 file path=etc/php/5.3/conf.d/suhosin.ini mode=0644 preserve=renamenew
 file path=etc/php/5.3/zts-conf.d/suhosin.ini mode=0644 preserve=renamenew

--- a/make-rules/ips.mk	Wed Dec 10 06:45:39 2014 -0800
+++ b/make-rules/ips.mk	Fri Dec 12 13:24:29 2014 -0800
@@ -91,6 +91,12 @@
 PKG_MACROS +=		COMPONENT_HG_REV=$(COMPONENT_HG_REV)
 PKG_MACROS +=		COMPONENT_NAME=$(COMPONENT_NAME)
 PKG_MACROS +=		TPNO=$(TPNO)
+
+# Add any TPNO_* Makefile macros to the pkgmogrify arguments.
+$(foreach macro, $(filter TPNO_%, $(.VARIABLES)), \
+    $(eval PKG_MACROS += $(macro)=$$($(macro))) \
+)
+
 PKG_MACROS +=		PYTHON_2.6_ONLY=\#
 PKG_MACROS +=		PYTHON_2.7_ONLY=\#