--- a/components/pixz/Makefile	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/pixz/Makefile	Wed Mar 30 13:33:31 2016 -0700
@@ -17,31 +17,27 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
+#
 
 #
 # Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
+BUILD_BITS= 64
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pixz
 COMPONENT_VERSION=	1.0.6
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://github.com/vasi/pixz/
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:c54a406dddc6c2226779aeb4b5d5b5649c1d3787b39794fbae218f7535a1af63
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB=	utility/pixz
 
 TPNO=			27449
 
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_64)
+include $(WS_MAKE_RULES)/common.mk
 
 PKG_PROTO_DIRS += $(BUILD_DIR_64)
-PKG_PROTO_DIRS += $(COMPONENT_DIR)/files
 
 # Needed to make the tests work, now we use configure.mk not justmake.mk.
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -74,23 +70,11 @@
 COMPONENT_TEST_TARGETS =
 
 COMPONENT_SYSTEM_TEST_ENV =	PATH=$(GNUBIN):$(PATH)
-COMPONENT_SYSTEM_TEST_ENV +=	PIXZ_BIN=/usr/bin/pixz
+COMPONENT_SYSTEM_TEST_ENV +=	PIXZ_BIN=$(USRBINDIR)/pixz
 COMPONENT_SYSTEM_TEST_CMD =	$(SOURCE_DIR)/test.sh
 COMPONENT_SYSTEM_TEST_ARGS =	src/pixz-test-tarball.tar pixz.c
 COMPONENT_SYSTEM_TEST_TARGETS =
 
-ASLR_MODE = $(ASLR_ENABLE)
-
-build:		$(BUILD_64)
-
-install:	$(BUILD_64)
-
-test:		$(TEST_64)
-
-system-test:    build $(SYSTEM_TEST_64)
-
-
 REQUIRED_PACKAGES += compress/xz
 REQUIRED_PACKAGES += library/libarchive
-REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math