Update 3.1.5 --> 3.2.1.

PR:		160355 (3.2.0)
Submitted by:	Wojtek Kochanowski <wojciech.kochanowski@nnv.pl>

6 files changed, 474 insertions, 464 deletions

diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 3dc6026c6610..b9a42d7253b5 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.cfengine.org/tarballs/
+MASTER_SITES=	http://cfengine.com/source_code/download?file=
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A systems administration tool for networks
 LATEST_LINK=	cfengine3
+FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
 
 USE_RC_SUBR=	cf-execd cf-serverd
 
diff --git a/sysutils/cfengine3-legacy/distinfo b/sysutils/cfengine3-legacy/distinfo
index 7c09b16e0301..c42def4833da 100644
--- a/sysutils/cfengine3-legacy/distinfo
+++ b/sysutils/cfengine3-legacy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.1.5.tar.gz) = 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
-SIZE (cfengine-3.1.5.tar.gz) = 1141253
+SHA256 (cfengine-3.2.1.tar.gz) = 88110d9be61240f4b2bd7976258538d650044b04e07821fbb9ad4f43587ab196
+SIZE (cfengine-3.2.1.tar.gz) = 1101587
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index 08f9cf3a8483..519e10532317 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -1,3 +1,6 @@
+lib/libpromises.la
+lib/libpromises.so
+lib/libpromises.so.1
 sbin/cf-agent
 sbin/cf-execd
 sbin/cf-key
@@ -7,233 +10,235 @@ sbin/cf-promises
 sbin/cf-report
 sbin/cf-runagent
 sbin/cf-serverd
-lib/libpromises.la
-lib/libpromises.so
-lib/libpromises.so.1
+share/cfengine/masterfiles/cfengine_stdlib.cf
+share/cfengine/masterfiles/failsafe.cf
+share/cfengine/masterfiles/promises.cf
 %%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
-%%DOCSDIR%%/active_directory.cf
-%%DOCSDIR%%/app_baseline.cf
-%%DOCSDIR%%/cfengine_stdlib.cf
-%%DOCSDIR%%/inputs/cfengine_stdlib.cf
-%%DOCSDIR%%/inputs/failsafe.cf
-%%DOCSDIR%%/inputs/promises.cf
-%%DOCSDIR%%/inputs/site.cf
-%%DOCSDIR%%/inputs/update.cf
-%%DOCSDIR%%/promise_knowledge.cf
-%%DOCSDIR%%/unit_abort.cf
-%%DOCSDIR%%/unit_accessed_before.cf
-%%DOCSDIR%%/unit_accumulated_time.cf
-%%DOCSDIR%%/unit_acl.cf
-%%DOCSDIR%%/unit_acl_generic.cf
-%%DOCSDIR%%/unit_acl_secret.cf
-%%DOCSDIR%%/unit_activedirectory_listusers.cf
-%%DOCSDIR%%/unit_activedirectory_showuser.cf
-%%DOCSDIR%%/unit_ago.cf
-%%DOCSDIR%%/unit_arrays.cf
-%%DOCSDIR%%/unit_backreferences_files.cf
-%%DOCSDIR%%/unit_badpromise.cf
-%%DOCSDIR%%/unit_badtype.cf
-%%DOCSDIR%%/unit_bsdflags.cf
-%%DOCSDIR%%/unit_cf2_integration.cf
-%%DOCSDIR%%/unit_change_detect.cf
-%%DOCSDIR%%/unit_changedbefore.cf
-%%DOCSDIR%%/unit_chdir.cf
-%%DOCSDIR%%/unit_classes_global.cf
-%%DOCSDIR%%/unit_classmatch.cf
-%%DOCSDIR%%/unit_classvar_convergence.cf
-%%DOCSDIR%%/unit_compare.cf
-%%DOCSDIR%%/unit_control_expand.cf
-%%DOCSDIR%%/unit_controlclasses.cf
-%%DOCSDIR%%/unit_copy.cf
-%%DOCSDIR%%/unit_copy_classes.cf
-%%DOCSDIR%%/unit_copy_edit.cf
-%%DOCSDIR%%/unit_copylinks.cf
-%%DOCSDIR%%/unit_countclassesmatching.cf
-%%DOCSDIR%%/unit_countlinesmatching.cf
-%%DOCSDIR%%/unit_create_filedir.cf
-%%DOCSDIR%%/unit_createdb.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_fuzzylines.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
-%%DOCSDIR%%/unit_edit_triggerclass.cf
-%%DOCSDIR%%/unit_env.cf
-%%DOCSDIR%%/unit_environment.cf
-%%DOCSDIR%%/unit_environment_simple.cf
-%%DOCSDIR%%/unit_epimenides.cf
-%%DOCSDIR%%/unit_escape.cf
-%%DOCSDIR%%/unit_exec_args.cf
-%%DOCSDIR%%/unit_exec_in_sequence.cf
-%%DOCSDIR%%/unit_execd.cf
-%%DOCSDIR%%/unit_execresult.cf
-%%DOCSDIR%%/unit_expand.cf
-%%DOCSDIR%%/unit_failedcommand.cf
-%%DOCSDIR%%/unit_failsafe.cf
-%%DOCSDIR%%/unit_file_change_detection.cf
-%%DOCSDIR%%/unit_file_owner_list_template.cf
-%%DOCSDIR%%/unit_fileexists.cf
-%%DOCSDIR%%/unit_filenames.cf
-%%DOCSDIR%%/unit_fileperms.cf
-%%DOCSDIR%%/unit_filesexist.cf
-%%DOCSDIR%%/unit_filesexist2.cf
-%%DOCSDIR%%/unit_filesize.cf
-%%DOCSDIR%%/unit_fix_names.cf
-%%DOCSDIR%%/unit_getenv.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_getusers.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_host2ip.cf
-%%DOCSDIR%%/unit_hostrange.cf
-%%DOCSDIR%%/unit_hostsseen.cf
-%%DOCSDIR%%/unit_hub.cf
-%%DOCSDIR%%/unit_id.cf
-%%DOCSDIR%%/unit_insert_users.cf
-%%DOCSDIR%%/unit_intarray.cf
-%%DOCSDIR%%/unit_iprange.cf
-%%DOCSDIR%%/unit_irange.cf
-%%DOCSDIR%%/unit_isdir.cf
-%%DOCSDIR%%/unit_islink.cf
-%%DOCSDIR%%/unit_isnewerthan.cf
-%%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
-%%DOCSDIR%%/unit_ldap.cf
-%%DOCSDIR%%/unit_linking.cf
-%%DOCSDIR%%/unit_literal_server.cf
-%%DOCSDIR%%/unit_locate_files_and_compress.cf
-%%DOCSDIR%%/unit_log_private.cf
-%%DOCSDIR%%/unit_loops.cf
-%%DOCSDIR%%/unit_measure_log.cf
-%%DOCSDIR%%/unit_measurements.cf
-%%DOCSDIR%%/unit_menu.cf
-%%DOCSDIR%%/unit_method.cf
-%%DOCSDIR%%/unit_method_validate.cf
-%%DOCSDIR%%/unit_module_exec.cf
-%%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_msi_file.cf
-%%DOCSDIR%%/unit_package_msi_version.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
-%%DOCSDIR%%/unit_parsestringarray.cf
-%%DOCSDIR%%/unit_pathtype.cf
-%%DOCSDIR%%/unit_pattern_and_edit.cf
-%%DOCSDIR%%/unit_peers.cf
-%%DOCSDIR%%/unit_postfix.cf
-%%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_product.cf
-%%DOCSDIR%%/unit_promises.cf
-%%DOCSDIR%%/unit_readlist.cf
-%%DOCSDIR%%/unit_readtcp.cf
-%%DOCSDIR%%/unit_reg_multiline.cf
-%%DOCSDIR%%/unit_regarray.cf
-%%DOCSDIR%%/unit_regex_win.cf
-%%DOCSDIR%%/unit_regextract.cf
-%%DOCSDIR%%/unit_registry.cf
-%%DOCSDIR%%/unit_registry_cache.cf
-%%DOCSDIR%%/unit_regline.cf
-%%DOCSDIR%%/unit_reglist.cf
-%%DOCSDIR%%/unit_remoteclasses.cf
-%%DOCSDIR%%/unit_remove_deadlinks.cf
-%%DOCSDIR%%/unit_rename.cf
-%%DOCSDIR%%/unit_repairedcommand.cf
-%%DOCSDIR%%/unit_report_custom.cf
-%%DOCSDIR%%/unit_report_diffs.cf
-%%DOCSDIR%%/unit_report_state.cf
-%%DOCSDIR%%/unit_reporting.cf
-%%DOCSDIR%%/unit_reporttofile.cf
-%%DOCSDIR%%/unit_resolveconf.cf
-%%DOCSDIR%%/unit_returnszero.cf
-%%DOCSDIR%%/unit_root_passwd.cf
-%%DOCSDIR%%/unit_select_class.cf
-%%DOCSDIR%%/unit_select_mode.cf
-%%DOCSDIR%%/unit_select_region.cf
-%%DOCSDIR%%/unit_select_size.cf
-%%DOCSDIR%%/unit_selectservers.cf
-%%DOCSDIR%%/unit_server_copy_localhost.cf
-%%DOCSDIR%%/unit_server_copy_purge.cf
-%%DOCSDIR%%/unit_server_copy_remote.cf
-%%DOCSDIR%%/unit_server_flatcopy_localhost.cf
-%%DOCSDIR%%/unit_service_disable.cf
-%%DOCSDIR%%/unit_service_start.cf
-%%DOCSDIR%%/unit_setuidlog.cf
-%%DOCSDIR%%/unit_setvar.cf
-%%DOCSDIR%%/unit_software_dist.cf
-%%DOCSDIR%%/unit_splitstring.cf
-%%DOCSDIR%%/unit_sql.cf
-%%DOCSDIR%%/unit_storage.cf
-%%DOCSDIR%%/unit_strcmp.cf
-%%DOCSDIR%%/unit_stringarray.cf
-%%DOCSDIR%%/unit_switchcase.cf
-%%DOCSDIR%%/unit_syslog.cf
-%%DOCSDIR%%/unit_syslog2.cf
-%%DOCSDIR%%/unit_template.cf
-%%DOCSDIR%%/unit_template2.cf
-%%DOCSDIR%%/unit_test_environment.cf
-%%DOCSDIR%%/unit_tidy_all_files.cf
-%%DOCSDIR%%/unit_translatepath.cf
-%%DOCSDIR%%/unit_update.cf
-%%DOCSDIR%%/unit_user_edit.cf
-%%DOCSDIR%%/unit_user_edit_method.cf
-%%DOCSDIR%%/unit_userexists.cf
-%%DOCSDIR%%/unit_varclass.cf
-%%DOCSDIR%%/unit_varexpansion.cf
-%%DOCSDIR%%/unit_varnet.cf
-%%DOCSDIR%%/unit_vars.cf
-%%DOCSDIR%%/unit_warnifline.cf
-%%DOCSDIR%%/unit_webserver.cf
-%%DOCSDIR%%/unit_zenoss.cf
-%%DOCSDIR%%/win_emergency.cf
-%%DOCSDIR%%/win_registry.cf
-%%DOCSDIR%%/win_schedule.cf
-%%DOCSDIR%%/win_services.cf
-@dirrm %%DOCSDIR%%/inputs
+%%DOCSDIR%%/example_config/cfengine_stdlib.cf
+%%DOCSDIR%%/example_config/failsafe.cf
+%%DOCSDIR%%/example_config/promises.cf
+%%DOCSDIR%%/example_config/site.cf
+%%DOCSDIR%%/example_config/update.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/cfengine_stdlib.cf
+%%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/unit_abort.cf
+%%DOCSDIR%%/examples/unit_accessed_before.cf
+%%DOCSDIR%%/examples/unit_accumulated_time.cf
+%%DOCSDIR%%/examples/unit_acl.cf
+%%DOCSDIR%%/examples/unit_acl_generic.cf
+%%DOCSDIR%%/examples/unit_acl_secret.cf
+%%DOCSDIR%%/examples/unit_activedirectory_listusers.cf
+%%DOCSDIR%%/examples/unit_activedirectory_showuser.cf
+%%DOCSDIR%%/examples/unit_ago.cf
+%%DOCSDIR%%/examples/unit_arrays.cf
+%%DOCSDIR%%/examples/unit_backreferences_files.cf
+%%DOCSDIR%%/examples/unit_badpromise.cf
+%%DOCSDIR%%/examples/unit_badtype.cf
+%%DOCSDIR%%/examples/unit_bsdflags.cf
+%%DOCSDIR%%/examples/unit_cf2_integration.cf
+%%DOCSDIR%%/examples/unit_change_detect.cf
+%%DOCSDIR%%/examples/unit_changedbefore.cf
+%%DOCSDIR%%/examples/unit_chdir.cf
+%%DOCSDIR%%/examples/unit_classes_global.cf
+%%DOCSDIR%%/examples/unit_classmatch.cf
+%%DOCSDIR%%/examples/unit_classvar_convergence.cf
+%%DOCSDIR%%/examples/unit_compare.cf
+%%DOCSDIR%%/examples/unit_control_expand.cf
+%%DOCSDIR%%/examples/unit_controlclasses.cf
+%%DOCSDIR%%/examples/unit_copy.cf
+%%DOCSDIR%%/examples/unit_copy_classes.cf
+%%DOCSDIR%%/examples/unit_copy_edit.cf
+%%DOCSDIR%%/examples/unit_copylinks.cf
+%%DOCSDIR%%/examples/unit_countclassesmatching.cf
+%%DOCSDIR%%/examples/unit_countlinesmatching.cf
+%%DOCSDIR%%/examples/unit_create_filedir.cf
+%%DOCSDIR%%/examples/unit_createdb.cf
+%%DOCSDIR%%/examples/unit_customize_by_named_list.cf
+%%DOCSDIR%%/examples/unit_definitions.cf
+%%DOCSDIR%%/examples/unit_deletelines.cf
+%%DOCSDIR%%/examples/unit_disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/unit_diskfree.cf
+%%DOCSDIR%%/examples/unit_dollar.cf
+%%DOCSDIR%%/examples/unit_edit_column_files.cf
+%%DOCSDIR%%/examples/unit_edit_comment_lines.cf
+%%DOCSDIR%%/examples/unit_edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/unit_edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/unit_edit_insert_lines.cf
+%%DOCSDIR%%/examples/unit_edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/unit_edit_passwd_file.cf
+%%DOCSDIR%%/examples/unit_edit_replace_string.cf
+%%DOCSDIR%%/examples/unit_edit_sectioned_file.cf
+%%DOCSDIR%%/examples/unit_edit_setvar.cf
+%%DOCSDIR%%/examples/unit_edit_triggerclass.cf
+%%DOCSDIR%%/examples/unit_env.cf
+%%DOCSDIR%%/examples/unit_environment.cf
+%%DOCSDIR%%/examples/unit_environment_simple.cf
+%%DOCSDIR%%/examples/unit_epimenides.cf
+%%DOCSDIR%%/examples/unit_escape.cf
+%%DOCSDIR%%/examples/unit_exec_args.cf
+%%DOCSDIR%%/examples/unit_exec_in_sequence.cf
+%%DOCSDIR%%/examples/unit_execd.cf
+%%DOCSDIR%%/examples/unit_execresult.cf
+%%DOCSDIR%%/examples/unit_expand.cf
+%%DOCSDIR%%/examples/unit_failedcommand.cf
+%%DOCSDIR%%/examples/unit_failsafe.cf
+%%DOCSDIR%%/examples/unit_file_change_detection.cf
+%%DOCSDIR%%/examples/unit_file_owner_list_template.cf
+%%DOCSDIR%%/examples/unit_fileexists.cf
+%%DOCSDIR%%/examples/unit_filenames.cf
+%%DOCSDIR%%/examples/unit_fileperms.cf
+%%DOCSDIR%%/examples/unit_filesexist.cf
+%%DOCSDIR%%/examples/unit_filesexist2.cf
+%%DOCSDIR%%/examples/unit_filesize.cf
+%%DOCSDIR%%/examples/unit_fix_names.cf
+%%DOCSDIR%%/examples/unit_getenv.cf
+%%DOCSDIR%%/examples/unit_getfields.cf
+%%DOCSDIR%%/examples/unit_getgid.cf
+%%DOCSDIR%%/examples/unit_getindices.cf
+%%DOCSDIR%%/examples/unit_getindices_and_values.cf
+%%DOCSDIR%%/examples/unit_getregistry.cf
+%%DOCSDIR%%/examples/unit_getuid.cf
+%%DOCSDIR%%/examples/unit_getusers.cf
+%%DOCSDIR%%/examples/unit_global_list_expansion.cf
+%%DOCSDIR%%/examples/unit_global_list_expansion_2.cf
+%%DOCSDIR%%/examples/unit_grep.cf
+%%DOCSDIR%%/examples/unit_groupexists.cf
+%%DOCSDIR%%/examples/unit_hash.cf
+%%DOCSDIR%%/examples/unit_hashcomment.cf
+%%DOCSDIR%%/examples/unit_hashmatch.cf
+%%DOCSDIR%%/examples/unit_hashuncomment.cf
+%%DOCSDIR%%/examples/unit_helloworld.cf
+%%DOCSDIR%%/examples/unit_host2ip.cf
+%%DOCSDIR%%/examples/unit_hostrange.cf
+%%DOCSDIR%%/examples/unit_hostsseen.cf
+%%DOCSDIR%%/examples/unit_hub.cf
+%%DOCSDIR%%/examples/unit_id.cf
+%%DOCSDIR%%/examples/unit_insert_users.cf
+%%DOCSDIR%%/examples/unit_intarray.cf
+%%DOCSDIR%%/examples/unit_iprange.cf
+%%DOCSDIR%%/examples/unit_irange.cf
+%%DOCSDIR%%/examples/unit_isdir.cf
+%%DOCSDIR%%/examples/unit_islink.cf
+%%DOCSDIR%%/examples/unit_isnewerthan.cf
+%%DOCSDIR%%/examples/unit_isplain.cf
+%%DOCSDIR%%/examples/unit_isvariable.cf
+%%DOCSDIR%%/examples/unit_iteration.cf
+%%DOCSDIR%%/examples/unit_join.cf
+%%DOCSDIR%%/examples/unit_knowledge_driver.cf
+%%DOCSDIR%%/examples/unit_knowledge_txt.cf
+%%DOCSDIR%%/examples/unit_lastnode.cf
+%%DOCSDIR%%/examples/unit_ldap.cf
+%%DOCSDIR%%/examples/unit_linking.cf
+%%DOCSDIR%%/examples/unit_literal_server.cf
+%%DOCSDIR%%/examples/unit_locate_files_and_compress.cf
+%%DOCSDIR%%/examples/unit_log_private.cf
+%%DOCSDIR%%/examples/unit_loops.cf
+%%DOCSDIR%%/examples/unit_measure_log.cf
+%%DOCSDIR%%/examples/unit_measurements.cf
+%%DOCSDIR%%/examples/unit_menu.cf
+%%DOCSDIR%%/examples/unit_method.cf
+%%DOCSDIR%%/examples/unit_method_validate.cf
+%%DOCSDIR%%/examples/unit_method_var.cf
+%%DOCSDIR%%/examples/unit_module_exec.cf
+%%DOCSDIR%%/examples/unit_module_exec_2.cf
+%%DOCSDIR%%/examples/unit_monitord.cf
+%%DOCSDIR%%/examples/unit_mount_fs.cf
+%%DOCSDIR%%/examples/unit_multipassvars.cf
+%%DOCSDIR%%/examples/unit_neighbourhood_watch.cf
+%%DOCSDIR%%/examples/unit_null_config.cf
+%%DOCSDIR%%/examples/unit_occurrences.cf
+%%DOCSDIR%%/examples/unit_ordering.cf
+%%DOCSDIR%%/examples/unit_package_apt.cf
+%%DOCSDIR%%/examples/unit_package_freebsd.cf
+%%DOCSDIR%%/examples/unit_package_hash.cf
+%%DOCSDIR%%/examples/unit_package_msi_file.cf
+%%DOCSDIR%%/examples/unit_package_msi_version.cf
+%%DOCSDIR%%/examples/unit_package_rpm.cf
+%%DOCSDIR%%/examples/unit_package_solaris.cf
+%%DOCSDIR%%/examples/unit_package_yum.cf
+%%DOCSDIR%%/examples/unit_package_zypper.cf
+%%DOCSDIR%%/examples/unit_parallel_exec.cf
+%%DOCSDIR%%/examples/unit_parsestringarray.cf
+%%DOCSDIR%%/examples/unit_pathtype.cf
+%%DOCSDIR%%/examples/unit_pattern_and_edit.cf
+%%DOCSDIR%%/examples/unit_peers.cf
+%%DOCSDIR%%/examples/unit_postfix.cf
+%%DOCSDIR%%/examples/unit_process_kill.cf
+%%DOCSDIR%%/examples/unit_process_matching.cf
+%%DOCSDIR%%/examples/unit_process_matching2.cf
+%%DOCSDIR%%/examples/unit_process_matching3.cf
+%%DOCSDIR%%/examples/unit_process_signalling.cf
+%%DOCSDIR%%/examples/unit_product.cf
+%%DOCSDIR%%/examples/unit_promises.cf
+%%DOCSDIR%%/examples/unit_readlist.cf
+%%DOCSDIR%%/examples/unit_readtcp.cf
+%%DOCSDIR%%/examples/unit_reg_multiline.cf
+%%DOCSDIR%%/examples/unit_regarray.cf
+%%DOCSDIR%%/examples/unit_regex_win.cf
+%%DOCSDIR%%/examples/unit_regextract.cf
+%%DOCSDIR%%/examples/unit_registry.cf
+%%DOCSDIR%%/examples/unit_registry_cache.cf
+%%DOCSDIR%%/examples/unit_regline.cf
+%%DOCSDIR%%/examples/unit_reglist.cf
+%%DOCSDIR%%/examples/unit_remoteclasses.cf
+%%DOCSDIR%%/examples/unit_remove_deadlinks.cf
+%%DOCSDIR%%/examples/unit_rename.cf
+%%DOCSDIR%%/examples/unit_repairedcommand.cf
+%%DOCSDIR%%/examples/unit_report_custom.cf
+%%DOCSDIR%%/examples/unit_report_diffs.cf
+%%DOCSDIR%%/examples/unit_report_state.cf
+%%DOCSDIR%%/examples/unit_reporting.cf
+%%DOCSDIR%%/examples/unit_reporttofile.cf
+%%DOCSDIR%%/examples/unit_resolveconf.cf
+%%DOCSDIR%%/examples/unit_returnszero.cf
+%%DOCSDIR%%/examples/unit_root_passwd.cf
+%%DOCSDIR%%/examples/unit_select_class.cf
+%%DOCSDIR%%/examples/unit_select_mode.cf
+%%DOCSDIR%%/examples/unit_select_region.cf
+%%DOCSDIR%%/examples/unit_select_size.cf
+%%DOCSDIR%%/examples/unit_selectservers.cf
+%%DOCSDIR%%/examples/unit_server_copy_localhost.cf
+%%DOCSDIR%%/examples/unit_server_copy_purge.cf
+%%DOCSDIR%%/examples/unit_server_copy_remote.cf
+%%DOCSDIR%%/examples/unit_server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/unit_service_disable.cf
+%%DOCSDIR%%/examples/unit_service_start.cf
+%%DOCSDIR%%/examples/unit_setuidlog.cf
+%%DOCSDIR%%/examples/unit_setvar.cf
+%%DOCSDIR%%/examples/unit_software_dist.cf
+%%DOCSDIR%%/examples/unit_splitstring.cf
+%%DOCSDIR%%/examples/unit_sql.cf
+%%DOCSDIR%%/examples/unit_storage.cf
+%%DOCSDIR%%/examples/unit_strcmp.cf
+%%DOCSDIR%%/examples/unit_stringarray.cf
+%%DOCSDIR%%/examples/unit_switchcase.cf
+%%DOCSDIR%%/examples/unit_syslog.cf
+%%DOCSDIR%%/examples/unit_syslog2.cf
+%%DOCSDIR%%/examples/unit_template.cf
+%%DOCSDIR%%/examples/unit_template2.cf
+%%DOCSDIR%%/examples/unit_test_environment.cf
+%%DOCSDIR%%/examples/unit_tidy_all_files.cf
+%%DOCSDIR%%/examples/unit_translatepath.cf
+%%DOCSDIR%%/examples/unit_update.cf
+%%DOCSDIR%%/examples/unit_user_edit.cf
+%%DOCSDIR%%/examples/unit_user_edit_method.cf
+%%DOCSDIR%%/examples/unit_userexists.cf
+%%DOCSDIR%%/examples/unit_varclass.cf
+%%DOCSDIR%%/examples/unit_varexpansion.cf
+%%DOCSDIR%%/examples/unit_varnet.cf
+%%DOCSDIR%%/examples/unit_vars.cf
+%%DOCSDIR%%/examples/unit_warnifline.cf
+%%DOCSDIR%%/examples/unit_webserver.cf
+%%DOCSDIR%%/examples/unit_zenoss.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/win_services.cf
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%/example_config
 @dirrm %%DOCSDIR%%
+@dirrm share/cfengine/masterfiles
+@dirrm share/cfengine
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 3dc6026c6610..b9a42d7253b5 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTVERSION=	3.2.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.cfengine.org/tarballs/
+MASTER_SITES=	http://cfengine.com/source_code/download?file=
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A systems administration tool for networks
 LATEST_LINK=	cfengine3
+FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
 
 USE_RC_SUBR=	cf-execd cf-serverd
 
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index 7c09b16e0301..c42def4833da 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.1.5.tar.gz) = 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
-SIZE (cfengine-3.1.5.tar.gz) = 1141253
+SHA256 (cfengine-3.2.1.tar.gz) = 88110d9be61240f4b2bd7976258538d650044b04e07821fbb9ad4f43587ab196
+SIZE (cfengine-3.2.1.tar.gz) = 1101587
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index 08f9cf3a8483..519e10532317 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -1,3 +1,6 @@
+lib/libpromises.la
+lib/libpromises.so
+lib/libpromises.so.1
 sbin/cf-agent
 sbin/cf-execd
 sbin/cf-key
@@ -7,233 +10,235 @@ sbin/cf-promises
 sbin/cf-report
 sbin/cf-runagent
 sbin/cf-serverd
-lib/libpromises.la
-lib/libpromises.so
-lib/libpromises.so.1
+share/cfengine/masterfiles/cfengine_stdlib.cf
+share/cfengine/masterfiles/failsafe.cf
+share/cfengine/masterfiles/promises.cf
 %%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
 %%DOCSDIR%%/README
