4 files changed, 34 insertions, 12 deletions

diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index de9e0a61e45f..a7e70595f7a9 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.4.0a2
-PORTREVISION=	2
+PORTVERSION=	3.4.0b2
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
@@ -32,6 +31,8 @@ USE_GMAKE=	yes
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
+		--libexecdir=${PREFIX}/libexec \
+		--libdir=${PREFIX}/libexec \
 		--mandir=${PREFIX}/man \
 		--with-workdir=/var/cfengine \
 		--with-pcre=${LOCALBASE} \
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index 0583d4a33c95..37c11bd3c126 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.4.0a2.tar.gz) = e718dd2842593c283c8797027f3fc5cb4223901575d16129411a680c83aeefcb
-SIZE (cfengine-3.4.0a2.tar.gz) = 8261427
+SHA256 (cfengine-3.4.0b2.tar.gz) = 5150125b56f1235e90b29fbe351a0d09b2148cdcf9ad2c78840d2ce08ff20999
+SIZE (cfengine-3.4.0b2.tar.gz) = 4671105
diff --git a/sysutils/cfengine-devel/files/patch-src-files_select.c b/sysutils/cfengine-devel/files/patch-src-files_select.c
new file mode 100644
index 000000000000..de448f0108b0
--- /dev/null
+++ b/sysutils/cfengine-devel/files/patch-src-files_select.c
@@ -0,0 +1,10 @@
+--- src/files_select.c.orig	2012-10-03 17:59:39.000000000 +0000
++++ src/files_select.c	2012-10-03 18:00:44.000000000 +0000
+@@ -27,6 +27,7 @@
+ 
+ #include "env_context.h"
+ #include "files_names.h"
++#include "promises.h"
+ 
+ static int SelectTypeMatch(struct stat *lstatptr, Rlist *crit);
+ static int SelectOwnerMatch(char *path, struct stat *lstatptr, Rlist *crit);
diff --git a/sysutils/cfengine-devel/pkg-plist b/sysutils/cfengine-devel/pkg-plist
index f8b76b77e157..eb866f39cd9d 100644
--- a/sysutils/cfengine-devel/pkg-plist
+++ b/sysutils/cfengine-devel/pkg-plist
@@ -10,16 +10,17 @@ sbin/cf-promises
 sbin/cf-report
 sbin/cf-runagent
 sbin/cf-serverd
-share/cfengine/CoreBase/cf_agent.cf
-share/cfengine/CoreBase/cf_execd.cf
-share/cfengine/CoreBase/cf_monitord.cf
-share/cfengine/CoreBase/cf_report.cf
-share/cfengine/CoreBase/cf_runagent.cf
-share/cfengine/CoreBase/cfengine_stdlib.cf
 share/cfengine/CoreBase/def.cf
-share/cfengine/CoreBase/failsafe.cf
-share/cfengine/CoreBase/init_msg.cf
 share/cfengine/CoreBase/promises.cf
+share/cfengine/CoreBase/controls/cf_execd.cf
+share/cfengine/CoreBase/controls/cf_report.cf
+share/cfengine/CoreBase/controls/cf_agent.cf
+share/cfengine/CoreBase/controls/cf_runagent.cf
+share/cfengine/CoreBase/controls/cf_monitord.cf
+share/cfengine/CoreBase/controls/cf_serverd.cf
+share/cfengine/CoreBase/failsafe/failsafe.cf
+share/cfengine/CoreBase/libraries/cfengine_stdlib.cf
+share/cfengine/CoreBase/services/init_msg.cf
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/README
 %%DOCSDIR%%/examples/active_directory.cf
@@ -47,6 +48,7 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_badpromise.cf
 %%DOCSDIR%%/examples/unit_badtype.cf
 %%DOCSDIR%%/examples/unit_bsdflags.cf
+%%DOCSDIR%%/examples/unit_bundle_return_values.cf
 %%DOCSDIR%%/examples/unit_cf2_integration.cf
 %%DOCSDIR%%/examples/unit_change_detect.cf
 %%DOCSDIR%%/examples/unit_changedbefore.cf
@@ -74,6 +76,8 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_defaults3.cf
 %%DOCSDIR%%/examples/unit_definitions.cf
 %%DOCSDIR%%/examples/unit_deletelines.cf
+%%DOCSDIR%%/examples/unit_depends_on.cf
+%%DOCSDIR%%/examples/unit_depends_on2.cf
 %%DOCSDIR%%/examples/unit_disable.cf
 %%DOCSDIR%%/examples/unit_disable_and_rotate_files.cf
 %%DOCSDIR%%/examples/unit_diskfree.cf
@@ -89,6 +93,7 @@ share/cfengine/CoreBase/promises.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_template.cf
 %%DOCSDIR%%/examples/unit_edit_triggerclass.cf
 %%DOCSDIR%%/examples/unit_env.cf
 %%DOCSDIR%%/examples/unit_epimenides.cf
@@ -174,6 +179,8 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/unit_namespace1.cf
 %%DOCSDIR%%/examples/unit_namespace2.cf
 %%DOCSDIR%%/examples/unit_namespace3.cf
+%%DOCSDIR%%/examples/unit_namespace_class1.cf
+%%DOCSDIR%%/examples/unit_namespace_classes.cf
 %%DOCSDIR%%/examples/unit_namespace_var_meta.cf
 %%DOCSDIR%%/examples/unit_namespace_var_meta2.cf
 %%DOCSDIR%%/examples/unit_neighbourhood_watch.cf
@@ -283,6 +290,10 @@ share/cfengine/CoreBase/promises.cf
 %%DOCSDIR%%/examples/win_schedule.cf
 @dirrm %%DOCSDIR%%/examples
 @dirrm %%DOCSDIR%%
+@dirrm share/cfengine/CoreBase/controls
+@dirrm share/cfengine/CoreBase/failsafe
+@dirrm share/cfengine/CoreBase/libraries
+@dirrm share/cfengine/CoreBase/services
 @dirrm share/cfengine/CoreBase
 @dirrm share/cfengine
 @dirrm libexec/cfengine