diff -r 3781477accf3 -r 20c0f21bbe1e components/perl_modules/perl-tk/Makefile --- a/components/perl_modules/perl-tk/Makefile Thu Mar 19 14:35:58 2015 -0700 +++ b/components/perl_modules/perl-tk/Makefile Thu Mar 19 20:44:31 2015 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# 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 @@ -39,9 +39,9 @@ # Only build for the default version, since 5.8.4 is almost dead PERL_VERSIONS = $(PERL_VERSION) -include $(WS_TOP)/make-rules/prep.mk -include $(WS_TOP)/make-rules/ips.mk -include $(WS_TOP)/make-rules/makemaker.mk +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/ips.mk +include $(WS_MAKE_RULES)/makemaker.mk # override LIBS so that the Tk.so RunPATH doesn't get set. CONFIGURE_OPTIONS += LIBS="-lXft -lX11 -lfontconfig -lm -lc" @@ -57,6 +57,12 @@ test: $(TEST_32) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += runtime/perl-512 +REQUIRED_PACKAGES += runtime/perl-584 +REQUIRED_PACKAGES += runtime/tk-8 +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/fontconfig +REQUIRED_PACKAGES += system/library/math +REQUIRED_PACKAGES += x11/library/libx11 +REQUIRED_PACKAGES += x11/library/libxft