--- a/components/clisp/Makefile	Mon Feb 16 13:54:04 2015 -0800
+++ b/components/clisp/Makefile	Sun Feb 15 19:02:09 2015 -0600
@@ -20,9 +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.
 #
 
+COMPILER=	gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		clisp
@@ -37,9 +39,9 @@
 
 TPNO=			8347
 
-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
 
 # To include correct locale header file in .../modules/regexp/gllib/regex.c
 CPPFLAGS += -I/usr/share/gettext/intl
@@ -60,8 +62,6 @@
 COMPONENT_POST_CONFIGURE_ACTION = \
 	$(COMPONENT_POST_CONFIGURE_ACTION.$(MACH))
 
-COMPILER=	gcc
-
 PATCH_LEVEL=	0
 
 # SHELLOPTS appears to cause clisp's configure script to fail while
@@ -113,6 +113,10 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libsigsegv
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math