Import of pkgsrc-2016Q3

sysutils/puppet/ALTERNATIVES

@@ -0,0 +1 @@
+bin/puppet @PREFIX@/bin/puppet@RUBY_SUFFIX@

sysutils/puppet/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2015/08/17 13:20:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.28 2016/09/08 15:19:18 joerg Exp $
 
-DISTNAME=		puppet-3.8.2
+DISTNAME=		puppet-3.8.7
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://puppetlabs.com/downloads/puppet/
 
@@ -9,16 +9,15 @@ HOMEPAGE=		http://www.puppetlabs.com/
 COMMENT=		Configuration management framework written in Ruby
 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}-io-console>=0.3:../../devel/ruby-io-console
-DEPENDS+=		${RUBY_PKGPREFIX}-json-pure>=0:../../textproc/ruby-json-pure
-DEPENDS+=		${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest
-DEPENDS+=		${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow
+DEPENDS+=	${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter
+DEPENDS+=	${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera
 
-RUBY_VERSION_SUPPORTED=	200 193 21
+RUBY_VERSIONS_ACCEPTED=	21
 
-CONFLICTS+=		ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]*
+RUBY_JSON_REQD=		0
+OVERRIDE_GEMSPEC=	json_pure:json>0
+
+RUBYGEM_OPTIONS+=	--format-executable
 
 PKG_SYSCONFSUBDIR=	puppet
 RCD_SCRIPTS=		puppetd puppetmasterd
@@ -48,6 +47,12 @@ SUBST_FILES.prefix+=	spec/unit/indirector/catalog/static_compiler_spec.rb
 SUBST_SED.prefix=	-e "s|/etc/puppet|${PKG_SYSCONFDIR}|g"
 SUBST_SED.prefix+=	-e "s|/opt/csw/lib|${PREFIX}/lib|g"
 
+SUBST_CLASSES+=		sufx
+SUBST_STAGE.sufx=	pre-configure
+SUBST_MESSAGE.sufx=	Fixing command suffix
+SUBST_FILES.sufx=	lib/puppet/util/command_line.rb
+SUBST_VARS.sufx=	RUBY_SUFFIX
+
 EGDIR=			share/examples/${PKGBASE}
 CONF_FILES=		${EGDIR}/puppet.conf ${PKG_SYSCONFDIR}/puppet.conf
 
@@ -109,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"

sysutils/puppet/PLIST

@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.15 2015/08/17 13:20:43 fhajny Exp $
-bin/puppet
+@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
 ${GEM_LIBDIR}/CONTRIBUTING.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

sysutils/puppet/distinfo

@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.11 2015/08/17 13:20:43 fhajny Exp $
+$NetBSD: distinfo,v 1.16 2016/09/01 10:27:24 fhajny Exp $
 
-SHA1 (puppet-3.8.2.gem) = 08968e6bb5c5a1a043b6e810f448e9e1b579fddd
-RMD160 (puppet-3.8.2.gem) = 5e4cbb9c57291796298e7132c1d7844948e8ec81
-Size (puppet-3.8.2.gem) = 2666496 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
 SHA1 (patch-ad) = 412b0ccd973e38f38b574e553cab0041a025d4e6
 SHA1 (patch-ae) = 73d8cb4c58345b09771f08da8bc3b1e46563aa95
+SHA1 (patch-lib_puppet_util_command__line.rb) = a15aa55703a6f437b2ee0f7137ee1820318f13e0

sysutils/puppet/patches/patch-lib_puppet_util_command__line.rb

@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_puppet_util_command__line.rb,v 1.1 2016/08/26 09:26:05 fhajny Exp $
+
+Fix subcommand handling for our suffixed bins.
+
+--- lib/puppet/util/command_line.rb.orig	2016-08-25 13:06:40.887601145 +0000
++++ lib/puppet/util/command_line.rb
+@@ -38,7 +38,7 @@ module Puppet
+       # @return [String] name of the subcommand is being executed
+       # @api public
+       def subcommand_name
+-        return @command if @command != 'puppet'
++        return @command if (@command != 'puppet' && @command != 'puppet@RUBY_SUFFIX@')
+ 
+         if @argv.first =~ OPTION_OR_MANIFEST_FILE
+           nil
+@@ -50,7 +50,7 @@ module Puppet
+       # @return [Array<String>] the command line arguments being passed to the subcommand
+       # @api public
+       def args
+-        return @argv if @command != 'puppet'
++        return @argv if (@command != 'puppet' && @command != 'puppet@RUBY_SUFFIX@')
+ 
+         if subcommand_name.nil?
+           @argv