--- a/components/indri/Makefile	Mon Feb 16 13:54:04 2015 -0800
+++ b/components/indri/Makefile	Sun Feb 15 19:02:09 2015 -0600
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER			 = gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME		= indri
@@ -37,12 +39,11 @@
 
 TPNO=			13668
 
-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
 
 COMPONENT_PRE_CONFIGURE_ACTION	 = $(CLONEY) $(SOURCE_DIR) $(@D)
-COMPILER			 = gcc
 CONFIGURE_OPTIONS		+= "CFLAGS=$(CFLAGS)"
 CONFIGURE_OPTIONS		+= "CXXFLAGS=$(CXXFLAGS)"
 CONFIGURE_OPTIONS		+= "LDFLAGS=$(LDFLAGS)"
@@ -73,6 +74,11 @@
 
 test:           $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += developer/lexer/flex
+REQUIRED_PACKAGES += developer/parser/bison
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/math