--- a/components/zsh/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/zsh/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
-include ../../make-rules/shared-targets.mk
+include $(WS_MAKE_RULES)/shared-targets.mk
 
 COMPONENT_NAME=		zsh
 COMPONENT_VERSION=	5.0.7
@@ -38,9 +38,9 @@
 
 TPNO=			19477
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS += -n
 CONFIGURE_OPTIONS += --bindir=/usr/bin
@@ -108,6 +108,9 @@
 # build does this always
 test:		$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker