Update sysutils/puppet to 3.8.7.

Clean up dependencies and resolve the json/json_pure conflict.

Changes since 3.8.6:

- PUP-4818: One part of the relative namespacing feature was not
  removed when using the future parser. When a class was declared
  with a resource like expression the references to classes were
  still interpreted as being relative.
- PUP-6113: Puppet will no longer attempt to retrieve the
  nonexistent password_min_age property from LDAP users on
  Solaris.
- PUP-6073: launchd plists with line continuations no longer cause
  the launchd service provider to return Error: Could not prefetch
  service provider 'launchd': undefined method to_ruby for
  nil:NilClass.
- PUP-5898: :undef caused unexpected behaviors with hashes due to
  the 3.x calling convention also applying to resource
  expressions.
- PUP-5637: Puppet systemd packages now include an ExecReload
  command in the puppet.service files in order to facilitate
  graceful restart on systemd systems.
- PUP-5356: Fixed the Puppet Nagios extension with Ruby 1.9.3+.
- PUP-4545: Removed a script that restarts Puppet in response to
  network changes on EL based systems.

3 files changed, 16 insertions, 15 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index e0ee6207b07..e9b302ac13d 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/08/26 09:26:05 fhajny Exp $
+# $NetBSD: Makefile,v 1.27 2016/09/01 10:27:24 fhajny Exp $
 
-DISTNAME=		puppet-3.8.6
-PKGREVISION=		1
+DISTNAME=		puppet-3.8.7
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://puppetlabs.com/downloads/puppet/
 
@@ -12,13 +11,12 @@ LICENSE=		apache-2.0
 
 DEPENDS+=	${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter
 DEPENDS+=	${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera
-DEPENDS+=	${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest
-DEPENDS+=	${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow
-# io-console gem is bundled in ruby base package.
 
 RUBY_VERSION_SUPPORTED=	21
-RUBY_JSON_REQD=		1.7.0
-RUBY_JSON_TYPE=		pure
+
+RUBY_JSON_REQD=		0
+OVERRIDE_GEMSPEC=	json_pure:json>0
+
 RUBYGEM_OPTIONS+=	--format-executable
 
 PKG_SYSCONFSUBDIR=	puppet
@@ -116,5 +114,6 @@ post-install:
 		${DESTDIR}${PREFIX}/lib/svc/method
 .endif
 
+.include "../../lang/ruby/json.mk"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/puppet/PLIST b/sysutils/puppet/PLIST
index b1808a23ebf..08798562032 100644
--- a/sysutils/puppet/PLIST
+++ b/sysutils/puppet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/01/03 06:44:40 taca Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/09/01 10:27:24 fhajny Exp $
 bin/puppet${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/COMMITTERS.md
@@ -114,7 +114,6 @@ ${GEM_LIBDIR}/ext/osx/preflight.erb
 ${GEM_LIBDIR}/ext/osx/prototype.plist.erb
 ${GEM_LIBDIR}/ext/project_data.yaml
 ${GEM_LIBDIR}/ext/puppet-load.rb
-${GEM_LIBDIR}/ext/puppet-nm-dispatcher
 ${GEM_LIBDIR}/ext/puppet-test
 ${GEM_LIBDIR}/ext/puppetlisten/puppetlisten.rb
 ${GEM_LIBDIR}/ext/puppetlisten/puppetrun.rb
@@ -1472,6 +1471,7 @@ ${GEM_LIBDIR}/spec/fixtures/integration/provider/cron/crontab/unspecialized
 ${GEM_LIBDIR}/spec/fixtures/integration/provider/mailalias/aliases/test1
 ${GEM_LIBDIR}/spec/fixtures/java.tgz
 ${GEM_LIBDIR}/spec/fixtures/manifests/site.pp
+${GEM_LIBDIR}/spec/fixtures/module.tar.gz
 ${GEM_LIBDIR}/spec/fixtures/releases/jamtur01-apache/Modulefile
 ${GEM_LIBDIR}/spec/fixtures/releases/jamtur01-apache/files/httpd
 ${GEM_LIBDIR}/spec/fixtures/releases/jamtur01-apache/files/test.vhost
@@ -1701,6 +1701,7 @@ ${GEM_LIBDIR}/spec/integration/indirector/facts/facter_spec.rb
 ${GEM_LIBDIR}/spec/integration/indirector/file_content/file_server_spec.rb
 ${GEM_LIBDIR}/spec/integration/indirector/file_metadata/file_server_spec.rb
 ${GEM_LIBDIR}/spec/integration/indirector/node/ldap_spec.rb
+${GEM_LIBDIR}/spec/integration/module_tool/tar/mini_spec.rb
 ${GEM_LIBDIR}/spec/integration/network/authconfig_spec.rb
 ${GEM_LIBDIR}/spec/integration/network/formats_spec.rb
 ${GEM_LIBDIR}/spec/integration/node/environment_spec.rb
@@ -1711,6 +1712,7 @@ ${GEM_LIBDIR}/spec/integration/parser/class_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/collector_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/compiler_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/conditionals_spec.rb
+${GEM_LIBDIR}/spec/integration/parser/dynamic_scoping_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/environment_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/functions/require_spec.rb
 ${GEM_LIBDIR}/spec/integration/parser/future_compiler_spec.rb
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index a2b87056b3c..de89ff4f616 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2016/08/26 09:26:05 fhajny Exp $
+$NetBSD: distinfo,v 1.16 2016/09/01 10:27:24 fhajny Exp $
 
-SHA1 (puppet-3.8.6.gem) = 2e6818550466c1ffda9dee01881c796e9edf4ec1
-RMD160 (puppet-3.8.6.gem) = 861b945625bba51d03ea6827182732220eddfd5f
-SHA512 (puppet-3.8.6.gem) = 22772e5bc2b3c839e74aeb4f650d01ece34e694fc1de16c82cd77ebcc760ea4a56814ad0ce543bd1c525eb6cd9ce932cdac032aaa366daff16fc1126fba9293f
-Size (puppet-3.8.6.gem) = 2669568 bytes
+SHA1 (puppet-3.8.7.gem) = 435a077a6d550855f9e0d7f6a582dab23163802e
+RMD160 (puppet-3.8.7.gem) = 623d56c4b00d10f6b6ff9e693b754090934bf871
+SHA512 (puppet-3.8.7.gem) = 573353553ed5d948d2b3dff294ba0ca536d095bc7da093ce25447eb13601d69264d37464572f04a08acaa81dbce44f5a09de06e2e9bdb489c44839220fc67906
+Size (puppet-3.8.7.gem) = 2679296 bytes
 SHA1 (patch-aa) = 8b25b975647023902f5d84cc2980f777f23e789c
 SHA1 (patch-ab) = 2e80fc9ca8a9326d69c72149e6fd97738cfd2e1e
 SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249