Update 3.0.2 --> 3.0.3.

PR:		143228

6 files changed, 44 insertions, 12 deletions

diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 91781dae2fee..e46a01c6c804 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
@@ -36,7 +35,7 @@ OPTIONS=        PCRE	"Enable Perl-compatible regular expressions"		on
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PCRE)
-BUILD_DEPENDS+= ${PORTSDIR}/devel/pcre
+BUILD_DEPENDS+= pcre-config:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}
 .endif
 
diff --git a/sysutils/cfengine3-legacy/distinfo b/sysutils/cfengine3-legacy/distinfo
index d0243b53fbf0..b52cdd2ea5d6 100644
--- a/sysutils/cfengine3-legacy/distinfo
+++ b/sysutils/cfengine3-legacy/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfengine-3.0.2.tar.gz) = ba23adb8c54c2da13953d8b24f303430
-SHA256 (cfengine-3.0.2.tar.gz) = b509be871864e74ebb493cfb395d527797689d6581087fe03f9d0e7b57b3f5bc
-SIZE (cfengine-3.0.2.tar.gz) = 2078775
+MD5 (cfengine-3.0.3.tar.gz) = ba1af278e9f8b519766b6ca4e1377d22
+SHA256 (cfengine-3.0.3.tar.gz) = 1fb18c93a272fccc484548a302b21e2b4b0cca3a21e6743849040ee65be8655e
+SIZE (cfengine-3.0.3.tar.gz) = 2173283
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index 0fae08ef99a0..544d8115e687 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -46,16 +46,19 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_copylinks.cf
 %%DOCSDIR%%/unit_create_filedir.cf
 %%DOCSDIR%%/unit_createdb.cf
+%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_customize_by_named_list.cf
 %%DOCSDIR%%/unit_definitions.cf
 %%DOCSDIR%%/unit_deletelines.cf
 %%DOCSDIR%%/unit_disable_and_rotate_files.cf
+%%DOCSDIR%%/unit_diskfree.cf
 %%DOCSDIR%%/unit_dollar.cf
 %%DOCSDIR%%/unit_edit_column_files.cf
 %%DOCSDIR%%/unit_edit_comment_lines.cf
 %%DOCSDIR%%/unit_edit_deletenotmatch.cf
 %%DOCSDIR%%/unit_edit_insert_lines.cf
 %%DOCSDIR%%/unit_edit_insert_lines_silly.cf
+%%DOCSDIR%%/unit_edit_passwd_file.cf
 %%DOCSDIR%%/unit_edit_replace_string.cf
 %%DOCSDIR%%/unit_edit_sectioned_file.cf
 %%DOCSDIR%%/unit_edit_setvar.cf
@@ -75,18 +78,24 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_filesexist.cf
 %%DOCSDIR%%/unit_filesexist2.cf
 %%DOCSDIR%%/unit_fix_names.cf
+%%DOCSDIR%%/unit_getfields.cf
 %%DOCSDIR%%/unit_getgid.cf
 %%DOCSDIR%%/unit_getindices.cf
+%%DOCSDIR%%/unit_getindixes.cf
 %%DOCSDIR%%/unit_getregistry.cf
 %%DOCSDIR%%/unit_getuid.cf
 %%DOCSDIR%%/unit_global_list_expansion.cf
 %%DOCSDIR%%/unit_global_list_expansion_2.cf
+%%DOCSDIR%%/unit_grep.cf
 %%DOCSDIR%%/unit_groupexists.cf
 %%DOCSDIR%%/unit_hash.cf
 %%DOCSDIR%%/unit_hashcomment.cf
 %%DOCSDIR%%/unit_hashmatch.cf
+%%DOCSDIR%%/unit_hashuncomment.cf
 %%DOCSDIR%%/unit_helloworld.cf
 %%DOCSDIR%%/unit_hostrange.cf
+%%DOCSDIR%%/unit_hostsseen.cf
+%%DOCSDIR%%/unit_id.cf
 %%DOCSDIR%%/unit_insert_users.cf
 %%DOCSDIR%%/unit_intarray.cf
 %%DOCSDIR%%/unit_iprange.cf
@@ -97,6 +106,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_isplain.cf
 %%DOCSDIR%%/unit_isvariable.cf
 %%DOCSDIR%%/unit_iteration.cf
+%%DOCSDIR%%/unit_join.cf
 %%DOCSDIR%%/unit_knowledge_driver.cf
 %%DOCSDIR%%/unit_knowledge_txt.cf
 %%DOCSDIR%%/unit_lastnode.cf
