svn commit: r313495 - head/sysutils/cfengine34

[Glen Barber]

Author: gjb
Date: Wed Mar  6 01:24:25 2013
New Revision: 313495
URL: http://svnweb.freebsd.org/changeset/ports/313495

Log:
  Update to 3.4.3
  Convert to new options framework
  
  Submitted by:	skreuzer
  Approved by:	cy (maintainer, implicit)

Modified:
  head/sysutils/cfengine34/Makefile
  head/sysutils/cfengine34/distinfo

Modified: head/sysutils/cfengine34/Makefile
==============================================================================
--- head/sysutils/cfengine34/Makefile	Wed Mar  6 01:02:59 2013	(r313494)
+++ head/sysutils/cfengine34/Makefile	Wed Mar  6 01:24:25 2013	(r313495)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.4.2
+PORTVERSION=	3.4.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -38,46 +38,43 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 
-OPTIONS=	TOKYOCABINET	"Enable TokyoCabinet support"		on \
-		QDBM	"Enable QDBM support"				off \
-		PGSQL	"Enable PostgreSQL connector"			off \
-		MYSQL	"Enable MySQL connector"			off \
-		LIBVIRT	"Enable libvirt compatibility"			off
+OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
+OPTIONS_SINGLE=	BACKEND
+OPTIONS_SINGLE_BACKEND=	TOKYOCABINET QDBM
+OPTIONS_DEFAULT=	TOKYOCABINET
+
+TOKYOCABINET_DESC=	Use TokyoCabinet as backend db
+QDBM_DESC=	Use QDBM as backend db
+PGSQL_DESC=	Enable PostgreSQL connector
+MYSQL_DESC=	Enable MySQL connector
+LIBVIRT_DESC=	Enable libvirt compatibility
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_TOKYOCABINET) && defined(WITH_QDBM)
-BROKEN=		TOKYOCABINET and QDBM are mutuallly exclusive
-.endif
-
-.if !defined(WITH_TOKYOCABINET) && !defined(WITH_QDBM)
-BROKEN=		TOKYOCABINET or QDBM must be defined
-.endif
-
-.if defined(WITH_TOKYOCABINET)
+.if ${PORT_OPTIONS:MTOKYOCABINET}
 CONFIGURE_ARGS+=	--with-tokyocabinet=${LOCALBASE}
 LIB_DEPENDS+=	tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
 .endif
 
-.if defined(WITH_QDBM)
+.if ${PORT_OPTIONS:MQDBM}
 CONFIGURE_ARGS+=	--with-qdbm=${LOCALBASE}
 LIB_DEPENDS+=	qdbm.14:${PORTSDIR}/databases/qdbm
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
 LIB_DEPENDS+=		pq:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 LIB_DEPENDS+=		mysqlclient:${PORTSDIR}/${_MYSQL_CLIENT}
 LDFLAGS+=		-L${LOCALBASE}/lib/mysql
 .endif
 
-.if defined(WITH_LIBVIRT)
+.if ${PORT_OPTIONS:MLIBVERT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
 LIB_DEPENDS+=		virt.1000:${PORTSDIR}/devel/libvirt
 .endif
@@ -90,4 +87,4 @@ post-patch:
 		@${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\
 				  ${WRKSRC}/docs/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/cfengine34/distinfo
==============================================================================
--- head/sysutils/cfengine34/distinfo	Wed Mar  6 01:02:59 2013	(r313494)
+++ head/sysutils/cfengine34/distinfo	Wed Mar  6 01:24:25 2013	(r313495)
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.4.2.tar.gz) = 7548ecf3d95468705aed86ec237ebccb6618983386cee67ff47cab46ab1c2472
-SIZE (cfengine-3.4.2.tar.gz) = 4687590
+SHA256 (cfengine-3.4.3.tar.gz) = 50078f31a95714e4ccfa546c7a186b5aade63613dc1a94da0470bdd4f49f0c78
+SIZE (cfengine-3.4.3.tar.gz) = 4688415