--- a/components/xmlto/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/xmlto/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -37,9 +37,9 @@
 
 TPNO=			13394
 
-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
 
 # These will be used by the xmlto script.
 CONFIGURE_ENV += FIND="/usr/gnu/bin/find"
@@ -60,6 +60,12 @@
 
 test:		$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += file/gnu-coreutils
+REQUIRED_PACKAGES += file/gnu-findutils
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/libxslt
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/gnu-getopt
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += text/gnu-grep