CVS commit: pkgsrc/sysutils/puppet

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Aug 26 09:26:05 UTC 2016

Modified Files:
        pkgsrc/sysutils/puppet: Makefile distinfo
Added Files:
        pkgsrc/sysutils/puppet/patches: patch-lib_puppet_util_command__line.rb

Log Message:
Make sure puppet recognizes being called puppet${RUBY_SUFFIX}.
Bump PKREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/puppet/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/puppet/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/puppet/patches/patch-lib_puppet_util_command__line.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/puppet/Makefile
diff -u pkgsrc/sysutils/puppet/Makefile:1.25 pkgsrc/sysutils/puppet/Makefile:1.26
--- pkgsrc/sysutils/puppet/Makefile:1.25        Tue Mar 15 12:45:07 2016
+++ pkgsrc/sysutils/puppet/Makefile     Fri Aug 26 09:26:05 2016
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/03/15 12:45:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.26 2016/08/26 09:26:05 fhajny Exp $
 
 DISTNAME=              puppet-3.8.6
+PKGREVISION=           1
 CATEGORIES=            sysutils
 #MASTER_SITES=         http://puppetlabs.com/downloads/puppet/
 
@@ -48,6 +49,12 @@ SUBST_FILES.prefix+= spec/unit/indirecto
 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
 

Index: pkgsrc/sysutils/puppet/distinfo
diff -u pkgsrc/sysutils/puppet/distinfo:1.14 pkgsrc/sysutils/puppet/distinfo:1.15
--- pkgsrc/sysutils/puppet/distinfo:1.14        Tue Mar 15 12:45:07 2016
+++ pkgsrc/sysutils/puppet/distinfo     Fri Aug 26 09:26:05 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2016/03/15 12:45:07 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2016/08/26 09:26:05 fhajny Exp $
 
 SHA1 (puppet-3.8.6.gem) = 2e6818550466c1ffda9dee01881c796e9edf4ec1
 RMD160 (puppet-3.8.6.gem) = 861b945625bba51d03ea6827182732220eddfd5f
@@ -9,3 +9,4 @@ SHA1 (patch-ab) = 2e80fc9ca8a9326d69c721
 SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249
 SHA1 (patch-ad) = 412b0ccd973e38f38b574e553cab0041a025d4e6
 SHA1 (patch-ae) = 73d8cb4c58345b09771f08da8bc3b1e46563aa95
+SHA1 (patch-lib_puppet_util_command__line.rb) = a15aa55703a6f437b2ee0f7137ee1820318f13e0

Added files:

Index: pkgsrc/sysutils/puppet/patches/patch-lib_puppet_util_command__line.rb
diff -u /dev/null pkgsrc/sysutils/puppet/patches/patch-lib_puppet_util_command__line.rb:1.1
--- /dev/null   Fri Aug 26 09:26:05 2016
+++ pkgsrc/sysutils/puppet/patches/patch-lib_puppet_util_command__line.rb       Fri Aug 26 09:26:05 2016
@@ -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