--- a/components/libusb/ugen/Makefile	Wed Mar 30 21:08:18 2016 -0700
+++ b/components/libusb/ugen/Makefile	Wed Mar 30 18:36:13 2016 -0700
@@ -33,7 +33,7 @@
 COMPONENT_BUGDB=	library/libusb
 
 BUILD_STYLE= justmake
-include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/common.mk
 
 $(BUILD_DIR_32)/.built:	BITS=32
 $(BUILD_DIR_64)/.built:	BITS=64

--- a/components/meta-packages/developer-opensolaris-userland/Makefile	Wed Mar 30 21:08:18 2016 -0700
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile	Wed Mar 30 18:36:13 2016 -0700
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		developer/opensolaris/userland
 COMPONENT_VERSION=
 COMPONENT_SRC=
+COMPONENT_ARCHIVE=
 COMPONENT_PROJECT_URL=	http://solaris-userland.java.net/
 COMPONENT_ARCHIVE_URL=	http://hg.java.net/solaris-userland-gate/
 COMPONENT_BUGDB=	gate-stuff/userland

--- a/components/meta-packages/evaluation/Makefile	Wed Mar 30 21:08:18 2016 -0700
+++ b/components/meta-packages/evaluation/Makefile	Wed Mar 30 18:36:13 2016 -0700
@@ -20,14 +20,13 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-
 include ../../../make-rules/shared-macros.mk
-include $(WS_MAKE_RULES)/prep.mk
 
 COMPONENT_NAME=		evaluation
 COMPONENT_VERSION=	1.0
+COMPONENT_SRC=
 COMPONENT_BUGDB=	gate-stuff/userland
 
 ifneq ($(BUILD_TYPE), evaluation)
@@ -38,4 +37,5 @@
 CLEAN_PATHS=	$(BUILD_DIR)
 CLOBBER_PATHS=	$(BUILD_DIR)
 
-include $(WS_MAKE_RULES)/ips.mk
+BUILD_STYLE= pkg
+include $(WS_MAKE_RULES)/common.mk

--- a/components/meta-packages/group-feature/Makefile	Wed Mar 30 21:08:18 2016 -0700
+++ b/components/meta-packages/group-feature/Makefile	Wed Mar 30 18:36:13 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		meta-packages/group-feature
 COMPONENT_VERSION=	$(PKG_SOLARIS_VERSION)
 COMPONENT_SRC=
+COMPONENT_ARCHIVE=
 COMPONENT_PROJECT_URL=	http://solaris-userland.java.net/
 COMPONENT_ARCHIVE_URL=	http://hg.java.net/solaris-userland-gate/
 COMPONENT_BUGDB=	gate-stuff/userland

--- a/components/meta-packages/history/Makefile	Wed Mar 30 21:08:18 2016 -0700
+++ b/components/meta-packages/history/Makefile	Wed Mar 30 18:36:13 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -29,7 +29,7 @@
 # the automatic (and lengthy) manifest manipulation that it does, which we
 # really don't need to do for these static, uninteresting packages.  So we just
 # write a simple set of publication rules to get the packages into the repo.
-
+COMPONENT_SRC=
 include $(WS_MAKE_RULES)/prep.mk
 
 PKGSEND =	/usr/bin/pkgsend

--- a/make-rules/common.mk	Wed Mar 30 21:08:18 2016 -0700
+++ b/make-rules/common.mk	Wed Mar 30 18:36:13 2016 -0700
@@ -28,6 +28,15 @@
 # userland components.
 #
 
+# Assume that if no COMPONENT_ARCHIVE_URL or COMPONENT_ARCHIVE_SRC has been
+# defined that no COMPONENT_ARCHIVE exists; this allows providing a default
+# value for COMPONENT_ARCHIVE while avoiding prep errors.
+ifndef COMPONENT_ARCHIVE_URL
+ifndef COMPONENT_ARCHIVE_SRC
+COMPONENT_ARCHIVE=
+endif
+endif
+
 include $(WS_MAKE_RULES)/prep.mk
 
 # Override this to limit builds and publication to a single architecture.
@@ -102,15 +111,6 @@
 endif # BUILD_STYLE ant
 endif # findstring library
 
-# Assume that if no COMPONENT_ARCHIVE_URL or COMPONENT_ARCHIVE_SRC has been
-# defined that no COMPONENT_ARCHIVE exists; this allows providing a default
-# value for COMPONENT_ARCHIVE while avoiding prep errors.
-ifndef COMPONENT_ARCHIVE_URL
-ifndef COMPONENT_ARCHIVE_SRC
-COMPONENT_ARCHIVE=
-endif
-endif
-
 # Determine if we should automatically include lint libraries in build and
 # install targets based on presence of llib* files in component directory. This
 # must be done before defining any common targets since the include affects