6 files changed, 14 insertions, 28 deletions

diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 0f7b52b3ab8d..5a28c3d558fe 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTVERSION=	3.1.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
@@ -41,17 +40,10 @@ CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
 
 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	\
-	cf-hub.8
+	cf-know.8	cf-promises.8	cf-runagent.8
+	
 
 post-patch:
-		@# ${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
-		@#		  ${WRKSRC}/inputs/Makefile.in
-
-		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
-				  ${WRKSRC}/tests/file_masters/Makefile.in \
-				  ${WRKSRC}/tests/units/Makefile.in
-
 		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
 				  ${WRKSRC}/docs/Makefile.in
 
diff --git a/sysutils/cfengine3-legacy/distinfo b/sysutils/cfengine3-legacy/distinfo
index 3bdc5f9c5484..7c09b16e0301 100644
--- a/sysutils/cfengine3-legacy/distinfo
+++ b/sysutils/cfengine3-legacy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.1.4.tar.gz) = b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
-SIZE (cfengine-3.1.4.tar.gz) = 1599876
+SHA256 (cfengine-3.1.5.tar.gz) = 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
+SIZE (cfengine-3.1.5.tar.gz) = 1141253
diff --git a/sysutils/cfengine3-legacy/pkg-plist b/sysutils/cfengine3-legacy/pkg-plist
index c2dc00c54c5d..08f9cf3a8483 100644
--- a/sysutils/cfengine3-legacy/pkg-plist
+++ b/sysutils/cfengine3-legacy/pkg-plist
@@ -1,6 +1,5 @@
 sbin/cf-agent
 sbin/cf-execd
-sbin/cf-hub
 sbin/cf-key
 sbin/cf-know
 sbin/cf-monitord
@@ -160,6 +159,7 @@ lib/libpromises.so.1
 %%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
@@ -193,6 +193,7 @@ lib/libpromises.so.1
 %%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
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 0f7b52b3ab8d..5a28c3d558fe 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTVERSION=	3.1.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cfengine.org/tarballs/
 
@@ -41,17 +40,10 @@ CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}
 
 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	\
-	cf-hub.8
+	cf-know.8	cf-promises.8	cf-runagent.8
+	
 
 post-patch:
-		@# ${REINPLACE_CMD} -e '/^pkgdatadir/s!=.*!= ${EXAMPLESDIR}!'\
-		@#		  ${WRKSRC}/inputs/Makefile.in
-
-		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
-				  ${WRKSRC}/tests/file_masters/Makefile.in \
-				  ${WRKSRC}/tests/units/Makefile.in
-
 		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
 				  ${WRKSRC}/docs/Makefile.in
 
diff --git a/sysutils/cfengine3/distinfo b/sysutils/cfengine3/distinfo
index 3bdc5f9c5484..7c09b16e0301 100644
--- a/sysutils/cfengine3/distinfo
+++ b/sysutils/cfengine3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.1.4.tar.gz) = b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
-SIZE (cfengine-3.1.4.tar.gz) = 1599876
+SHA256 (cfengine-3.1.5.tar.gz) = 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
+SIZE (cfengine-3.1.5.tar.gz) = 1141253
diff --git a/sysutils/cfengine3/pkg-plist b/sysutils/cfengine3/pkg-plist
index c2dc00c54c5d..08f9cf3a8483 100644
--- a/sysutils/cfengine3/pkg-plist
+++ b/sysutils/cfengine3/pkg-plist
@@ -1,6 +1,5 @@
 sbin/cf-agent
 sbin/cf-execd
-sbin/cf-hub
 sbin/cf-key
 sbin/cf-know
 sbin/cf-monitord
@@ -160,6 +159,7 @@ lib/libpromises.so.1
 %%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
@@ -193,6 +193,7 @@ lib/libpromises.so.1
 %%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