dd new cfengine-devel port.

Update CONFLICTS in cfengine2, cfengine32, and cfengine33 ports. Update LATEST_LINK in cfengine32 and cfengine33 ports. Add $FreeBSD$ to pkg-plist.
svn path=/head/; revision=302588
2012-08-15 17:28:43 +00:00 · 2012-08-15 17:28:43 +00:00 · 93e71c3192 · 2021-03-31 03:12:20 +00:00
commit 93e71c3192
parent 21d232a377
12 changed files with 443 additions and 5 deletions
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@ -106,6 +106,7 @@
    SUBDIR += cdroot
    SUBDIR += cdrtools
    SUBDIR += cdrtools-devel
+    SUBDIR += cfengine-devel
    SUBDIR += cfengine22
    SUBDIR += cfengine32
    SUBDIR += cfengine33
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@ -0,0 +1,90 @@
+
+# Date created:		February 2, 2009
+# Whom:			jrhett@netconsonance.com
+#
+# $FreeBSD$
+#
+
+PORTNAME=	cfengine
+PORTVERSION=	3.4.0b1
+CATEGORIES=	sysutils
+PKGNAMESUFFIX=	-devel
+MASTER_SITES=	http://cfengine.com/source-code/download?file=
+
+MAINTAINER=	cy@FreeBSD.org
+#		gjb@FreeBSD.org is also committer for this port
+COMMENT=	A systems administration tool for networks
+LATEST_LINK=	cfengine-devel
+FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
+
+CONFLICTS=	cfengine-[23]*
+
+USE_RC_SUBR=	cf-execd cf-serverd
+
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+# EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
+DOCSDIR=	${PREFIX}/share/doc/cfengine
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--htmldir=${DOCSDIR}/html \
+		--mandir=${PREFIX}/man \
+		--with-pcre=${LOCALBASE} \
+		--enable-fhs
+
+LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+
+OPTIONS=	TOKYOCABINET	"Enable TokyoCabinet support"		on \
+		QDBM	"Enable QDBM support"				off \
+		PGSQL	"Enable PostgreSQL connector"			off \
+		MYSQL	"Enable MySQL connector"			off \
+		LIBVIRT	"Enable libvirt compatibility"			off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_TOKYOCABINET) && defined(WITH_QDBM)
+BROKEN=		TOKYOCABINET and QDBM are mutuallly exclusive
+.endif
+
+.if !defined(WITH_TOKYOCABINET) && !defined(WITH_QDBM)
+BROKEN=		TOKYOCABINET or QDBM must be defined
+.endif
+
+.if defined(WITH_TOKYOCABINET)
+CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
+LIB_DEPENDS+=	tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
+.endif
+
+.if defined(WITH_QDBM)
+CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
+LIB_DEPENDS+=	qdbm.14:${PORTSDIR}/databases/qdbm
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=		yes
+CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
+LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+LIB_DEPENDS+=		mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
+LDFLAGS+=		-L${LOCALBASE}/lib/mysql
+.endif
+
+.if defined(WITH_LIBVIRT)
+CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
+LIB_DEPENDS+=		virt:${PORTSDIR}/devel/libvirt
+.endif
+
+MAN8=	cf-agent.8	cf-key.8	cf-monitord.8	\
+	cf-report.8	cf-serverd.8	cf-execd.8	\
+	cf-know.8	cf-promises.8	cf-runagent.8
+
+post-patch:
+		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
+				  ${WRKSRC}/docs/Makefile.in
+
+.include <bsd.port.post.mk>
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@ -0,0 +1,2 @@
+SHA256 (cfengine-3.3.5.tar.gz) = f7d948d85c54ee7b49a03d9b1b8b8cc6d27cdb6a0a9af8f9fefa6485856af6e9
+SIZE (cfengine-3.3.5.tar.gz) = 1254473
--- a/sysutils/cfengine-devel/files/cf-execd.in
+++ b/sysutils/cfengine-devel/files/cf-execd.in
@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-execd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
+#
+# cf_execd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-execd.
+# cf_execd_flags (str):          Custom additional arguments to be passed
+#                               to cf-execd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_execd"
+rcvar=cf_execd_enable
+
+command="%%PREFIX%%/sbin/cf-execd"
+
+load_rc_config $name
+
+: ${cf_execd_enable="NO"}
+
+run_rc_command "$1"
--- a/sysutils/cfengine-devel/files/cf-serverd.in
+++ b/sysutils/cfengine-devel/files/cf-serverd.in
@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: cf-serverd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
+#
+# cf_serverd_enable (bool):        Set to "NO" by default.
+#                               Set it to "YES" to enable cf-serverd.
+# cf_serverd_flags (str):          Custom additional arguments to be passed
+#                               to cf-serverd (default empty).
+#
+
+. /etc/rc.subr
+
+name="cf_serverd"
+rcvar=cf_serverd_enable
+
+command="%%PREFIX%%/sbin/cf-serverd"
+
+load_rc_config $name
+
+: ${cf_serverd_enable="NO"}
+
+run_rc_command "$1"
--- a/sysutils/cfengine-devel/pkg-descr
+++ b/sysutils/cfengine-devel/pkg-descr
@ -0,0 +1,10 @@
+Cfengine is an automated suite of programs for configuring and 
+maintaining Unix-like computers. It has been used on computing arrays 
+of between 1 and 20,000 computers since 1993 by a wide range of 
+organizations. Cfengine is supported by active research and was the 
+first autonomic, hands-free management system for Unix-like operating
+systems. Cfengine is an autonomic maintenance system not merely a
+change management roll-out tool. Cfengine has a history of security
+and adaptability. 
+
+WWW: http://www.cfengine.org/
--- a/sysutils/cfengine-devel/pkg-plist
+++ b/sysutils/cfengine-devel/pkg-plist
@ -0,0 +1,277 @@
+@comment $FreeBSD$
+libexec/cfengine/libpromises.la
+libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.1
+sbin/cf-agent
+sbin/cf-execd
+sbin/cf-key
+sbin/cf-know
+sbin/cf-monitord
+sbin/cf-promises
+sbin/cf-report
+sbin/cf-runagent
+sbin/cf-serverd
+share/cfengine/CoreBase/failsafe.cf
+share/cfengine/CoreBase/cfengine_stdlib.cf
+share/cfengine/CoreBase/promises.cf
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/README
+%%DOCSDIR%%/examples/active_directory.cf
+%%DOCSDIR%%/examples/app_baseline.cf
+%%DOCSDIR%%/examples/guest_environment_kvm.cf
+%%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/motd.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
+%%DOCSDIR%%/examples/promise_knowledge.cf
+%%DOCSDIR%%/examples/service_catalogue.cf
+%%DOCSDIR%%/examples/service_catalogue_separate.cf
+%%DOCSDIR%%/examples/sql_table_structure.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_ntfs.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_commands.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_copbl.cf
+%%DOCSDIR%%/examples/unit_copy_edit.cf
+%%DOCSDIR%%/examples/unit_copydir_copbl.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_defaults.cf
+%%DOCSDIR%%/examples/unit_definitions.cf
+%%DOCSDIR%%/examples/unit_deletelines.cf
+%%DOCSDIR%%/examples/unit_disable.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_passwd_file_basic.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_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_getmacaddress.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_inherit.cf
+%%DOCSDIR%%/examples/unit_insert_users.cf
+%%DOCSDIR%%/examples/unit_intarray.cf
+%%DOCSDIR%%/examples/unit_inventory_cpu.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_lsdir.cf
+%%DOCSDIR%%/examples/unit_maplist.cf
+%%DOCSDIR%%/examples/unit_measure_log.cf
+%%DOCSDIR%%/examples/unit_measurements.cf
+%%DOCSDIR%%/examples/unit_menu.cf
+%%DOCSDIR%%/examples/unit_meta.cf
+%%DOCSDIR%%/examples/unit_method.cf
+%%DOCSDIR%%/examples/unit_method_polymorph.cf
+%%DOCSDIR%%/examples/unit_method_validate.cf
+%%DOCSDIR%%/examples/unit_method_var.cf
+%%DOCSDIR%%/examples/unit_method_var2.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_namespace.cf
+%%DOCSDIR%%/examples/unit_namespace1.cf
+%%DOCSDIR%%/examples/unit_namespace2.cf
+%%DOCSDIR%%/examples/unit_namespace3.cf
+%%DOCSDIR%%/examples/unit_neighbourhood_watch.cf
+%%DOCSDIR%%/examples/unit_null_config.cf
+%%DOCSDIR%%/examples/unit_occurrences.cf
+%%DOCSDIR%%/examples/unit_orchestrate_chain1.cf
+%%DOCSDIR%%/examples/unit_orchestrate_chain2.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dominoes1.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dominoes2.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dragon.cf
+%%DOCSDIR%%/examples/unit_orchestrate_dragon_load_balancer.cf
+%%DOCSDIR%%/examples/unit_orchestrate_n_of_m.cf
+%%DOCSDIR%%/examples/unit_orchestration_hostlist.cf
+%%DOCSDIR%%/examples/unit_ordering.cf
+%%DOCSDIR%%/examples/unit_package_apt.cf
+%%DOCSDIR%%/examples/unit_package_freebsd.cf
+%%DOCSDIR%%/examples/unit_package_latest.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_restart.cf
+%%DOCSDIR%%/examples/unit_process_restart_basic.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_remoteclasses2.cf
+%%DOCSDIR%%/examples/unit_remotescalar.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_services_concept.cf
+%%DOCSDIR%%/examples/unit_services_win.cf
+%%DOCSDIR%%/examples/unit_setuidlog.cf
+%%DOCSDIR%%/examples/unit_setvar.cf
+%%DOCSDIR%%/examples/unit_software_dist.cf
+%%DOCSDIR%%/examples/unit_software_update_version_yum.cf
+%%DOCSDIR%%/examples/unit_splitstring.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_dns_client.cf
+%%DOCSDIR%%/examples/win_emergency.cf
+%%DOCSDIR%%/examples/win_registry.cf
+%%DOCSDIR%%/examples/win_schedule.cf
+@dirrm %%DOCSDIR%%/examples
+@dirrm %%DOCSDIR%%
+@dirrm share/cfengine/CoreBase
+@dirrm share/cfengine
+@dirrm libexec/cfengine
--- a/sysutils/cfengine22/Makefile
+++ b/sysutils/cfengine22/Makefile
@ -14,7 +14,7 @@ MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks

-CONFLICTS=	cfengine-3*
+CONFLICTS=	cfengine-3* cfengine-devel-*

 USE_RC_SUBR=	cfexecd cfservd

--- a/sysutils/cfengine32/Makefile
+++ b/sysutils/cfengine32/Makefile
@ -15,10 +15,10 @@ PKGNAMESUFFIX=	-legacy

 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A systems administration tool for networks
-LATEST_LINK=	cfengine3-legacy
+LATEST_LINK=	cfengine32
 FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}

-CONFLICTS=      cfengine-[23]*
+CONFLICTS=      cfengine-[2]* cfengine-3.[34]* cfengine-devel-*

 USE_RC_SUBR=	cf-execd cf-serverd

--- a/sysutils/cfengine32/pkg-plist
+++ b/sysutils/cfengine32/pkg-plist
@ -1,3 +1,4 @@
+@comment $FreeBSD$
 lib/libpromises.la
 lib/libpromises.so
 lib/libpromises.so.1
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@ -13,10 +13,10 @@ MASTER_SITES=	http://cfengine.com/source-code/download?file=
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 COMMENT=	A systems administration tool for networks
-LATEST_LINK=	cfengine3
+LATEST_LINK=	cfengine33
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}

-CONFLICTS=	cfengine-2*
+CONFLICTS=	cfengine-2* cfengine-3.[24]* cfengine-devel-*

 USE_RC_SUBR=	cf-execd cf-serverd

--- a/sysutils/cfengine33/pkg-plist
+++ b/sysutils/cfengine33/pkg-plist
@ -1,3 +1,4 @@
+@comment $FreeBSD$
 libexec/cfengine/libpromises.la
 libexec/cfengine/libpromises.so
 libexec/cfengine/libpromises.so.1