--- a/components/php-5_3/imap/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/php-5_3/imap/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -31,9 +31,9 @@
 COMPONENT_ARCHIVE_URL=	ftp://ftp.cac.washington.edu/imap/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.washington.edu/imap/
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/justmake.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CFLAGS += $(CPP_LARGEFILES)
 # enable legacy stdio prototypes
@@ -59,6 +59,4 @@
 
 publish:	build
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk