Update 3.5.1 --> 3.5.2

PR:		182520
Submitted by:	skreuzer

4 files changed, 62 insertions, 8 deletions

diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index fa0b782eb5e3..da396424ca80 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -19,7 +19,7 @@ FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 CONFLICTS=	cfengine-[234]*
 
-USE_RC_SUBR=	cf-execd cf-serverd
+USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
diff --git a/sysutils/cfengine35/distinfo b/sysutils/cfengine35/distinfo
index 8ddf27a3e8b5..67131880888d 100644
--- a/sysutils/cfengine35/distinfo
+++ b/sysutils/cfengine35/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.5.1.tar.gz) = 4d2484d5bdeaa5b6d5435b58a92a8da2bafc18294bb8eae348614e663f934429
-SIZE (cfengine-3.5.1.tar.gz) = 1509646
+SHA256 (cfengine-3.5.2.tar.gz) = 0362224d2968929cb4a1f2b4e98efbb6f5d1ecea5e9e9ae3e86fa8d083a70d6a
+SIZE (cfengine-3.5.2.tar.gz) = 1560750
diff --git a/sysutils/cfengine35/files/cf-monitord.in b/sysutils/cfengine35/files/cf-monitord.in
new file mode 100644
index 000000000000..aa634b250817
--- /dev/null
+++ b/sysutils/cfengine35/files/cf-monitord.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-monitord
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
+#
+# cf_monitord_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-monitord.
+# cf_monitord_flags (str):          Custom additional arguments to be passed
+#                               to cf-monitord (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_monitord"
+rcvar=cf_monitord_enable
+
+load_rc_config $name
+
+: ${cf_monitord_enable="NO"}
+
+run_rc_command "$1"
diff --git a/sysutils/cfengine35/pkg-plist b/sysutils/cfengine35/pkg-plist
index 8aa248bcfacf..31067cb2e017 100644
--- a/sysutils/cfengine35/pkg-plist
+++ b/sysutils/cfengine35/pkg-plist
@@ -11,14 +11,39 @@ sbin/cf-runagent
 sbin/cf-serverd
 sbin/rpmvercmp
 share/cfengine/CoreBase/cf-sketch-runfile.cf
-share/cfengine/CoreBase/def.cf
-share/cfengine/CoreBase/promises.cf
-share/cfengine/CoreBase/controls/cf_execd.cf
 share/cfengine/CoreBase/controls/cf_agent.cf
-share/cfengine/CoreBase/controls/cf_runagent.cf
+share/cfengine/CoreBase/controls/cf_execd.cf
 share/cfengine/CoreBase/controls/cf_monitord.cf
+share/cfengine/CoreBase/controls/cf_runagent.cf
 share/cfengine/CoreBase/controls/cf_serverd.cf
+share/cfengine/CoreBase/def.cf
+share/cfengine/CoreBase/lib/3.5/bundles.cf
+share/cfengine/CoreBase/lib/3.5/commands.cf
+share/cfengine/CoreBase/lib/3.5/common.cf
+share/cfengine/CoreBase/lib/3.5/databases.cf
+share/cfengine/CoreBase/lib/3.5/files.cf
+share/cfengine/CoreBase/lib/3.5/guest_environments.cf
+share/cfengine/CoreBase/lib/3.5/monitor.cf
+share/cfengine/CoreBase/lib/3.5/packages.cf
+share/cfengine/CoreBase/lib/3.5/paths.cf
+share/cfengine/CoreBase/lib/3.5/processes.cf
+share/cfengine/CoreBase/lib/3.5/services.cf
+share/cfengine/CoreBase/lib/3.5/storage.cf
+share/cfengine/CoreBase/lib/3.6/bundles.cf
+share/cfengine/CoreBase/lib/3.6/commands.cf
+share/cfengine/CoreBase/lib/3.6/common.cf
+share/cfengine/CoreBase/lib/3.6/databases.cf
+share/cfengine/CoreBase/lib/3.6/files.cf
+share/cfengine/CoreBase/lib/3.6/guest_environments.cf
+share/cfengine/CoreBase/lib/3.6/monitor.cf
+share/cfengine/CoreBase/lib/3.6/packages.cf
+share/cfengine/CoreBase/lib/3.6/paths.cf
+share/cfengine/CoreBase/lib/3.6/processes.cf
+share/cfengine/CoreBase/lib/3.6/services.cf
+share/cfengine/CoreBase/lib/3.6/storage.cf
+share/cfengine/CoreBase/lib/README.md
 share/cfengine/CoreBase/libraries/cfengine_stdlib.cf
+share/cfengine/CoreBase/promises.cf
 share/cfengine/CoreBase/services/init_msg.cf
 share/cfengine/CoreBase/update.cf
 %%DOCSDIR%%/ChangeLog
@@ -294,6 +319,9 @@ share/cfengine/CoreBase/update.cf
 @dirrm share/cfengine/CoreBase/controls
 @dirrm share/cfengine/CoreBase/libraries
 @dirrm share/cfengine/CoreBase/services
+@dirrm share/cfengine/CoreBase/lib/3.5
+@dirrm share/cfengine/CoreBase/lib/3.6
+@dirrm share/cfengine/CoreBase/lib
 @dirrm share/cfengine/CoreBase
 @dirrm share/cfengine
 @dirrm libexec/cfengine