--- a/components/pixz/Makefile	Tue Mar 29 09:21:13 2016 +0100
+++ b/components/pixz/Makefile	Tue Mar 29 08:04:20 2016 -0700
@@ -17,47 +17,51 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
+
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		pixz
-COMPONENT_VERSION=	1.0
+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:912c60de88f7eca2e1c6fe13eec5371f723018dca933796c47cd50bf6a349fc9
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)archive/$(COMPONENT_ARCHIVE)
+    sha256:c54a406dddc6c2226779aeb4b5d5b5649c1d3787b39794fbae218f7535a1af63
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/pixz
 
-TPNO=			11623
+TPNO=			27449
 
 include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.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))
+
 # Userland default includes -mt which links with libthread which we don't need.
 studio_MT =
 
-# pixz's Makefile hard-codes some gcc-only flags in MYCFLAGS and MYLDFLAGS,
-# then appends CFLAGS & LDFLAGS to each.  Here we include their preset values
-# minus the gcc-only parts, so we can build with Studio.
+# pixz's src/Makefile hard-codes some gcc-only flags in pixz_CFLAGS.
+# Here we exclude the gcc-only parts, so we can build with Studio.
+# PTHREAD_CFLAGS is defined in the pixz .../src/Makefile.
 COMPONENT_BUILD_ARGS += CC="$(CC)"
-COMPONENT_BUILD_ARGS += MYCFLAGS='$(patsubst %,-I%/include,$(LIBPREFIX)) $(OPT)'
-COMPONENT_BUILD_ARGS += MYLDFLAGS='$(patsubst %,-L%/lib,$(LIBPREFIX)) $(OPT)'
+COMPONENT_BUILD_ARGS += pixz_CFLAGS="$(PTHREAD_CFLAGS)"
 COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
 COMPONENT_BUILD_ARGS += LDFLAGS="$(CC_BITS)"
 
 # Create a small testball to use with the test script.
 COMPONENT_PRE_TEST_ACTION = \
-	(cd $(@D); tar cvf pixz-test-tarball.tar  *.c *.o)
+	(cd $(@D)/src; tar cvf pixz-test-tarball.tar  *.c *.o)
 COMPONENT_PRE_SYSTEM_TEST_ACTION = \
-	(cd $(@D); tar cvf pixz-test-tarball.tar  *.c *.o)
+	(cd $(@D)/src; tar cvf pixz-test-tarball.tar  *.c *.o)
 
 COMPONENT_TEST_TRANSFORMS += \
 	'-e "/^real/d" ' \
@@ -66,13 +70,13 @@
 
 COMPONENT_TEST_ENV =		PATH=$(GNUBIN):$(PATH)
 COMPONENT_TEST_CMD =		$(SOURCE_DIR)/test.sh
-COMPONENT_TEST_ARGS =		pixz-test-tarball.tar pixz.c
+COMPONENT_TEST_ARGS =		src/pixz-test-tarball.tar pixz.c
 COMPONENT_TEST_TARGETS =
 
 COMPONENT_SYSTEM_TEST_ENV =	PATH=$(GNUBIN):$(PATH)
 COMPONENT_SYSTEM_TEST_ENV +=	PIXZ_BIN=/usr/bin/pixz
 COMPONENT_SYSTEM_TEST_CMD =	$(SOURCE_DIR)/test.sh
-COMPONENT_SYSTEM_TEST_ARGS =	pixz-test-tarball.tar pixz.c
+COMPONENT_SYSTEM_TEST_ARGS =	src/pixz-test-tarball.tar pixz.c
 COMPONENT_SYSTEM_TEST_TARGETS =
 
 ASLR_MODE = $(ASLR_ENABLE)
@@ -89,3 +93,4 @@
 REQUIRED_PACKAGES += compress/xz
 REQUIRED_PACKAGES += library/libarchive
 REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math

--- a/components/pixz/patches/system-test.patch	Tue Mar 29 09:21:13 2016 +0100
+++ b/components/pixz/patches/system-test.patch	Tue Mar 29 08:04:20 2016 -0700
@@ -8,7 +8,7 @@
  tarball=$1
  sample=$2
  
-+PIXZ="${PIXZ_BIN:-./pixz}"
++PIXZ="${PIXZ_BIN:-./src/pixz}"
 +
  echo XZ
  time xz -c < "$tarball" > test.txz

--- a/components/pixz/pixz.p5m	Tue Mar 29 09:21:13 2016 +0100
+++ b/components/pixz/pixz.p5m	Tue Mar 29 08:04:20 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
@@ -38,6 +38,6 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/358
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file pixz path=usr/bin/pixz
+file src/pixz path=usr/bin/pixz
 file pixz.1 path=usr/share/man/man1/pixz.1
 license LICENSE license=BSD-like

--- a/components/pixz/test/results-64.master	Tue Mar 29 09:21:13 2016 +0100
+++ b/components/pixz/test/results-64.master	Tue Mar 29 08:04:20 2016 -0700
@@ -14,6 +14,6 @@
 d41d8cd98f00b204e9800998ecf8427e  -
 
 
-512	pixz-test-tarball.tar
+512	src/pixz-test-tarball.tar
 512	test.tpxz
 512	test.txz