svn commit: r447834 - in head/sysutils/mcollective: . files

[Romain Tartière]

Author: romain
Date: Sat Aug 12 14:21:30 2017
New Revision: 447834
URL: https://svnweb.freebsd.org/changeset/ports/447834

Log:
  Update to 2.11.1
  
  Ensure the service has an UTF-8 locale and /usr/local/bin is in the $PATH.
  
  With hat:	puppet

Modified:
  head/sysutils/mcollective/Makefile
  head/sysutils/mcollective/distinfo
  head/sysutils/mcollective/files/mcollectived.in
  head/sysutils/mcollective/pkg-plist

Modified: head/sysutils/mcollective/Makefile
==============================================================================
--- head/sysutils/mcollective/Makefile	Sat Aug 12 14:19:04 2017	(r447833)
+++ head/sysutils/mcollective/Makefile	Sat Aug 12 14:21:30 2017	(r447834)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mcollective
-PORTVERSION=	2.9.0
+PORTVERSION=	2.11.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/${PORTNAME}/
 
@@ -47,7 +47,7 @@ do-patch:
 do-install:
 	cd ${WRKSRC} ; ${RUBY} install.rb --destdir=${STAGEDIR} --configdir=${ETCDIR} --plugindir=${DATADIR}
 .for cfg in ${CFG_FILES}
-	mv ${STAGEDIR}${ETCDIR}/${cfg} ${STAGEDIR}${ETCDIR}/${cfg}.sample
+	${MV} ${STAGEDIR}${ETCDIR}/${cfg} ${STAGEDIR}${ETCDIR}/${cfg}.sample
 .endfor
 
 .include <bsd.port.mk>

Modified: head/sysutils/mcollective/distinfo
==============================================================================
--- head/sysutils/mcollective/distinfo	Sat Aug 12 14:19:04 2017	(r447833)
+++ head/sysutils/mcollective/distinfo	Sat Aug 12 14:21:30 2017	(r447834)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471112087
-SHA256 (mcollective-2.9.0.tar.gz) = 2e8339f838e4a6a40cdc4ea8601cab2c1dd52bf4b212eee943aa68a4a002d771
-SIZE (mcollective-2.9.0.tar.gz) = 914796
+TIMESTAMP = 1500565990
+SHA256 (mcollective-2.11.1.tar.gz) = 24dd0dd006f287decc0a0d99d8b17f08f5b62a93144fd4200af1ccfd77870b23
+SIZE (mcollective-2.11.1.tar.gz) = 888750

Modified: head/sysutils/mcollective/files/mcollectived.in
==============================================================================
--- head/sysutils/mcollective/files/mcollectived.in	Sat Aug 12 14:19:04 2017	(r447833)
+++ head/sysutils/mcollective/files/mcollectived.in	Sat Aug 12 14:21:30 2017	(r447834)
@@ -27,4 +27,20 @@ command="%%PREFIX%%/sbin/${name}"
 command_args="-p $pidfile"
 command_interpreter=%%RUBY%%
 
+PATH="${PATH}:/usr/local/bin"
+
+# An UTF-8 locale is required
+: LC_ALL=${LC_ALL:=C.UTF-8}
+case $LC_ALL in
+    *.UTF-8)
+	;;
+    *.*)
+	LC_ALL="${LC_ALL%.*}.UTF-8"
+	;;
+    *)
+	LC_ALL=C.UTF-8
+	;;
+esac
+export LC_ALL
+
 run_rc_command "$1"

Modified: head/sysutils/mcollective/pkg-plist
==============================================================================
--- head/sysutils/mcollective/pkg-plist	Sat Aug 12 14:19:04 2017	(r447833)
+++ head/sysutils/mcollective/pkg-plist	Sat Aug 12 14:21:30 2017	(r447834)
@@ -155,6 +155,7 @@ bin/mco
 %%RUBY_SITELIBDIR%%/mcollective/vendor.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/load_systemu.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/require_vendored.rb
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/BSDL
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/LICENSE
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/README.erb
@@ -167,5 +168,7 @@ bin/mco
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/e.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/samples/f.rb
 %%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/systemu.gemspec
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/systemu_test.rb
+%%RUBY_SITELIBDIR%%/mcollective/vendor/systemu/test/testing.rb
 %%RUBY_SITELIBDIR%%/mcollective/windows_daemon.rb
 @dir %%DATADIR%%