--- a/components/ruby/puppet/Makefile	Wed Feb 24 10:43:57 2016 -0600
+++ b/components/ruby/puppet/Makefile	Mon Feb 22 13:47:58 2016 -0500
@@ -54,12 +54,11 @@
 	(cd ../hiera ; $(GMAKE) install)
 
 
-# Collect puppet module manifests for inclusion of puppet modules in group depends
-# declare a prereq on all manifests to update depend file as needed
-PUPPET_MODULE_MANIFESTS = $(wildcard $(WS_TOP)/components/ruby/puppet-modules/*-*/*.p5m)
-$(BUILD_DIR)/puppet-modules.depend: $(PUPPET_MODULE_MANIFESTS) $(BUILD_DIR)
-	$(PKGMOGRIFY) -i -O /dev/null -P [email protected] $(WS_TRANSFORMS)/group-dependency $(PUPPET_MODULE_MANIFESTS)
-build:: $(BUILD_DIR)/puppet-modules.depend
+# Collect and print puppet module manifests for cherry picking into group
+# dependencies as a helper for the package maintainer
+PUPPET_MODULE_MANIFESTS = $(sort $(wildcard $(WS_TOP)/components/ruby/puppet-modules/*-*/*.p5m))
+print-modules: $(PUPPET_MODULE_MANIFESTS)
+	$(PKGMOGRIFY) -i -O /dev/null $(WS_TRANSFORMS)/group-dependency $(PUPPET_MODULE_MANIFESTS)
 
 
 # set the bindir to /usr/sbin

--- a/components/ruby/puppet/puppet.p5m	Wed Feb 24 10:43:57 2016 -0600
+++ b/components/ruby/puppet/puppet.p5m	Mon Feb 22 13:47:58 2016 -0500
@@ -27,7 +27,6 @@
 # .py files as it installs
 <transform file path=usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION)/puppet/provider/package/.*\.py$ -> default pkg.tmp.autopyc false>
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<include puppet-modules.depend>
 set name=pkg.fmri \
     value=pkg:/system/management/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Puppet - configuration management toolkit"
@@ -1134,6 +1133,14 @@
 dir  path=var/log/puppet owner=puppet group=puppet mode=0755
 license puppet.license license="Apache v2.0"
 
+# globally applicable low level puppet modules we provide
+depend type=group fmri=system/management/puppet/nanliu-staging
+depend type=group fmri=system/management/puppet/puppetlabs-concat
+depend type=group fmri=system/management/puppet/puppetlabs-inifile
+depend type=group fmri=system/management/puppet/puppetlabs-ntp
+depend type=group fmri=system/management/puppet/puppetlabs-rsync
+depend type=group fmri=system/management/puppet/puppetlabs-stdlib
+
 # Depend on renamed versions to pull them forward
 depend type=optional fmri=library/ruby/[email protected]
 depend type=optional fmri=system/management/[email protected]
@@ -1143,4 +1150,5 @@
 # Puppet Dependencies
 depend type=require fmri=library/ruby/hiera
 depend type=require fmri=system/management/facter
+depend type=require fmri=system/management/puppet/oracle-solaris_providers
 depend type=require fmri=system/management/puppet/puppet-solaris