--- a/components/findutils/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/findutils/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -22,14 +22,11 @@
 #
 # Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		findutils
 COMPONENT_VERSION=	4.6.0
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/findutils/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
     sha256:ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
@@ -37,13 +34,9 @@
 
 TPNO=			27155
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/gnu-component.mk
 
-CONFIGURE_PREFIX =	/usr/gnu
-
-CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
+CONFIGURE_PREFIX =	$(USRGNUDIR)
 
 # Fixes coredump in the tests/test-localename test.
 CONFIGURE_OPTIONS  +=	ac_cv_func_newlocale=no
@@ -63,27 +56,14 @@
 	'-e "s|\(Test Run By\).*|\1|" ' \
 	'-e "s|\(Native configuration is\).*|\1|" '
 
-ASLR_MODE = $(ASLR_ENABLE)
-
-configure:	$(CONFIGURE_64)
-
-build:          $(BUILD_64)
-
-install:        $(INSTALL_64)
-
 # Needed for "gmake test" to work successfully.
 # Otherwise we see errors such as:
 # FAIL: exec-nogaps.old-O3, sh: SHELLOPTS: readonly variable
 unexport SHELLOPTS
 
-test:           $(TEST_64)
-
-system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
 
 # test dependencies:
 REQUIRED_PACKAGES += developer/versioning/cvs
 REQUIRED_PACKAGES += developer/versioning/git
 
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math