Update cfengine to 3.4.2, fixes PR/47249

Too many changes, see changelog upstream:

https://github.com/cfengine/core/blob/master/ChangeLog

New dependencies - tokyocabinet *or* qdbm, support for optional
MySQL or PostgreSQL bindings.

9 files changed, 383 insertions, 283 deletions

diff --git a/sysutils/cfengine3/INSTALL b/sysutils/cfengine3/INSTALL
index 5bff872626c..1d8763a3d99 100644
--- a/sysutils/cfengine3/INSTALL
+++ b/sysutils/cfengine3/INSTALL
@@ -1,9 +1,8 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2010/11/05 13:57:21 pettai Exp $
+# $NetBSD: INSTALL,v 1.2 2013/02/17 16:15:42 fhajny Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	#${MKDIR} -p @VARBASE@/cfengine
-	${LN} -sf @PKG_SYSCONFDIR@/cfengine @VARBASE@/cfengine/inputs
-	${LN} -sf @PREFIX@/sbin @VARBASE@/cfengine/bin
+	${LN} -sf @PKG_SYSCONFDIR@ @CFENGINE_DIR@/inputs
+	${LN} -sf @PREFIX@/sbin @CFENGINE_DIR@/bin
 	@PREFIX@/sbin/cf-key
 esac
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index e33b1050545..f1e211b4f26 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/02/06 23:23:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2013/02/17 16:15:42 fhajny Exp $
 #
 
-DISTNAME=	cfengine-3.1.4
-PKGREVISION=	2
+DISTNAME=	cfengine-3.4.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -11,35 +10,48 @@ HOMEPAGE=	http://cfengine.com/pages/community
 COMMENT=	Tool for automating system administration
 LICENSE=	gnu-gpl-v3
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
-USE_TOOLS+=		flex yacc gmake
+USE_TOOLS+=		gmake
+
+.include "options.mk"
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4:Q}
+CONFIGURE_ARGS+=	--enable-fhs
+CONFIGURE_ARGS+=	--docdir=${DOCDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
+CONFIGURE_ARGS+=	--with-workdir=${CFENGINE_DIR:Q}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre:Q}
 
-BUILD_DEFS+=		${VARBASE}
-BUILDLINK_TRANSFORM+=l:db:db4
+BUILD_DEFS+=		VARBASE CFENGINE_DIR
+FILES_SUBST+=		CFENGINE_DIR=${CFENGINE_DIR}
+
+CFENGINE_DIR?=		${VARBASE}/cfengine
+DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+PKG_SYSCONFSUBDIR=	cfengine
 
-EGDIR=			${PREFIX}/share/examples/cfengine
-SYSCONFDIR=		${PKG_SYSCONFDIR}/cfengine
+CFILES=			cf-sketch-runfile.cf def.cf promises.cf
+CFILES+=		controls/cf_agent.cf controls/cf_execd.cf
+CFILES+=		controls/cf_monitord.cf controls/cf_report.cf
+CFILES+=		controls/cf_runagent.cf controls/cf_serverd.cf
+CFILES+=		libraries/cfengine_stdlib.cf services/init_msg.cf
 
-CONF_FILES+=		${EGDIR}/inputs/cfengine_stdlib.cf ${SYSCONFDIR}/cfengine_stdlib.cf
-CONF_FILES+=		${EGDIR}/inputs/failsafe.cf ${SYSCONFDIR}/failsafe.cf
-CONF_FILES+=		${EGDIR}/inputs/promises.cf ${SYSCONFDIR}/promises.cf
-CONF_FILES+=		${EGDIR}/inputs/site.cf ${SYSCONFDIR}/site.cf
-CONF_FILES+=		${EGDIR}/inputs/update.cf ${SYSCONFDIR}/update.cf
+.for file in ${CFILES}
+CONF_FILES+=		${EGDIR}/CoreBase/${file} ${PKG_SYSCONFDIR}/${file}
+.endfor
 
 RCD_SCRIPTS=		cfserverd cfexecd cfmonitord
 
-INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${SYSCONFDIR:Q} inputsdir=${EGDIR:Q}/inputs
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${PKG_SYSCONFDIR} docdir=${DOCDIR} examplesdir=${EGDIR} masterfilesdir=${EGDIR}/CoreBase projlibdir=${PREFIX}/lib
 
-MAKE_DIRS=		${VARBASE}/cfengine
-INSTALLATION_DIRS=	${EGDIR}/inputs ${SYSCONFDIR}
+MAKE_DIRS=		${CFENGINE_DIR}
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/controls ${PKG_SYSCONFDIR}/libraries
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/services
 
-.include "../../databases/db4/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine3/PLIST b/sysutils/cfengine3/PLIST
index 3b325ad909b..0ce7d71dd40 100644
--- a/sysutils/cfengine3/PLIST
+++ b/sysutils/cfengine3/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2011/02/06 18:44:23 pettai Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/02/17 16:15:42 fhajny Exp $
 lib/libpromises.la
 man/man8/cf-agent.8
 man/man8/cf-execd.8
-man/man8/cf-hub.8
 man/man8/cf-key.8
-man/man8/cf-know.8
 man/man8/cf-monitord.8
 man/man8/cf-promises.8
 man/man8/cf-report.8
@@ -12,238 +10,291 @@ man/man8/cf-runagent.8
 man/man8/cf-serverd.8
 sbin/cf-agent
 sbin/cf-execd
-sbin/cf-hub
 sbin/cf-key
-sbin/cf-know
 sbin/cf-monitord
 sbin/cf-promises
 sbin/cf-report
 sbin/cf-runagent
 sbin/cf-serverd
 share/doc/cfengine/ChangeLog
-share/doc/cfengine/INSTALL
-share/doc/cfengine/NEWS
 share/doc/cfengine/README
-share/doc/cfengine/active_directory.cf
-share/doc/cfengine/app_baseline.cf
-share/doc/cfengine/cfengine_stdlib.cf
-share/doc/cfengine/promise_knowledge.cf
-share/doc/cfengine/unit_abort.cf
-share/doc/cfengine/unit_accessed_before.cf
-share/doc/cfengine/unit_accumulated_time.cf
-share/doc/cfengine/unit_acl.cf
-share/doc/cfengine/unit_acl_generic.cf
-share/doc/cfengine/unit_acl_secret.cf
-share/doc/cfengine/unit_activedirectory_listusers.cf
-share/doc/cfengine/unit_activedirectory_showuser.cf
-share/doc/cfengine/unit_ago.cf
-share/doc/cfengine/unit_arrays.cf
-share/doc/cfengine/unit_backreferences_files.cf
-share/doc/cfengine/unit_badpromise.cf
-share/doc/cfengine/unit_badtype.cf
-share/doc/cfengine/unit_bsdflags.cf
-share/doc/cfengine/unit_cf2_integration.cf
-share/doc/cfengine/unit_change_detect.cf
-share/doc/cfengine/unit_changedbefore.cf
-share/doc/cfengine/unit_chdir.cf
-share/doc/cfengine/unit_classes_global.cf
-share/doc/cfengine/unit_classmatch.cf
-share/doc/cfengine/unit_classvar_convergence.cf
-share/doc/cfengine/unit_compare.cf
-share/doc/cfengine/unit_control_expand.cf
-share/doc/cfengine/unit_controlclasses.cf
-share/doc/cfengine/unit_copy.cf
-share/doc/cfengine/unit_copy_classes.cf
-share/doc/cfengine/unit_copy_edit.cf
-share/doc/cfengine/unit_copylinks.cf
-share/doc/cfengine/unit_countclassesmatching.cf
-share/doc/cfengine/unit_countlinesmatching.cf
-share/doc/cfengine/unit_create_filedir.cf
-share/doc/cfengine/unit_createdb.cf
-share/doc/cfengine/unit_customize_by_named_list.cf
-share/doc/cfengine/unit_definitions.cf
-share/doc/cfengine/unit_deletelines.cf
-share/doc/cfengine/unit_disable_and_rotate_files.cf
-share/doc/cfengine/unit_diskfree.cf
-share/doc/cfengine/unit_dollar.cf
-share/doc/cfengine/unit_edit_column_files.cf
-share/doc/cfengine/unit_edit_comment_lines.cf
-share/doc/cfengine/unit_edit_deletenotmatch.cf
-share/doc/cfengine/unit_edit_insert_fuzzylines.cf
-share/doc/cfengine/unit_edit_insert_lines.cf
-share/doc/cfengine/unit_edit_insert_lines_silly.cf
-share/doc/cfengine/unit_edit_passwd_file.cf
-share/doc/cfengine/unit_edit_replace_string.cf
-share/doc/cfengine/unit_edit_sectioned_file.cf
-share/doc/cfengine/unit_edit_setvar.cf
-share/doc/cfengine/unit_edit_triggerclass.cf
-share/doc/cfengine/unit_env.cf
-share/doc/cfengine/unit_environment.cf
-share/doc/cfengine/unit_environment_simple.cf
-share/doc/cfengine/unit_epimenides.cf
-share/doc/cfengine/unit_escape.cf
-share/doc/cfengine/unit_exec_args.cf
-share/doc/cfengine/unit_exec_in_sequence.cf
-share/doc/cfengine/unit_execd.cf
-share/doc/cfengine/unit_execresult.cf
-share/doc/cfengine/unit_expand.cf
-share/doc/cfengine/unit_failedcommand.cf
-share/doc/cfengine/unit_failsafe.cf
-share/doc/cfengine/unit_file_change_detection.cf
-share/doc/cfengine/unit_file_owner_list_template.cf
-share/doc/cfengine/unit_fileexists.cf
-share/doc/cfengine/unit_filenames.cf
-share/doc/cfengine/unit_fileperms.cf
-share/doc/cfengine/unit_filesexist.cf
-share/doc/cfengine/unit_filesexist2.cf
-share/doc/cfengine/unit_filesize.cf
-share/doc/cfengine/unit_fix_names.cf
-share/doc/cfengine/unit_getenv.cf
-share/doc/cfengine/unit_getfields.cf
-share/doc/cfengine/unit_getgid.cf
-share/doc/cfengine/unit_getindices.cf
-share/doc/cfengine/unit_getindixes.cf
-share/doc/cfengine/unit_getregistry.cf
-share/doc/cfengine/unit_getuid.cf
-share/doc/cfengine/unit_getusers.cf
-share/doc/cfengine/unit_global_list_expansion.cf
-share/doc/cfengine/unit_global_list_expansion_2.cf
-share/doc/cfengine/unit_grep.cf
-share/doc/cfengine/unit_groupexists.cf
-share/doc/cfengine/unit_hash.cf
-share/doc/cfengine/unit_hashcomment.cf
-share/doc/cfengine/unit_hashmatch.cf
-share/doc/cfengine/unit_hashuncomment.cf
-share/doc/cfengine/unit_helloworld.cf
-share/doc/cfengine/unit_host2ip.cf
-share/doc/cfengine/unit_hostrange.cf
-share/doc/cfengine/unit_hostsseen.cf
-share/doc/cfengine/unit_hub.cf
-share/doc/cfengine/unit_id.cf
-share/doc/cfengine/unit_insert_users.cf
-share/doc/cfengine/unit_intarray.cf
-share/doc/cfengine/unit_iprange.cf
-share/doc/cfengine/unit_irange.cf
-share/doc/cfengine/unit_isdir.cf
-share/doc/cfengine/unit_islink.cf
-share/doc/cfengine/unit_isnewerthan.cf
-share/doc/cfengine/unit_isplain.cf
-share/doc/cfengine/unit_isvariable.cf
-share/doc/cfengine/unit_iteration.cf
-share/doc/cfengine/unit_join.cf
-share/doc/cfengine/unit_knowledge_driver.cf
-share/doc/cfengine/unit_knowledge_txt.cf
-share/doc/cfengine/unit_lastnode.cf
-share/doc/cfengine/unit_ldap.cf
-share/doc/cfengine/unit_linking.cf
-share/doc/cfengine/unit_literal_server.cf
-share/doc/cfengine/unit_locate_files_and_compress.cf
-share/doc/cfengine/unit_log_private.cf
-share/doc/cfengine/unit_loops.cf
-share/doc/cfengine/unit_measure_log.cf
-share/doc/cfengine/unit_measurements.cf
-share/doc/cfengine/unit_menu.cf
-share/doc/cfengine/unit_method.cf
-share/doc/cfengine/unit_method_validate.cf
-share/doc/cfengine/unit_module_exec.cf
-share/doc/cfengine/unit_module_exec_2.cf
-share/doc/cfengine/unit_monitord.cf
-share/doc/cfengine/unit_mount_fs.cf
-share/doc/cfengine/unit_multipassvars.cf
-share/doc/cfengine/unit_neighbourhood_watch.cf
-share/doc/cfengine/unit_null_config.cf
-share/doc/cfengine/unit_occurrences.cf
-share/doc/cfengine/unit_ordering.cf
-share/doc/cfengine/unit_package_apt.cf
-share/doc/cfengine/unit_package_freebsd.cf
-share/doc/cfengine/unit_package_hash.cf
-share/doc/cfengine/unit_package_msi_file.cf
-share/doc/cfengine/unit_package_msi_version.cf
-share/doc/cfengine/unit_package_rpm.cf
-share/doc/cfengine/unit_package_solaris.cf
-share/doc/cfengine/unit_package_yum.cf
-share/doc/cfengine/unit_package_zypper.cf
-share/doc/cfengine/unit_parallel_exec.cf
-share/doc/cfengine/unit_pathtype.cf
-share/doc/cfengine/unit_pattern_and_edit.cf
-share/doc/cfengine/unit_peers.cf
-share/doc/cfengine/unit_postfix.cf
-share/doc/cfengine/unit_process_kill.cf
-share/doc/cfengine/unit_process_matching.cf
-share/doc/cfengine/unit_process_matching2.cf
-share/doc/cfengine/unit_process_matching3.cf
-share/doc/cfengine/unit_process_signalling.cf
-share/doc/cfengine/unit_product.cf
-share/doc/cfengine/unit_promises.cf
-share/doc/cfengine/unit_readlist.cf
-share/doc/cfengine/unit_readtcp.cf
-share/doc/cfengine/unit_reg_multiline.cf
-share/doc/cfengine/unit_regarray.cf
-share/doc/cfengine/unit_regex_win.cf
-share/doc/cfengine/unit_regextract.cf
-share/doc/cfengine/unit_registry.cf
-share/doc/cfengine/unit_registry_cache.cf
-share/doc/cfengine/unit_regline.cf
-share/doc/cfengine/unit_reglist.cf
-share/doc/cfengine/unit_remoteclasses.cf
-share/doc/cfengine/unit_remove_deadlinks.cf
-share/doc/cfengine/unit_rename.cf
-share/doc/cfengine/unit_repairedcommand.cf
-share/doc/cfengine/unit_report_custom.cf
-share/doc/cfengine/unit_report_diffs.cf
-share/doc/cfengine/unit_report_state.cf
-share/doc/cfengine/unit_reporting.cf
-share/doc/cfengine/unit_reporttofile.cf
-share/doc/cfengine/unit_resolveconf.cf
-share/doc/cfengine/unit_returnszero.cf
-share/doc/cfengine/unit_root_passwd.cf
-share/doc/cfengine/unit_select_mode.cf
-share/doc/cfengine/unit_select_region.cf
-share/doc/cfengine/unit_select_size.cf
-share/doc/cfengine/unit_selectservers.cf
-share/doc/cfengine/unit_server_copy_localhost.cf
-share/doc/cfengine/unit_server_copy_purge.cf
-share/doc/cfengine/unit_server_copy_remote.cf
-share/doc/cfengine/unit_server_flatcopy_localhost.cf
-share/doc/cfengine/unit_service_disable.cf
-share/doc/cfengine/unit_service_start.cf
-share/doc/cfengine/unit_setuidlog.cf
-share/doc/cfengine/unit_setvar.cf
-share/doc/cfengine/unit_software_dist.cf
-share/doc/cfengine/unit_splitstring.cf
-share/doc/cfengine/unit_sql.cf
-share/doc/cfengine/unit_storage.cf
-share/doc/cfengine/unit_strcmp.cf
-share/doc/cfengine/unit_stringarray.cf
-share/doc/cfengine/unit_switchcase.cf
-share/doc/cfengine/unit_syslog.cf
-share/doc/cfengine/unit_syslog2.cf
-share/doc/cfengine/unit_template.cf
-share/doc/cfengine/unit_template2.cf
-share/doc/cfengine/unit_test_environment.cf
-share/doc/cfengine/unit_tidy_all_files.cf
-share/doc/cfengine/unit_translatepath.cf
-share/doc/cfengine/unit_update.cf
-share/doc/cfengine/unit_user_edit.cf
-share/doc/cfengine/unit_user_edit_method.cf
-share/doc/cfengine/unit_userexists.cf
-share/doc/cfengine/unit_varclass.cf
-share/doc/cfengine/unit_varexpansion.cf
-share/doc/cfengine/unit_varnet.cf
-share/doc/cfengine/unit_vars.cf
-share/doc/cfengine/unit_warnifline.cf
-share/doc/cfengine/unit_webserver.cf
-share/doc/cfengine/unit_zenoss.cf
-share/doc/cfengine/win_emergency.cf
-share/doc/cfengine/win_registry.cf
-share/doc/cfengine/win_schedule.cf
-share/doc/cfengine/win_services.cf
-share/examples/cfengine/inputs/cfengine_stdlib.cf
-share/examples/cfengine/inputs/failsafe.cf
-share/examples/cfengine/inputs/promises.cf
-share/examples/cfengine/inputs/site.cf
-share/examples/cfengine/inputs/update.cf
+share/examples/cfengine/CoreBase/cf-sketch-runfile.cf
+share/examples/cfengine/CoreBase/controls/cf_agent.cf
+share/examples/cfengine/CoreBase/controls/cf_execd.cf
+share/examples/cfengine/CoreBase/controls/cf_monitord.cf
+share/examples/cfengine/CoreBase/controls/cf_report.cf
+share/examples/cfengine/CoreBase/controls/cf_runagent.cf
+share/examples/cfengine/CoreBase/controls/cf_serverd.cf
+share/examples/cfengine/CoreBase/def.cf
+share/examples/cfengine/CoreBase/libraries/cfengine_stdlib.cf
+share/examples/cfengine/CoreBase/promises.cf
+share/examples/cfengine/CoreBase/services/init_msg.cf
+share/examples/cfengine/CoreBase/update.cf
+share/examples/cfengine/active_directory.cf
+share/examples/cfengine/app_baseline.cf
+share/examples/cfengine/guest_environment_kvm.cf
+share/examples/cfengine/hostswithclass.cf
+share/examples/cfengine/motd.cf
+share/examples/cfengine/package_windows_feature.cf
+share/examples/cfengine/promise_knowledge.cf
+share/examples/cfengine/service_catalogue.cf
+share/examples/cfengine/service_catalogue_separate.cf
+share/examples/cfengine/sql_table_structure.cf
+share/examples/cfengine/unit_abort.cf
+share/examples/cfengine/unit_accessed_before.cf
+share/examples/cfengine/unit_accumulated_time.cf
+share/examples/cfengine/unit_acl.cf
+share/examples/cfengine/unit_acl_generic.cf
+share/examples/cfengine/unit_acl_ntfs.cf
+share/examples/cfengine/unit_acl_secret.cf
+share/examples/cfengine/unit_activedirectory_listusers.cf
+share/examples/cfengine/unit_activedirectory_showuser.cf
+share/examples/cfengine/unit_ago.cf
+share/examples/cfengine/unit_arrays.cf
+share/examples/cfengine/unit_backreferences_files.cf
+share/examples/cfengine/unit_badpromise.cf
+share/examples/cfengine/unit_badtype.cf
+share/examples/cfengine/unit_bsdflags.cf
+share/examples/cfengine/unit_bundle_return_values.cf
+share/examples/cfengine/unit_cf2_integration.cf
+share/examples/cfengine/unit_change_detect.cf
+share/examples/cfengine/unit_changedbefore.cf
+share/examples/cfengine/unit_chdir.cf
+share/examples/cfengine/unit_classes_global.cf
+share/examples/cfengine/unit_classmatch.cf
+share/examples/cfengine/unit_classvar_convergence.cf
+share/examples/cfengine/unit_commands.cf
+share/examples/cfengine/unit_compare.cf
+share/examples/cfengine/unit_control_expand.cf
+share/examples/cfengine/unit_controlclasses.cf
+share/examples/cfengine/unit_copy.cf
+share/examples/cfengine/unit_copy_classes.cf
+share/examples/cfengine/unit_copy_copbl.cf
+share/examples/cfengine/unit_copy_edit.cf
+share/examples/cfengine/unit_copydir_copbl.cf
+share/examples/cfengine/unit_copylinks.cf
+share/examples/cfengine/unit_countclassesmatching.cf
+share/examples/cfengine/unit_countlinesmatching.cf
+share/examples/cfengine/unit_create_filedir.cf
+share/examples/cfengine/unit_createdb.cf
+share/examples/cfengine/unit_customize_by_named_list.cf
+share/examples/cfengine/unit_defaults.cf
+share/examples/cfengine/unit_defaults2.cf
+share/examples/cfengine/unit_defaults3.cf
+share/examples/cfengine/unit_definitions.cf
+share/examples/cfengine/unit_deletelines.cf
+share/examples/cfengine/unit_depends_on.cf
+share/examples/cfengine/unit_depends_on2.cf
+share/examples/cfengine/unit_disable.cf
+share/examples/cfengine/unit_disable_and_rotate_files.cf
+share/examples/cfengine/unit_diskfree.cf
+share/examples/cfengine/unit_dollar.cf
+share/examples/cfengine/unit_edit_column_files.cf
+share/examples/cfengine/unit_edit_comment_lines.cf
+share/examples/cfengine/unit_edit_deletenotmatch.cf
+share/examples/cfengine/unit_edit_insert_fuzzylines.cf
+share/examples/cfengine/unit_edit_insert_lines.cf
+share/examples/cfengine/unit_edit_insert_lines_silly.cf
+share/examples/cfengine/unit_edit_passwd_file.cf
+share/examples/cfengine/unit_edit_passwd_file_basic.cf
+share/examples/cfengine/unit_edit_replace_string.cf
+share/examples/cfengine/unit_edit_sectioned_file.cf
+share/examples/cfengine/unit_edit_setvar.cf
+share/examples/cfengine/unit_edit_template.cf
+share/examples/cfengine/unit_edit_triggerclass.cf
+share/examples/cfengine/unit_env.cf
+share/examples/cfengine/unit_epimenides.cf
+share/examples/cfengine/unit_escape.cf
+share/examples/cfengine/unit_exec_args.cf
+share/examples/cfengine/unit_exec_in_sequence.cf
+share/examples/cfengine/unit_execd.cf
+share/examples/cfengine/unit_execresult.cf
+share/examples/cfengine/unit_expand.cf
+share/examples/cfengine/unit_failedcommand.cf
+share/examples/cfengine/unit_failsafe.cf
+share/examples/cfengine/unit_file_change_detection.cf
+share/examples/cfengine/unit_file_owner_list_template.cf
+share/examples/cfengine/unit_fileexists.cf
+share/examples/cfengine/unit_filenames.cf
+share/examples/cfengine/unit_fileperms.cf
+share/examples/cfengine/unit_filesexist.cf
+share/examples/cfengine/unit_filesexist2.cf
+share/examples/cfengine/unit_filesize.cf
+share/examples/cfengine/unit_fix_names.cf
+share/examples/cfengine/unit_getenv.cf
+share/examples/cfengine/unit_getfields.cf
+share/examples/cfengine/unit_getgid.cf
+share/examples/cfengine/unit_getindices.cf
+share/examples/cfengine/unit_getindices_and_values.cf
+share/examples/cfengine/unit_getmacaddress.cf
+share/examples/cfengine/unit_getregistry.cf
+share/examples/cfengine/unit_getuid.cf
+share/examples/cfengine/unit_getusers.cf
+share/examples/cfengine/unit_global_list_expansion.cf
+share/examples/cfengine/unit_global_list_expansion_2.cf
+share/examples/cfengine/unit_grep.cf
+share/examples/cfengine/unit_groupexists.cf
+share/examples/cfengine/unit_hash.cf
+share/examples/cfengine/unit_hashcomment.cf
+share/examples/cfengine/unit_hashmatch.cf
+share/examples/cfengine/unit_hashuncomment.cf
+share/examples/cfengine/unit_helloworld.cf
+share/examples/cfengine/unit_host2ip.cf
+share/examples/cfengine/unit_hostrange.cf
+share/examples/cfengine/unit_hostsseen.cf
+share/examples/cfengine/unit_hub.cf
+share/examples/cfengine/unit_id.cf
+share/examples/cfengine/unit_inherit.cf
+share/examples/cfengine/unit_insert_users.cf
+share/examples/cfengine/unit_intarray.cf
+share/examples/cfengine/unit_inventory_cpu.cf
+share/examples/cfengine/unit_iprange.cf
+share/examples/cfengine/unit_irange.cf
+share/examples/cfengine/unit_isdir.cf
+share/examples/cfengine/unit_islink.cf
+share/examples/cfengine/unit_isnewerthan.cf
+share/examples/cfengine/unit_isplain.cf
+share/examples/cfengine/unit_isvariable.cf
+share/examples/cfengine/unit_iteration.cf
+share/examples/cfengine/unit_join.cf
+share/examples/cfengine/unit_knowledge_driver.cf
+share/examples/cfengine/unit_knowledge_txt.cf
+share/examples/cfengine/unit_lastnode.cf
+share/examples/cfengine/unit_ldap.cf
+share/examples/cfengine/unit_linking.cf
+share/examples/cfengine/unit_literal_server.cf
+share/examples/cfengine/unit_locate_files_and_compress.cf
+share/examples/cfengine/unit_log_private.cf
+share/examples/cfengine/unit_loops.cf
+share/examples/cfengine/unit_lsdir.cf
+share/examples/cfengine/unit_maplist.cf
+share/examples/cfengine/unit_measure_log.cf
+share/examples/cfengine/unit_measurements.cf
+share/examples/cfengine/unit_menu.cf
+share/examples/cfengine/unit_meta.cf
+share/examples/cfengine/unit_method.cf
+share/examples/cfengine/unit_method_polymorph.cf
+share/examples/cfengine/unit_method_validate.cf
+share/examples/cfengine/unit_method_var.cf
+share/examples/cfengine/unit_method_var2.cf
+share/examples/cfengine/unit_module_exec.cf
+share/examples/cfengine/unit_module_exec_2.cf
+share/examples/cfengine/unit_monitord.cf
+share/examples/cfengine/unit_mount_fs.cf
+share/examples/cfengine/unit_multipassvars.cf
+share/examples/cfengine/unit_namespace.cf
+share/examples/cfengine/unit_namespace1.cf
+share/examples/cfengine/unit_namespace2.cf
+share/examples/cfengine/unit_namespace3.cf
+share/examples/cfengine/unit_namespace_class1.cf
+share/examples/cfengine/unit_namespace_classes.cf
+share/examples/cfengine/unit_namespace_var_meta.cf
+share/examples/cfengine/unit_namespace_var_meta2.cf
+share/examples/cfengine/unit_neighbourhood_watch.cf
+share/examples/cfengine/unit_null_config.cf
+share/examples/cfengine/unit_occurrences.cf
+share/examples/cfengine/unit_orchestrate_chain1.cf
+share/examples/cfengine/unit_orchestrate_chain2.cf
+share/examples/cfengine/unit_orchestrate_dominoes1.cf
+share/examples/cfengine/unit_orchestrate_dominoes2.cf
+share/examples/cfengine/unit_orchestrate_dragon.cf
+share/examples/cfengine/unit_orchestrate_dragon_load_balancer.cf
+share/examples/cfengine/unit_orchestrate_n_of_m.cf
+share/examples/cfengine/unit_orchestration_hostlist.cf
+share/examples/cfengine/unit_ordering.cf
+share/examples/cfengine/unit_package_apt.cf
+share/examples/cfengine/unit_package_freebsd.cf
+share/examples/cfengine/unit_package_latest.cf
+share/examples/cfengine/unit_package_msi_file.cf
+share/examples/cfengine/unit_package_msi_version.cf
+share/examples/cfengine/unit_package_rpm.cf
+share/examples/cfengine/unit_package_${LOWER_OPSYS}.cf
+share/examples/cfengine/unit_package_yum.cf
+share/examples/cfengine/unit_package_zypper.cf
+share/examples/cfengine/unit_parallel_exec.cf
+share/examples/cfengine/unit_parsestringarray.cf
+share/examples/cfengine/unit_pathtype.cf
+share/examples/cfengine/unit_pattern_and_edit.cf
+share/examples/cfengine/unit_peers.cf
+share/examples/cfengine/unit_postfix.cf
+share/examples/cfengine/unit_process_kill.cf
+share/examples/cfengine/unit_process_matching.cf
+share/examples/cfengine/unit_process_matching2.cf
+share/examples/cfengine/unit_process_matching3.cf
+share/examples/cfengine/unit_process_restart.cf
+share/examples/cfengine/unit_process_restart_basic.cf
+share/examples/cfengine/unit_process_signalling.cf
+share/examples/cfengine/unit_product.cf
+share/examples/cfengine/unit_promises.cf
+share/examples/cfengine/unit_readlist.cf
+share/examples/cfengine/unit_readtcp.cf
+share/examples/cfengine/unit_reg_multiline.cf
+share/examples/cfengine/unit_regarray.cf
+share/examples/cfengine/unit_regex_win.cf
+share/examples/cfengine/unit_regextract.cf
+share/examples/cfengine/unit_registry.cf
+share/examples/cfengine/unit_registry_cache.cf
+share/examples/cfengine/unit_regline.cf
+share/examples/cfengine/unit_reglist.cf
+share/examples/cfengine/unit_remoteclasses.cf
+share/examples/cfengine/unit_remoteclasses2.cf
+share/examples/cfengine/unit_remotescalar.cf
+share/examples/cfengine/unit_remove_deadlinks.cf
+share/examples/cfengine/unit_rename.cf
+share/examples/cfengine/unit_repairedcommand.cf
+share/examples/cfengine/unit_report_custom.cf
+share/examples/cfengine/unit_report_diffs.cf
+share/examples/cfengine/unit_report_state.cf
+share/examples/cfengine/unit_reporting.cf
+share/examples/cfengine/unit_reporttofile.cf
+share/examples/cfengine/unit_resolveconf.cf
+share/examples/cfengine/unit_returnszero.cf
+share/examples/cfengine/unit_root_passwd.cf
+share/examples/cfengine/unit_select_class.cf
+share/examples/cfengine/unit_select_mode.cf
+share/examples/cfengine/unit_select_region.cf
+share/examples/cfengine/unit_select_size.cf
+share/examples/cfengine/unit_selectservers.cf
+share/examples/cfengine/unit_server_callback.cf
+share/examples/cfengine/unit_server_copy_localhost.cf
+share/examples/cfengine/unit_server_copy_purge.cf
+share/examples/cfengine/unit_server_copy_remote.cf
+share/examples/cfengine/unit_server_flatcopy_localhost.cf
+share/examples/cfengine/unit_service_disable.cf
+share/examples/cfengine/unit_service_start.cf
+share/examples/cfengine/unit_services_concept.cf
+share/examples/cfengine/unit_services_win.cf
+share/examples/cfengine/unit_setuidlog.cf
+share/examples/cfengine/unit_setvar.cf
+share/examples/cfengine/unit_software_dist.cf
+share/examples/cfengine/unit_software_update_version_yum.cf
+share/examples/cfengine/unit_splitstring.cf
+share/examples/cfengine/unit_storage.cf
+share/examples/cfengine/unit_strcmp.cf
+share/examples/cfengine/unit_stringarray.cf
+share/examples/cfengine/unit_switchcase.cf
+share/examples/cfengine/unit_syslog.cf
+share/examples/cfengine/unit_syslog2.cf
+share/examples/cfengine/unit_template.cf
+share/examples/cfengine/unit_template2.cf
+share/examples/cfengine/unit_test_environment.cf
+share/examples/cfengine/unit_tidy_all_files.cf
+share/examples/cfengine/unit_translatepath.cf
+share/examples/cfengine/unit_update.cf
+share/examples/cfengine/unit_user_edit.cf
+share/examples/cfengine/unit_user_edit_method.cf
+share/examples/cfengine/unit_userexists.cf
+share/examples/cfengine/unit_varclass.cf
+share/examples/cfengine/unit_varexpansion.cf
+share/examples/cfengine/unit_varnet.cf
+share/examples/cfengine/unit_vars.cf
+share/examples/cfengine/unit_warnifline.cf
+share/examples/cfengine/unit_webserver.cf
+share/examples/cfengine/unit_zenoss.cf
+share/examples/cfengine/win_dns_client.cf
+share/examples/cfengine/win_emergency.cf
+share/examples/cfengine/win_registry.cf
+share/examples/cfengine/win_schedule.cf
 share/examples/rc.d/cfexecd
 share/examples/rc.d/cfmonitord
 share/examples/rc.d/cfserverd
