--- a/components/diffstat/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/diffstat/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -18,14 +18,16 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		diffstat
 COMPONENT_VERSION=	1.61
 COMPONENT_PROJECT_URL=	http://invisible-island.net/diffstat/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:25359e0c27183f997b36c9202583b5dc2df390c20e22a92606af4bf7856a55ee
@@ -34,11 +36,11 @@
 
 TPNO=			27077
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+SYSTEM_TEST_TARGET= $(SYSTEM_TEST_64)
+include $(WS_MAKE_RULES)/common.mk
 
-CC += $(CC_BITS)
+# Fix 64-bit linking done via compiler.
+LDFLAGS += $(CC_BITS)
 
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/^Checking/d" '
@@ -50,21 +52,7 @@
 COMPONENT_TEST_TARGETS =
 
 COMPONENT_SYSTEM_TEST_DIR =	$(SOURCE_DIR)
-COMPONENT_SYSTEM_TEST_ENV =	PATH=/usr/bin:$(SOURCE_DIR):$(PATH)
+COMPONENT_SYSTEM_TEST_ENV =	PATH=$(USRBINDIR):$(SOURCE_DIR):$(PATH)
 COMPONENT_SYSTEM_TEST_CMD =	./testing/run_test.sh
 COMPONENT_SYSTEM_TEST_ARGS =	./testing/case*.pat
 COMPONENT_SYSTEM_TEST_TARGETS =
-
-ASLR_MODE = $(ASLR_ENABLE)
-
-configure:	$(CONFIGURE_64)
-
-build:		$(BUILD_64)
-
-install:	$(INSTALL_64)
-
-test:		$(TEST_64)
-
-system-test:    $(SYSTEM_TEST_64)
-
-REQUIRED_PACKAGES += system/library