- Update to 3.5.0a1

Approved by:	cy (maintainer, implicit)

4 files changed, 60 insertions, 16 deletions

diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index 579c4f9d97be..1e156497564b 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.4.0b2
-PORTREVISION=	2
+PORTVERSION=	3.5.0a1
+PORTREVISION=
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
@@ -16,8 +16,6 @@ COMMENT=	A systems administration tool for networks
 LATEST_LINK=	cfengine-devel
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-IGNORE=		Development version not branched from cfengine34
-
 CONFLICTS=	cfengine-[23]*
 
 USE_RC_SUBR=	cf-execd cf-serverd
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index 37c11bd3c126..7103a18967ae 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.4.0b2.tar.gz) = 5150125b56f1235e90b29fbe351a0d09b2148cdcf9ad2c78840d2ce08ff20999
-SIZE (cfengine-3.4.0b2.tar.gz) = 4671105
+SHA256 (cfengine-3.5.0a1.tar.gz) = 47d3eff2321360e0c5287e7a4d2c6d57acb90b279fb28fbc5571307716f0d225
+SIZE (cfengine-3.5.0a1.tar.gz) = 4773963
diff --git a/sysutils/cfengine-devel/files/patch-doc-build-stdlib.c b/sysutils/cfengine-devel/files/patch-doc-build-stdlib.c
new file mode 100644
index 000000000000..05816b0944fc
--- /dev/null
+++ b/sysutils/cfengine-devel/files/patch-doc-build-stdlib.c
@@ -0,0 +1,56 @@
+--- docs/tools/build-stdlib.c.orig	2013-02-22 07:56:59.781081590 -0500
++++ docs/tools/build-stdlib.c	2013-02-22 07:56:21.000000000 -0500
+@@ -9,7 +9,7 @@
+ #define true 1
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ struct Item
+@@ -25,7 +25,7 @@
+     struct Item *SortItemListNames(struct Item *list);
+ int IncludeManualFile(FILE *fout,char *file);
+ 
+-    
++int
+ main(int argc, char *argv[])
+ 
+ { FILE *fin,*fout = NULL;
+@@ -35,7 +35,7 @@
+ if ((fin = fopen(argv[1],"r")) == NULL)
+    {
+    printf("Could not open the %s file\n", argv[1]);
+-   return;
++   return 1;
+    }
+ 
+    
+@@ -67,7 +67,7 @@
+       if ((fout = fopen(name,"w")) == NULL)
+          {
+          printf("Could not open output file %s\n",name);
+-         return;
++         return 1;
+          }
+ 
+       fprintf(fout,"%s",buffer);
+@@ -92,7 +92,7 @@
+ if ((fout = fopen("CfengineStdLibrary.texinfo","w")) == NULL)
+    {
+    printf("Could not open the CfengineStdLibrary.texinfo file\n");
+-   return;
++   return 1;
+    }
+ 
+ IncludeManualFile(fout,"preamble.texinfo");
+@@ -131,7 +131,7 @@
+ if ((fp = fopen(file,"r")) == NULL)
+    {
+    printf("Could not read %s\n",file);
+-   return;
++   return 1;
+    }
+ 
+ while(!feof(fp))
diff --git a/sysutils/cfengine-devel/files/patch-src-files_select.c b/sysutils/cfengine-devel/files/patch-src-files_select.c
deleted file mode 100644
index de448f0108b0..000000000000
--- a/sysutils/cfengine-devel/files/patch-src-files_select.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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);