-@pkgdir etc/cfengine
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index e44c4461052..31ebbecc71e 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/02/27 02:49:39 sekiya Exp $
+$NetBSD: distinfo,v 1.5 2013/02/17 16:15:42 fhajny Exp $
 
-SHA1 (cfengine-3.1.4.tar.gz) = 8879f375e0c0208620660d0d49f52bb814934fd9
-RMD160 (cfengine-3.1.4.tar.gz) = 75be7bed44718dd4f45ddccd235a46563391eecf
-Size (cfengine-3.1.4.tar.gz) = 1599876 bytes
-SHA1 (patch-aa) = 9482191b0f69f5b32037c635ac13cee412454e8c
-SHA1 (patch-ab) = 2e168ec67e9ebc868d0a6e9f1169ec67d27bc81c
+SHA1 (cfengine-3.4.2.tar.gz) = 83d6eb3e8c8ed16bf6364a41d216cf96499749c6
+RMD160 (cfengine-3.4.2.tar.gz) = b1c2bfa74c517efd9d26445ff148b8a93cb173b8
+Size (cfengine-3.4.2.tar.gz) = 4687590 bytes
+SHA1 (patch-ext_Makefile.in) = 63d2c3ef7d94a11a98177d2dd3c2820662bc06f9
+SHA1 (patch-src_unix.c) = 5b64998d5f9d7d3d158aa1384c134fac686865f3
diff --git a/sysutils/cfengine3/options.mk b/sysutils/cfengine3/options.mk
new file mode 100644
index 00000000000..9f2db913ddd
--- /dev/null
+++ b/sysutils/cfengine3/options.mk
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2013/02/17 16:15:42 fhajny Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cfengine3
+PKG_OPTIONS_REQUIRED_GROUPS=	db
+PKG_OPTIONS_GROUP.db=	qdbm tokyocabinet
+PKG_SUPPORTED_OPTIONS=	qdbm tokyocabinet mysql pgsql
+PKG_SUGGESTED_OPTIONS=	tokyocabinet
+
+.include "../../mk/bsd.options.mk"
+
+### MySQL support
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=	--with-mysql=${MYSQL_PREFIX}
+.include "../../mk/mysql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+### PostgreSQL support
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX}
+.include "../../mk/pgsql.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-postgresql
+.endif
+
+### QDBM *or* Tokyo Cabinet support
+.if !empty(PKG_OPTIONS:Mqdbm)
+CONFIGURE_ARGS+=	--with-qdbm=${BUILDLINK_PREFIX.qdbm}
+.include "../../databases/qdbm/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mtokyocabinet)
+CONFIGURE_ARGS+=	--with-tokyocabinet=${BUILDLINK_PREFIX.tokyocabinet}
+.include "../../databases/tokyocabinet/buildlink3.mk"
+.endif
diff --git a/sysutils/cfengine3/patches/patch-aa b/sysutils/cfengine3/patches/patch-aa
deleted file mode 100644
index 7bae2da868f..00000000000
--- a/sysutils/cfengine3/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/02/06 18:44:24 pettai Exp $
-
---- configure.orig	2011-02-04 11:08:13.000000000 +0100
-+++ configure	2011-02-04 11:08:32.000000000 +0100
-@@ -12708,7 +12708,7 @@
-   withval=$with_constellation;
- fi
- 
--if test "x$with_constellation" == "xyes"; then :
-+if test "x$with_constellation" = "xyes"; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcfconstellation" >&5
- $as_echo_n "checking for main in -lcfconstellation... " >&6; }
- if test "${ac_cv_lib_cfconstellation_main+set}" = set; then :
diff --git a/sysutils/cfengine3/patches/patch-ab b/sysutils/cfengine3/patches/patch-ab
deleted file mode 100644
index 49539dd8fff..00000000000
--- a/sysutils/cfengine3/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2011/02/27 02:49:39 sekiya Exp $
-
---- src/sysinfo.c.orig	2011-02-27 11:35:35.000000000 +0900
-+++ src/sysinfo.c	2011-02-27 11:36:02.000000000 +0900
-@@ -38,7 +38,7 @@
- #include <sys/syssgi.h>
- #endif
- 
--#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
-+#if defined (HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__)
- # ifdef _SIZEOF_ADDR_IFREQ
- #  define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x)
- # else
diff --git a/sysutils/cfengine3/patches/patch-ext_Makefile.in b/sysutils/cfengine3/patches/patch-ext_Makefile.in
new file mode 100644
index 00000000000..6d76c9a580d
--- /dev/null
+++ b/sysutils/cfengine3/patches/patch-ext_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-ext_Makefile.in,v 1.1 2013/02/17 16:15:42 fhajny Exp $
+
+No use for rpmvercmp.
+
+--- ext/Makefile.in.orig	2013-01-11 12:54:49.000000000 +0000
++++ ext/Makefile.in	2013-02-16 12:23:25.950062742 +0000
+@@ -35,7 +35,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-sbin_PROGRAMS = rpmvercmp$(EXEEXT)
+ subdir = ext
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/sysutils/cfengine3/patches/patch-src_unix.c b/sysutils/cfengine3/patches/patch-src_unix.c
new file mode 100644
index 00000000000..28fd1604b41
--- /dev/null
+++ b/sysutils/cfengine3/patches/patch-src_unix.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_unix.c,v 1.1 2013/02/17 16:15:42 fhajny Exp $
+
+Ignore HAVE_STRUCT_SOCKADDR_SA_LEN on NetBSD.
+
+--- src/unix.c.orig	2013-01-11 12:54:39.000000000 +0000
++++ src/unix.c	2013-02-16 11:10:41.263683099 +0000
+@@ -49,7 +49,7 @@
+ 
+ #ifndef MINGW
+ 
+-# ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
++# if defined(HAVE_STRUCT_SOCKADDR_SA_LEN) && !defined(__NetBSD__)
+ #  ifdef _SIZEOF_ADDR_IFREQ
+ #   define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x)
+ #  else