Import of pkgsrc-2015Q2

sysutils/cfengine2/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/09/06 06:24:07 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2015/06/12 10:51:12 wiz Exp $
 
 DISTNAME=	cfengine-2.2.10
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.cfengine.org/tarballs/ \
 		http://ftp.osuosl.org/pub/cfengine/ \

sysutils/cfengine2/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2010/05/09 22:09:30 pettai Exp $
+$NetBSD: distinfo,v 1.14 2015/06/18 01:58:30 dholland Exp $
 
 SHA1 (cfengine-2.2.10.tar.gz) = 032bec0bc59ffee7179422e96dfd902afbf94340
 RMD160 (cfengine-2.2.10.tar.gz) = 67fd3dc80270dc000887e3dbf26f372338e2600f
@@ -6,3 +6,4 @@ Size (cfengine-2.2.10.tar.gz) = 2690333 bytes
 SHA1 (patch-aa) = cdbebcf1a8d284bbaa9e8e0deb60112c5e33287c
 SHA1 (patch-ab) = bd2946d1cd5b21e3cf664258360c38c9651542a9
 SHA1 (patch-ac) = ca643a6dd76307053923c93b321533b684d22474
+SHA1 (patch-src_do.c) = 5773b0b2331818b2340ab288711840073507c25b

sysutils/cfengine2/patches/patch-src_do.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_do.c,v 1.1 2015/06/18 01:58:30 dholland Exp $
+
+avoid gccism (from PR 46354)
+
+--- src/do.c~	2009-03-08 16:27:56.000000000 +0000
++++ src/do.c
+@@ -2846,7 +2846,7 @@ for (ptr = VPKG; ptr != NULL; ptr=ptr->n
+ 
+    ExpandVarstring(ptr->name,name,"");
+    
+-   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ?: "", ptr->elsedef ?: "");
++   snprintf(lock,CF_BUFSIZE-1,"%s_%d_%s_%d_%s_%s", name, ptr->cmp, ptr->ver ? ptr->ver: "" ,ptr->action, ptr->defines ? ptr->defines : "", ptr->elsedef ? ptr->elsedef : "");
+    
+    if (!GetLock(ASUniqueName("packages"),CanonifyName(lock),ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
+       {