@@ -113,13 +123,16 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_module_exec_2.cf
 %%DOCSDIR%%/unit_monitord.cf
 %%DOCSDIR%%/unit_mount_fs.cf
+%%DOCSDIR%%/unit_multipassvars.cf
 %%DOCSDIR%%/unit_neighbourhood_watch.cf
 %%DOCSDIR%%/unit_null_config.cf
 %%DOCSDIR%%/unit_occurrences.cf
 %%DOCSDIR%%/unit_ordering.cf
 %%DOCSDIR%%/unit_package_apt.cf
+%%DOCSDIR%%/unit_package_freebsd.cf
 %%DOCSDIR%%/unit_package_hash.cf
 %%DOCSDIR%%/unit_package_rpm.cf
+%%DOCSDIR%%/unit_package_solaris.cf
 %%DOCSDIR%%/unit_package_yum.cf
 %%DOCSDIR%%/unit_package_zypper.cf
 %%DOCSDIR%%/unit_parallel_exec.cf
@@ -130,6 +143,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_process_kill.cf
 %%DOCSDIR%%/unit_process_matching.cf
 %%DOCSDIR%%/unit_process_matching2.cf
+%%DOCSDIR%%/unit_process_matching3.cf
 %%DOCSDIR%%/unit_process_signalling.cf
 %%DOCSDIR%%/unit_promises.cf
 %%DOCSDIR%%/unit_readlist.cf
@@ -140,6 +154,8 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_reglist.cf
 %%DOCSDIR%%/unit_remove_deadlinks.cf
 %%DOCSDIR%%/unit_rename.cf
+%%DOCSDIR%%/unit_report_custom.cf
+%%DOCSDIR%%/unit_report_diffs.cf
 %%DOCSDIR%%/unit_report_state.cf
 %%DOCSDIR%%/unit_reporting.cf
 %%DOCSDIR%%/unit_reporttofile.cf
@@ -150,6 +166,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_select_region.cf
 %%DOCSDIR%%/unit_select_size.cf
 %%DOCSDIR%%/unit_selectservers.cf
+%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_server_copy_localhost.cf
 %%DOCSDIR%%/unit_server_copy_purge.cf
 %%DOCSDIR%%/unit_server_copy_remote.cf
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 91781dae2fee..e46a01c6c804 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
@@ -36,7 +35,7 @@ OPTIONS=        PCRE	"Enable Perl-compatible regular expressions"		on
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PCRE)
-BUILD_DEPENDS+= ${PORTSDIR}/devel/pcre
+BUILD_DEPENDS+= pcre-config:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}
 .endif
 
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index d0243b53fbf0..b52cdd2ea5d6 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,3 +1,3 @@
-MD5 (cfengine-3.0.2.tar.gz) = ba23adb8c54c2da13953d8b24f303430
-SHA256 (cfengine-3.0.2.tar.gz) = b509be871864e74ebb493cfb395d527797689d6581087fe03f9d0e7b57b3f5bc
-SIZE (cfengine-3.0.2.tar.gz) = 2078775
+MD5 (cfengine-3.0.3.tar.gz) = ba1af278e9f8b519766b6ca4e1377d22
+SHA256 (cfengine-3.0.3.tar.gz) = 1fb18c93a272fccc484548a302b21e2b4b0cca3a21e6743849040ee65be8655e
+SIZE (cfengine-3.0.3.tar.gz) = 2173283
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index 0fae08ef99a0..544d8115e687 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -46,16 +46,19 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_copylinks.cf
 %%DOCSDIR%%/unit_create_filedir.cf
 %%DOCSDIR%%/unit_createdb.cf
+%%DOCSDIR%%/unit_countlinesmatching.cf
 %%DOCSDIR%%/unit_customize_by_named_list.cf
 %%DOCSDIR%%/unit_definitions.cf
 %%DOCSDIR%%/unit_deletelines.cf
 %%DOCSDIR%%/unit_disable_and_rotate_files.cf
+%%DOCSDIR%%/unit_diskfree.cf
 %%DOCSDIR%%/unit_dollar.cf
 %%DOCSDIR%%/unit_edit_column_files.cf
 %%DOCSDIR%%/unit_edit_comment_lines.cf
 %%DOCSDIR%%/unit_edit_deletenotmatch.cf
 %%DOCSDIR%%/unit_edit_insert_lines.cf
 %%DOCSDIR%%/unit_edit_insert_lines_silly.cf
+%%DOCSDIR%%/unit_edit_passwd_file.cf
 %%DOCSDIR%%/unit_edit_replace_string.cf
 %%DOCSDIR%%/unit_edit_sectioned_file.cf
 %%DOCSDIR%%/unit_edit_setvar.cf
@@ -75,18 +78,24 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_filesexist.cf
 %%DOCSDIR%%/unit_filesexist2.cf
 %%DOCSDIR%%/unit_fix_names.cf
+%%DOCSDIR%%/unit_getfields.cf
 %%DOCSDIR%%/unit_getgid.cf
 %%DOCSDIR%%/unit_getindices.cf
+%%DOCSDIR%%/unit_getindixes.cf
 %%DOCSDIR%%/unit_getregistry.cf
 %%DOCSDIR%%/unit_getuid.cf
 %%DOCSDIR%%/unit_global_list_expansion.cf
 %%DOCSDIR%%/unit_global_list_expansion_2.cf
+%%DOCSDIR%%/unit_grep.cf
 %%DOCSDIR%%/unit_groupexists.cf
 %%DOCSDIR%%/unit_hash.cf
 %%DOCSDIR%%/unit_hashcomment.cf
 %%DOCSDIR%%/unit_hashmatch.cf
+%%DOCSDIR%%/unit_hashuncomment.cf
 %%DOCSDIR%%/unit_helloworld.cf
 %%DOCSDIR%%/unit_hostrange.cf
+%%DOCSDIR%%/unit_hostsseen.cf
+%%DOCSDIR%%/unit_id.cf
 %%DOCSDIR%%/unit_insert_users.cf
 %%DOCSDIR%%/unit_intarray.cf
 %%DOCSDIR%%/unit_iprange.cf
@@ -97,6 +106,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_isplain.cf
 %%DOCSDIR%%/unit_isvariable.cf
 %%DOCSDIR%%/unit_iteration.cf
+%%DOCSDIR%%/unit_join.cf
 %%DOCSDIR%%/unit_knowledge_driver.cf
 %%DOCSDIR%%/unit_knowledge_txt.cf
 %%DOCSDIR%%/unit_lastnode.cf
@@ -113,13 +123,16 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_module_exec_2.cf
 %%DOCSDIR%%/unit_monitord.cf
 %%DOCSDIR%%/unit_mount_fs.cf
+%%DOCSDIR%%/unit_multipassvars.cf
 %%DOCSDIR%%/unit_neighbourhood_watch.cf
 %%DOCSDIR%%/unit_null_config.cf
 %%DOCSDIR%%/unit_occurrences.cf
 %%DOCSDIR%%/unit_ordering.cf
 %%DOCSDIR%%/unit_package_apt.cf
+%%DOCSDIR%%/unit_package_freebsd.cf
 %%DOCSDIR%%/unit_package_hash.cf
 %%DOCSDIR%%/unit_package_rpm.cf
+%%DOCSDIR%%/unit_package_solaris.cf
 %%DOCSDIR%%/unit_package_yum.cf
 %%DOCSDIR%%/unit_package_zypper.cf
 %%DOCSDIR%%/unit_parallel_exec.cf
@@ -130,6 +143,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_process_kill.cf
 %%DOCSDIR%%/unit_process_matching.cf
 %%DOCSDIR%%/unit_process_matching2.cf
+%%DOCSDIR%%/unit_process_matching3.cf
 %%DOCSDIR%%/unit_process_signalling.cf
 %%DOCSDIR%%/unit_promises.cf
 %%DOCSDIR%%/unit_readlist.cf
@@ -140,6 +154,8 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_reglist.cf
 %%DOCSDIR%%/unit_remove_deadlinks.cf
 %%DOCSDIR%%/unit_rename.cf
+%%DOCSDIR%%/unit_report_custom.cf
+%%DOCSDIR%%/unit_report_diffs.cf
 %%DOCSDIR%%/unit_report_state.cf
 %%DOCSDIR%%/unit_reporting.cf
 %%DOCSDIR%%/unit_reporttofile.cf
@@ -150,6 +166,7 @@ sbin/cf-serverd
 %%DOCSDIR%%/unit_select_region.cf
 %%DOCSDIR%%/unit_select_size.cf
 %%DOCSDIR%%/unit_selectservers.cf
+%%DOCSDIR%%/unit_setvar.cf
 %%DOCSDIR%%/unit_server_copy_localhost.cf
 %%DOCSDIR%%/unit_server_copy_purge.cf
 %%DOCSDIR%%/unit_server_copy_remote.cf