diff options
| author | romain <romain@FreeBSD.org> | 2017-08-12 22:21:30 +0800 |
|---|---|---|
| committer | Koop Mast <kwm@rainbow-runner.nl> | 2018-02-04 05:21:03 +0800 |
| commit | e672a279310c52654b5bcf32772cfa3de6811c55 (patch) | |
| tree | b17f3a39f15821a77b42b8fed91adbe5259788b6 /sysutils | |
| parent | 4830cef718cfd744051818b658c710cebe2b348c (diff) | |
| download | freebsd-ports-gnome-e672a279310c52654b5bcf32772cfa3de6811c55.tar.gz freebsd-ports-gnome-e672a279310c52654b5bcf32772cfa3de6811c55.tar.zst freebsd-ports-gnome-e672a279310c52654b5bcf32772cfa3de6811c55.zip | |
Update to 2.11.1
Ensure the service has an UTF-8 locale and /usr/local/bin is in the $PATH.
With hat: puppet
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/mcollective/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/mcollective/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/mcollective/files/mcollectived.in | 16 | ||||
| -rw-r--r-- | sysutils/mcollective/pkg-plist | 3 |
4 files changed, 24 insertions, 5 deletions
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile index 5987766608a8..c21089831f7f 100644 --- a/sysutils/mcollective/Makefile +++ b/sysutils/mcollective/Makefile @@ -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> diff --git a/sysutils/mcollective/distinfo b/sysutils/mcollective/distinfo index f8333f608707..125c31639595 100644 --- a/sysutils/mcollective/distinfo +++ b/sysutils/mcollective/distinfo @@ -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 diff --git a/sysutils/mcollective/files/mcollectived.in b/sysutils/mcollective/files/mcollectived.in index 24abc8f8a168..08d4832b5056 100644 --- a/sysutils/mcollective/files/mcollectived.in +++ b/sysutils/mcollective/files/mcollectived.in @@ -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" diff --git a/sysutils/mcollective/pkg-plist b/sysutils/mcollective/pkg-plist index 27ab7c300cfb..5447262f929a 100644 --- a/sysutils/mcollective/pkg-plist +++ b/sysutils/mcollective/pkg-plist @@ -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%% |