--- a/components/samba/samba/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/samba/samba/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -60,15 +60,15 @@
 COMPILER = gcc3
 endif
 
-include ../../../make-rules/prep.mk
+include $(WS_MAKE_RULES)/prep.mk
 
 SRC_OFFSET =	source3
 # Now we override paths to .built
 BUILD_DIR_32 = $(BUILD_DIR)/$(MACH32)/$(SRC_OFFSET)
 BUILD_DIR_64 = $(BUILD_DIR)/$(MACH64)/$(SRC_OFFSET)
 
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_SCRIPT = $(BUILD_DIR_$(BITS))/configure
 
@@ -224,8 +224,6 @@
 # common targets
 build:		$(BUILD_32_and_64)
 
-include ../../../make-rules/shared-targets.mk
-
 install:	$(PROTO_DIR)/etc/samba/smb.conf-example $(INSTALL_32_and_64)
 
 test:		$(NO_TESTS)
@@ -233,6 +231,22 @@
 clean::
 	$(GMAKE) -C $(COMPONENT_DIR)/../mozldap clean
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/file-monitor/gamin
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/popt
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += library/samba/libsmbclient
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += service/security/kerberos-5
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/gcc-45-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/security/gss
+REQUIRED_PACKAGES += system/network
+REQUIRED_PACKAGES += system/network/avahi