-%%DOCSDIR%%/active_directory.cf
-%%DOCSDIR%%/app_baseline.cf
-%%DOCSDIR%%/cfengine_stdlib.cf
-%%DOCSDIR%%/inputs/cfengine_stdlib.cf
-%%DOCSDIR%%/inputs/failsafe.cf
-%%DOCSDIR%%/inputs/promises.cf
-%%DOCSDIR%%/inputs/site.cf
-%%DOCSDIR%%/inputs/update.cf
-%%DOCSDIR%%/promise_knowledge.cf
-%%DOCSDIR%%/unit_abort.cf
-%%DOCSDIR%%/unit_accessed_before.cf
-%%DOCSDIR%%/unit_accumulated_time.cf
-%%DOCSDIR%%/unit_acl.cf
-%%DOCSDIR%%/unit_acl_generic.cf
-%%DOCSDIR%%/unit_acl_secret.cf
-%%DOCSDIR%%/unit_activedirectory_listusers.cf
-%%DOCSDIR%%/unit_activedirectory_showuser.cf
-%%DOCSDIR%%/unit_ago.cf
-%%DOCSDIR%%/unit_arrays.cf
-%%DOCSDIR%%/unit_backreferences_files.cf
-%%DOCSDIR%%/unit_badpromise.cf
-%%DOCSDIR%%/unit_badtype.cf
-%%DOCSDIR%%/unit_bsdflags.cf
-%%DOCSDIR%%/unit_cf2_integration.cf
-%%DOCSDIR%%/unit_change_detect.cf
-%%DOCSDIR%%/unit_changedbefore.cf
-%%DOCSDIR%%/unit_chdir.cf
-%%DOCSDIR%%/unit_classes_global.cf
-%%DOCSDIR%%/unit_classmatch.cf
-%%DOCSDIR%%/unit_classvar_convergence.cf
-%%DOCSDIR%%/unit_compare.cf
-%%DOCSDIR%%/unit_control_expand.cf
-%%DOCSDIR%%/unit_controlclasses.cf
-%%DOCSDIR%%/unit_copy.cf
-%%DOCSDIR%%/unit_copy_classes.cf
-%%DOCSDIR%%/unit_copy_edit.cf
-%%DOCSDIR%%/unit_copylinks.cf
-%%DOCSDIR%%/unit_countclassesmatching.cf
-%%DOCSDIR%%/unit_countlinesmatching.cf
-%%DOCSDIR%%/unit_create_filedir.cf
-%%DOCSDIR%%/unit_createdb.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_fuzzylines.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
-%%DOCSDIR%%/unit_edit_triggerclass.cf
-%%DOCSDIR%%/unit_env.cf
-%%DOCSDIR%%/unit_environment.cf
-%%DOCSDIR%%/unit_environment_simple.cf
-%%DOCSDIR%%/unit_epimenides.cf
-%%DOCSDIR%%/unit_escape.cf
-%%DOCSDIR%%/unit_exec_args.cf
-%%DOCSDIR%%/unit_exec_in_sequence.cf
-%%DOCSDIR%%/unit_execd.cf
-%%DOCSDIR%%/unit_execresult.cf
-%%DOCSDIR%%/unit_expand.cf
-%%DOCSDIR%%/unit_failedcommand.cf
-%%DOCSDIR%%/unit_failsafe.cf
-%%DOCSDIR%%/unit_file_change_detection.cf
-%%DOCSDIR%%/unit_file_owner_list_template.cf
-%%DOCSDIR%%/unit_fileexists.cf
-%%DOCSDIR%%/unit_filenames.cf
-%%DOCSDIR%%/unit_fileperms.cf
-%%DOCSDIR%%/unit_filesexist.cf
-%%DOCSDIR%%/unit_filesexist2.cf
-%%DOCSDIR%%/unit_filesize.cf
-%%DOCSDIR%%/unit_fix_names.cf
-%%DOCSDIR%%/unit_getenv.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_getusers.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_host2ip.cf
-%%DOCSDIR%%/unit_hostrange.cf
-%%DOCSDIR%%/unit_hostsseen.cf
-%%DOCSDIR%%/unit_hub.cf
-%%DOCSDIR%%/unit_id.cf
-%%DOCSDIR%%/unit_insert_users.cf
-%%DOCSDIR%%/unit_intarray.cf
-%%DOCSDIR%%/unit_iprange.cf
-%%DOCSDIR%%/unit_irange.cf
-%%DOCSDIR%%/unit_isdir.cf
-%%DOCSDIR%%/unit_islink.cf
-%%DOCSDIR%%/unit_isnewerthan.cf
-%%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
-%%DOCSDIR%%/unit_ldap.cf
-%%DOCSDIR%%/unit_linking.cf
-%%DOCSDIR%%/unit_literal_server.cf
-%%DOCSDIR%%/unit_locate_files_and_compress.cf
-%%DOCSDIR%%/unit_log_private.cf
-%%DOCSDIR%%/unit_loops.cf
-%%DOCSDIR%%/unit_measure_log.cf
-%%DOCSDIR%%/unit_measurements.cf
-%%DOCSDIR%%/unit_menu.cf
-%%DOCSDIR%%/unit_method.cf
-%%DOCSDIR%%/unit_method_validate.cf
-%%DOCSDIR%%/unit_module_exec.cf
-%%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_msi_file.cf
-%%DOCSDIR%%/unit_package_msi_version.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
-%%DOCSDIR%%/unit_parsestringarray.cf
-%%DOCSDIR%%/unit_pathtype.cf
-%%DOCSDIR%%/unit_pattern_and_edit.cf
-%%DOCSDIR%%/unit_peers.cf
-%%DOCSDIR%%/unit_postfix.cf
-%%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_product.cf
-%%DOCSDIR%%/unit_promises.cf
-%%DOCSDIR%%/unit_readlist.cf
-%%DOCSDIR%%/unit_readtcp.cf
-%%DOCSDIR%%/unit_reg_multiline.cf
-%%DOCSDIR%%/unit_regarray.cf
-%%DOCSDIR%%/unit_regex_win.cf
-%%DOCSDIR%%/unit_regextract.cf
-%%DOCSDIR%%/unit_registry.cf
-%%DOCSDIR%%/unit_registry_cache.cf
-%%DOCSDIR%%/unit_regline.cf
-%%DOCSDIR%%/unit_reglist.cf
-%%DOCSDIR%%/unit_remoteclasses.cf
-%%DOCSDIR%%/unit_remove_deadlinks.cf
-%%DOCSDIR%%/unit_rename.cf
-%%DOCSDIR%%/unit_repairedcommand.cf
-%%DOCSDIR%%/unit_report_custom.cf
-%%DOCSDIR%%/unit_report_diffs.cf
-%%DOCSDIR%%/unit_report_state.cf
-%%DOCSDIR%%/unit_reporting.cf
-%%DOCSDIR%%/unit_reporttofile.cf
-%%DOCSDIR%%/unit_resolveconf.cf
-%%DOCSDIR%%/unit_returnszero.cf
-%%DOCSDIR%%/unit_root_passwd.cf
-%%DOCSDIR%%/unit_select_class.cf
-%%DOCSDIR%%/unit_select_mode.cf
-%%DOCSDIR%%/unit_select_region.cf
-%%DOCSDIR%%/unit_select_size.cf
-%%DOCSDIR%%/unit_selectservers.cf
-%%DOCSDIR%%/unit_server_copy_localhost.cf
-%%DOCSDIR%%/unit_server_copy_purge.cf
-%%DOCSDIR%%/unit_server_copy_remote.cf
-%%DOCSDIR%%/unit_server_flatcopy_localhost.cf
-%%DOCSDIR%%/unit_service_disable.cf
-%%DOCSDIR%%/unit_service_start.cf
-%%DOCSDIR%%/unit_setuidlog.cf
-%%DOCSDIR%%/unit_setvar.cf
-%%DOCSDIR%%/unit_software_dist.cf
-%%DOCSDIR%%/unit_splitstring.cf
-%%DOCSDIR%%/unit_sql.cf
-%%DOCSDIR%%/unit_storage.cf
-%%DOCSDIR%%/unit_strcmp.cf
-%%DOCSDIR%%/unit_stringarray.cf
-%%DOCSDIR%%/unit_switchcase.cf
-%%DOCSDIR%%/unit_syslog.cf
-%%DOCSDIR%%/unit_syslog2.cf
-%%DOCSDIR%%/unit_template.cf
-%%DOCSDIR%%/unit_template2.cf
-%%DOCSDIR%%/unit_test_environment.cf
-%%DOCSDIR%%/unit_tidy_all_files.cf
-%%DOCSDIR%%/unit_translatepath.cf
-%%DOCSDIR%%/unit_update.cf
-%%DOCSDIR%%/unit_user_edit.cf
-%%DOCSDIR%%/unit_user_edit_method.cf
-%%DOCSDIR%%/unit_userexists.cf
-%%DOCSDIR%%/unit_varclass.cf
-%%DOCSDIR%%/unit_varexpansion.cf
-%%DOCSDIR%%/unit_varnet.cf
-%%DOCSDIR%%/unit_vars.cf
-%%DOCSDIR%%/unit_warnifline.cf
-%%DOCSDIR%%/unit_webserver.cf
-%%DOCSDIR%%/unit_zenoss.cf
-%%DOCSDIR%%/win_emergency.cf
-%%DOCSDIR%%/win_registry.cf
-%%DOCSDIR%%/win_schedule.cf
-%%DOCSDIR%%/win_services.cf
-@dirrm %%DOCSDIR%%/inputs
+%%DOCSDIR%%/example_config/cfengine_stdlib.cf
+%%DOCSDIR%%/example_config/failsafe.cf
+%%DOCSDIR%%/example_config/promises.cf
+%%DOCSDIR%%/example_config/site.cf
+%%DOCSDIR%%/example_config/update.cf
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/cfengine_stdlib.cf
+%%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/unit_abort.cf
+%%DOCSDIR%%/examples/unit_accessed_before.cf
+%%DOCSDIR%%/examples/unit_accumulated_time.cf
+%%DOCSDIR%%/examples/unit_acl.cf
+%%DOCSDIR%%/examples/unit_acl_generic.cf
+%%DOCSDIR%%/examples/unit_acl_secret.cf
+%%DOCSDIR%%/examples/unit_activedirectory_listusers.cf
+%%DOCSDIR%%/examples/unit_activedirectory_showuser.cf
+%%DOCSDIR%%/examples/unit_ago.cf
+%%DOCSDIR%%/examples/unit_arrays.cf
+%%DOCSDIR%%/examples/unit_backreferences_files.cf
+%%DOCSDIR%%/examples/unit_badpromise.cf
+%%DOCSDIR%%/examples/unit_badtype.cf
+%%DOCSDIR%%/examples/unit_bsdflags.cf
+%%DOCSDIR%%/examples/unit_cf2_integration.cf
+%%DOCSDIR%%/examples/unit_change_detect.cf
+%%DOCSDIR%%/examples/unit_changedbefore.cf
+%%DOCSDIR%%/examples/unit_chdir.cf
+%%DOCSDIR%%/examples/unit_classes_global.cf
+%%DOCSDIR%%/examples/unit_classmatch.cf
+%%DOCSDIR%%/examples/unit_classvar_convergence.cf
+%%DOCSDIR%%/examples/unit_compare.cf
+%%DOCSDIR%%/examples/unit_control_expand.cf
+%%DOCSDIR%%/examples/unit_controlclasses.cf
+%%DOCSDIR%%/examples/unit_copy.cf
+%%DOCSDIR%%/examples/unit_copy_classes.cf
+%%DOCSDIR%%/examples/unit_copy_edit.cf
+%%DOCSDIR%%/examples/unit_copylinks.cf
+%%DOCSDIR%%/examples/unit_countclassesmatching.cf
+%%DOCSDIR%%/examples/unit_countlinesmatching.cf
+%%DOCSDIR%%/examples/unit_create_filedir.cf
+%%DOCSDIR%%/examples/unit_createdb.cf
+%%DOCSDIR%%/examples/unit_customize_by_named_list.cf
+%%DOCSDIR%%/examples/unit_definitions.cf
+%%DOCSDIR%%/examples/unit_deletelines.cf
+%%DOCSDIR%%/examples/unit_disable_and_rotate_files.cf
+%%DOCSDIR%%/examples/unit_diskfree.cf
+%%DOCSDIR%%/examples/unit_dollar.cf
+%%DOCSDIR%%/examples/unit_edit_column_files.cf
+%%DOCSDIR%%/examples/unit_edit_comment_lines.cf
+%%DOCSDIR%%/examples/unit_edit_deletenotmatch.cf
+%%DOCSDIR%%/examples/unit_edit_insert_fuzzylines.cf
+%%DOCSDIR%%/examples/unit_edit_insert_lines.cf
+%%DOCSDIR%%/examples/unit_edit_insert_lines_silly.cf
+%%DOCSDIR%%/examples/unit_edit_passwd_file.cf
+%%DOCSDIR%%/examples/unit_edit_replace_string.cf
+%%DOCSDIR%%/examples/unit_edit_sectioned_file.cf
+%%DOCSDIR%%/examples/unit_edit_setvar.cf
+%%DOCSDIR%%/examples/unit_edit_triggerclass.cf
+%%DOCSDIR%%/examples/unit_env.cf
+%%DOCSDIR%%/examples/unit_environment.cf
+%%DOCSDIR%%/examples/unit_environment_simple.cf
+%%DOCSDIR%%/examples/unit_epimenides.cf
+%%DOCSDIR%%/examples/unit_escape.cf
+%%DOCSDIR%%/examples/unit_exec_args.cf
+%%DOCSDIR%%/examples/unit_exec_in_sequence.cf
+%%DOCSDIR%%/examples/unit_execd.cf
+%%DOCSDIR%%/examples/unit_execresult.cf
+%%DOCSDIR%%/examples/unit_expand.cf
+%%DOCSDIR%%/examples/unit_failedcommand.cf
+%%DOCSDIR%%/examples/unit_failsafe.cf
+%%DOCSDIR%%/examples/unit_file_change_detection.cf
+%%DOCSDIR%%/examples/unit_file_owner_list_template.cf
+%%DOCSDIR%%/examples/unit_fileexists.cf
+%%DOCSDIR%%/examples/unit_filenames.cf
+%%DOCSDIR%%/examples/unit_fileperms.cf
+%%DOCSDIR%%/examples/unit_filesexist.cf
+%%DOCSDIR%%/examples/unit_filesexist2.cf
+%%DOCSDIR%%/examples/unit_filesize.cf
+%%DOCSDIR%%/examples/unit_fix_names.cf
+%%DOCSDIR%%/examples/unit_getenv.cf
+%%DOCSDIR%%/examples/unit_getfields.cf
+%%DOCSDIR%%/examples/unit_getgid.cf
+%%DOCSDIR%%/examples/unit_getindices.cf
+%%DOCSDIR%%/examples/unit_getindices_and_values.cf
+%%DOCSDIR%%/examples/unit_getregistry.cf
+%%DOCSDIR%%/examples/unit_getuid.cf
+%%DOCSDIR%%/examples/unit_getusers.cf
+%%DOCSDIR%%/examples/unit_global_list_expansion.cf
+%%DOCSDIR%%/examples/unit_global_list_expansion_2.cf
+%%DOCSDIR%%/examples/unit_grep.cf
+%%DOCSDIR%%/examples/unit_groupexists.cf
+%%DOCSDIR%%/examples/unit_hash.cf
+%%DOCSDIR%%/examples/unit_hashcomment.cf
+%%DOCSDIR%%/examples/unit_hashmatch.cf
+%%DOCSDIR%%/examples/unit_hashuncomment.cf
+%%DOCSDIR%%/examples/unit_helloworld.cf
+%%DOCSDIR%%/examples/unit_host2ip.cf
+%%DOCSDIR%%/examples/unit_hostrange.cf
+%%DOCSDIR%%/examples/unit_hostsseen.cf
+%%DOCSDIR%%/examples/unit_hub.cf
+%%DOCSDIR%%/examples/unit_id.cf
+%%DOCSDIR%%/examples/unit_insert_users.cf
+%%DOCSDIR%%/examples/unit_intarray.cf
+%%DOCSDIR%%/examples/unit_iprange.cf
+%%DOCSDIR%%/examples/unit_irange.cf
+%%DOCSDIR%%/examples/unit_isdir.cf
+%%DOCSDIR%%/examples/unit_islink.cf
+%%DOCSDIR%%/examples/unit_isnewerthan.cf
+%%DOCSDIR%%/examples/unit_isplain.cf
+%%DOCSDIR%%/examples/unit_isvariable.cf
+%%DOCSDIR%%/examples/unit_iteration.cf
+%%DOCSDIR%%/examples/unit_join.cf
+%%DOCSDIR%%/examples/unit_knowledge_driver.cf
+%%DOCSDIR%%/examples/unit_knowledge_txt.cf
+%%DOCSDIR%%/examples/unit_lastnode.cf
+%%DOCSDIR%%/examples/unit_ldap.cf
+%%DOCSDIR%%/examples/unit_linking.cf
+%%DOCSDIR%%/examples/unit_literal_server.cf
+%%DOCSDIR%%/examples/unit_locate_files_and_compress.cf
+%%DOCSDIR%%/examples/unit_log_private.cf
+%%DOCSDIR%%/examples/unit_loops.cf
+%%DOCSDIR%%/examples/unit_measure_log.cf
+%%DOCSDIR%%/examples/unit_measurements.cf
+%%DOCSDIR%%/examples/unit_menu.cf
+%%DOCSDIR%%/examples/unit_method.cf
+%%DOCSDIR%%/examples/unit_method_validate.cf
+%%DOCSDIR%%/examples/unit_method_var.cf
+%%DOCSDIR%%/examples/unit_module_exec.cf
+%%DOCSDIR%%/examples/unit_module_exec_2.cf
+%%DOCSDIR%%/examples/unit_monitord.cf
+%%DOCSDIR%%/examples/unit_mount_fs.cf
+%%DOCSDIR%%/examples/unit_multipassvars.cf
+%%DOCSDIR%%/examples/unit_neighbourhood_watch.cf
+%%DOCSDIR%%/examples/unit_null_config.cf
+%%DOCSDIR%%/examples/unit_occurrences.cf
+%%DOCSDIR%%/examples/unit_ordering.cf
+%%DOCSDIR%%/examples/unit_package_apt.cf
+%%DOCSDIR%%/examples/unit_package_freebsd.cf
+%%DOCSDIR%%/examples/unit_package_hash.cf
+%%DOCSDIR%%/examples/unit_package_msi_file.cf
+%%DOCSDIR%%/examples/unit_package_msi_version.cf
+%%DOCSDIR%%/examples/unit_package_rpm.cf
+%%DOCSDIR%%/examples/unit_package_solaris.cf
+%%DOCSDIR%%/examples/unit_package_yum.cf
+%%DOCSDIR%%/examples/unit_package_zypper.cf
+%%DOCSDIR%%/examples/unit_parallel_exec.cf
+%%DOCSDIR%%/examples/unit_parsestringarray.cf
+%%DOCSDIR%%/examples/unit_pathtype.cf
+%%DOCSDIR%%/examples/unit_pattern_and_edit.cf
+%%DOCSDIR%%/examples/unit_peers.cf
+%%DOCSDIR%%/examples/unit_postfix.cf
+%%DOCSDIR%%/examples/unit_process_kill.cf
+%%DOCSDIR%%/examples/unit_process_matching.cf
+%%DOCSDIR%%/examples/unit_process_matching2.cf
+%%DOCSDIR%%/examples/unit_process_matching3.cf
+%%DOCSDIR%%/examples/unit_process_signalling.cf
+%%DOCSDIR%%/examples/unit_product.cf
+%%DOCSDIR%%/examples/unit_promises.cf
+%%DOCSDIR%%/examples/unit_readlist.cf
+%%DOCSDIR%%/examples/unit_readtcp.cf
+%%DOCSDIR%%/examples/unit_reg_multiline.cf
+%%DOCSDIR%%/examples/unit_regarray.cf
+%%DOCSDIR%%/examples/unit_regex_win.cf
+%%DOCSDIR%%/examples/unit_regextract.cf
+%%DOCSDIR%%/examples/unit_registry.cf
+%%DOCSDIR%%/examples/unit_registry_cache.cf
+%%DOCSDIR%%/examples/unit_regline.cf
+%%DOCSDIR%%/examples/unit_reglist.cf
+%%DOCSDIR%%/examples/unit_remoteclasses.cf
+%%DOCSDIR%%/examples/unit_remove_deadlinks.cf
+%%DOCSDIR%%/examples/unit_rename.cf
+%%DOCSDIR%%/examples/unit_repairedcommand.cf
+%%DOCSDIR%%/examples/unit_report_custom.cf
+%%DOCSDIR%%/examples/unit_report_diffs.cf
+%%DOCSDIR%%/examples/unit_report_state.cf
+%%DOCSDIR%%/examples/unit_reporting.cf
+%%DOCSDIR%%/examples/unit_reporttofile.cf
+%%DOCSDIR%%/examples/unit_resolveconf.cf
+%%DOCSDIR%%/examples/unit_returnszero.cf
+%%DOCSDIR%%/examples/unit_root_passwd.cf
+%%DOCSDIR%%/examples/unit_select_class.cf
+%%DOCSDIR%%/examples/unit_select_mode.cf
+%%DOCSDIR%%/examples/unit_select_region.cf
+%%DOCSDIR%%/examples/unit_select_size.cf
+%%DOCSDIR%%/examples/unit_selectservers.cf
+%%DOCSDIR%%/examples/unit_server_copy_localhost.cf
+%%DOCSDIR%%/examples/unit_server_copy_purge.cf
+%%DOCSDIR%%/examples/unit_server_copy_remote.cf
+%%DOCSDIR%%/examples/unit_server_flatcopy_localhost.cf
+%%DOCSDIR%%/examples/unit_service_disable.cf
+%%DOCSDIR%%/examples/unit_service_start.cf
+%%DOCSDIR%%/examples/unit_setuidlog.cf
+%%DOCSDIR%%/examples/unit_setvar.cf
+%%DOCSDIR%%/examples/unit_software_dist.cf
+%%DOCSDIR%%/examples/unit_splitstring.cf
+%%DOCSDIR%%/examples/unit_sql.cf
+%%DOCSDIR%%/examples/unit_storage.cf
+%%DOCSDIR%%/examples/unit_strcmp.cf
+%%DOCSDIR%%/examples/unit_stringarray.cf
+%%DOCSDIR%%/examples/unit_switchcase.cf
+%%DOCSDIR%%/examples/unit_syslog.cf
+%%DOCSDIR%%/examples/unit_syslog2.cf
+%%DOCSDIR%%/examples/unit_template.cf
+%%DOCSDIR%%/examples/unit_template2.cf
+%%DOCSDIR%%/examples/unit_test_environment.cf
+%%DOCSDIR%%/examples/unit_tidy_all_files.cf
+%%DOCSDIR%%/examples/unit_translatepath.cf
+%%DOCSDIR%%/examples/unit_update.cf
+%%DOCSDIR%%/examples/unit_user_edit.cf
+%%DOCSDIR%%/examples/unit_user_edit_method.cf
+%%DOCSDIR%%/examples/unit_userexists.cf
+%%DOCSDIR%%/examples/unit_varclass.cf
+%%DOCSDIR%%/examples/unit_varexpansion.cf
+%%DOCSDIR%%/examples/unit_varnet.cf
+%%DOCSDIR%%/examples/unit_vars.cf
+%%DOCSDIR%%/examples/unit_warnifline.cf
+%%DOCSDIR%%/examples/unit_webserver.cf
+%%DOCSDIR%%/examples/unit_zenoss.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+%%DOCSDIR%%/examples/win_services.cf
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%/example_config
 @dirrm %%DOCSDIR%%
+@dirrm share/cfengine/masterfiles
+@dirrm share/cfengine