ports/167942: [patch] sysutils/cfengine3: update to latest version

[Glen Barber]

>Number:         167942
>Category:       ports
>Synopsis:       [patch] sysutils/cfengine3: update to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 16 01:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Glen Barber
>Release:        10.0-CURRENT r234559M
>Organization:
>Environment:
n/a
>Description:
Update sysutils/cfengine3: 3.3.0 -> 3.3.1

Additionally, provide support for devel/libvirt.

Tinderbox logs can be found here:

https://builder.glenbarber.us/tb/logs/10-64-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/9-64-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/8-64-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/7-64-FreeBSD/cfengine-3.3.1.log

https://builder.glenbarber.us/tb/logs/10-32-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/9-32-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/8-32-FreeBSD/cfengine-3.3.1.log
https://builder.glenbarber.us/tb/logs/7-32-FreeBSD/cfengine-3.3.1.log

>How-To-Repeat:

>Fix:
Patch is included.


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/cfengine3/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- Makefile	19 Apr 2012 15:00:56 -0000	1.64
+++ Makefile	16 May 2012 00:59:06 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.3.0
+PORTVERSION=	3.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -36,7 +36,8 @@
 OPTIONS=	TOKYOCABINET	"Enable TokyoCabinet support"		on \
 		QDBM	"Enable QDBM support"				off \
 		PGSQL	"Enable PostgreSQL connector"			off \
-		MYSQL	"Enable MySQL connector"			off
+		MYSQL	"Enable MySQL connector"			off \
+		LIBVIRT	"Enable libvirt compatibility"			off
 
 .include <bsd.port.pre.mk>
 
@@ -59,17 +60,22 @@
 .endif
 
 .if defined(WITH_PGSQL)
+USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--with-postgresql=no
+LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
 .endif
 
 .if defined(WITH_MYSQL)
+USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--with-mysql=no
+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	\
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/cfengine3/distinfo,v
retrieving revision 1.27
diff -u -r1.27 distinfo
--- distinfo	19 Apr 2012 04:21:15 -0000	1.27
+++ distinfo	16 May 2012 00:59:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.3.0.tar.gz) = 170a65cce35b9b333594543b9b3480e5d9c19c28e275431e6e58a3be9372c0a7
-SIZE (cfengine-3.3.0.tar.gz) = 1236769
+SHA256 (cfengine-3.3.1.tar.gz) = fc611609c958e514fe71811032fcf26e4cb9b0dd028588af7f4c1c237bcf45ae
+SIZE (cfengine-3.3.1.tar.gz) = 1243798
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/cfengine3/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist	19 Apr 2012 04:21:15 -0000	1.22
+++ pkg-plist	16 May 2012 00:59:06 -0000
@@ -24,6 +24,7 @@
 %%DOCSDIR%%/examples/app_baseline.cf
 %%DOCSDIR%%/examples/guest_environment_kvm.cf
 %%DOCSDIR%%/examples/hostswithclass.cf
+%%DOCSDIR%%/examples/package_windows_feature.cf
 %%DOCSDIR%%/examples/promise_knowledge.cf
 %%DOCSDIR%%/examples/unit_abort.cf
 %%DOCSDIR%%/examples/unit_accessed_before.cf


>Release-Note:
>Audit-Trail:
>Unformatted: