Update to the latest cfengine commit on github.

6 files changed, 18 insertions, 12 deletions

diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 121aef3c9c5b..68a98375c272 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
 PKGNAMESUFFIX=	-devel
-HASH=		014512f
-CFENGINE_COMMIT_DATE=	2018.03.20
+HASH=		6001047
+CFENGINE_COMMIT_DATE=	2018.07.02
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index 1819e3f8ad6d..dee95d6500d8 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521598660
-SHA256 (cfengine-core-3.2018.03.20-014512f_GH0.tar.gz) = dbeef6ed44bafb17ef64b62789c73b75463a32424319fd69b1061ef960cb9ccf
-SIZE (cfengine-core-3.2018.03.20-014512f_GH0.tar.gz) = 2104178
+TIMESTAMP = 1530593797
+SHA256 (cfengine-core-3.2018.07.02-6001047_GH0.tar.gz) = c40462a0215977b299fcebcbb0aff3ac871818a1c6adf84d38f6d0eea962c1df
+SIZE (cfengine-core-3.2018.07.02-6001047_GH0.tar.gz) = 2126845
diff --git a/sysutils/cfengine-devel/pkg-plist b/sysutils/cfengine-devel/pkg-plist
index a5662616386f..5de8af8791e8 100644
--- a/sysutils/cfengine-devel/pkg-plist
+++ b/sysutils/cfengine-devel/pkg-plist
@@ -35,6 +35,7 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/badtype.cf
 %%DOCSDIR%%/examples/bsdflags.cf
 %%DOCSDIR%%/examples/bundle_return_values.cf
+%%DOCSDIR%%/examples/bundlesequence.cf
 %%DOCSDIR%%/examples/bundlesmatching.cf
 %%DOCSDIR%%/examples/bundlestate.cf
 %%DOCSDIR%%/examples/canonify.cf
@@ -42,6 +43,7 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/change_detect.cf
 %%DOCSDIR%%/examples/changedbefore.cf
 %%DOCSDIR%%/examples/chdir.cf
+%%DOCSDIR%%/examples/class-automatic-canonificiation.cf
 %%DOCSDIR%%/examples/classes_global.cf
 %%DOCSDIR%%/examples/classesmatching.cf
 %%DOCSDIR%%/examples/classmatch.cf
@@ -188,6 +190,9 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/log_private.cf
 %%DOCSDIR%%/examples/loops.cf
 %%DOCSDIR%%/examples/lsdir.cf
+%%DOCSDIR%%/examples/main.cf
+%%DOCSDIR%%/examples/main_entry_point.cf
+%%DOCSDIR%%/examples/main_library.cf
 %%DOCSDIR%%/examples/maparray.cf
 %%DOCSDIR%%/examples/mapdata.cf
 %%DOCSDIR%%/examples/mapdata_jsonpipe.cf
@@ -203,12 +208,14 @@ libexec/cfengine/libpromises.so.3.0.6
 %%DOCSDIR%%/examples/method_validate.cf
 %%DOCSDIR%%/examples/method_var.cf
 %%DOCSDIR%%/examples/method_var2.cf
+%%DOCSDIR%%/examples/missing_ok.cf
 %%DOCSDIR%%/examples/module_exec.cf
 %%DOCSDIR%%/examples/module_exec_2.cf
 %%DOCSDIR%%/examples/monitord.cf
 %%DOCSDIR%%/examples/mount_fs.cf
 %%DOCSDIR%%/examples/multipassvars.cf
 %%DOCSDIR%%/examples/multiple_outcomes.cf
+%%DOCSDIR%%/examples/mustache_classes.cf
 %%DOCSDIR%%/examples/mustache_template_motd.cf
 %%DOCSDIR%%/examples/namespace.cf
 %%DOCSDIR%%/examples/namespace1.cf
diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile
index 66b1465dbadc..8b437586af1c 100644
--- a/sysutils/cfengine-masterfiles-devel/Makefile
+++ b/sysutils/cfengine-masterfiles-devel/Makefile
@@ -6,8 +6,8 @@ PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
 PKGNAMESUFFIX=	-devel
-HASH=		7f96281
-CFENGINE_COMMIT_DATE=	2018.03.20
+HASH=		9ff3f39
+CFENGINE_COMMIT_DATE=	2018.07.02
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
diff --git a/sysutils/cfengine-masterfiles-devel/distinfo b/sysutils/cfengine-masterfiles-devel/distinfo
index c7bd1776999a..d2848c271673 100644
--- a/sysutils/cfengine-masterfiles-devel/distinfo
+++ b/sysutils/cfengine-masterfiles-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1521601047
-SHA256 (cfengine-masterfiles-3.2018.03.20-7f96281_GH0.tar.gz) = 4e1caedea7255017294408ee3c6b839638f2659f72b8846a87382ce1d5714a30
-SIZE (cfengine-masterfiles-3.2018.03.20-7f96281_GH0.tar.gz) = 372582
+TIMESTAMP = 1530594744
+SHA256 (cfengine-masterfiles-3.2018.07.02-9ff3f39_GH0.tar.gz) = 53fad007b5fa5eec7b3bc675ea51c8bcd3977f312f1c894baf48cd631b3bf2d2
+SIZE (cfengine-masterfiles-3.2018.07.02-9ff3f39_GH0.tar.gz) = 376830
diff --git a/sysutils/cfengine-masterfiles-devel/pkg-plist b/sysutils/cfengine-masterfiles-devel/pkg-plist
index 6686acd368ba..d57155f07873 100644
--- a/sysutils/cfengine-masterfiles-devel/pkg-plist
+++ b/sysutils/cfengine-masterfiles-devel/pkg-plist
@@ -79,12 +79,10 @@
 %%EXAMPLESDIR%%/masterfiles/sketches/meta/api-runfile.cf
 %%EXAMPLESDIR%%/masterfiles/standalone_self_upgrade.cf
 %%EXAMPLESDIR%%/masterfiles/templates/cf-apache.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-consumer.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-execd.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-hub.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-monitord.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-postgres.service.mustache
-%%EXAMPLESDIR%%/masterfiles/templates/cf-redis-server.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-runalerts.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cf-serverd.service.mustache
 %%EXAMPLESDIR%%/masterfiles/templates/cfengine3.service.mustache
@@ -98,5 +96,6 @@
 %%EXAMPLESDIR%%/modules/packages/nimclient
 %%EXAMPLESDIR%%/modules/packages/pkg
 %%EXAMPLESDIR%%/modules/packages/pkgsrc
+%%EXAMPLESDIR%%/modules/packages/slackpkg
 %%EXAMPLESDIR%%/modules/packages/yum
 %%EXAMPLESDIR%%/modules/packages/zypper