Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Oct 2012 02:38:28 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306368 - head/sysutils/cfengine33
Message-ID:  <201210250238.q9P2cSV1052167@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Oct 25 02:38:27 2012
New Revision: 306368
URL: http://svn.freebsd.org/changeset/ports/306368

Log:
   - Update to 3.3.8
   - Convert to OptionsNG
   - Trim headers
  
  Approved by:	cy (maintainer, via small keyboard),
  		crees (mentor, implicit)
  Feature safe:	yes

Modified:
  head/sysutils/cfengine33/Makefile
  head/sysutils/cfengine33/distinfo

Modified: head/sysutils/cfengine33/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile	Thu Oct 25 02:23:03 2012	(r306367)
+++ head/sysutils/cfengine33/Makefile	Thu Oct 25 02:38:27 2012	(r306368)
@@ -1,13 +1,9 @@
-
-# Date created:		February 2, 2009
-# Whom:			jrhett@netconsonance.com
-#
+# Created by:	jrhett@netconsonance.com
 # $FreeBSD$
 #
 
 PORTNAME=	cfengine
-PORTVERSION=	3.3.5
-PORTREVISION=	1
+PORTVERSION=	3.3.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cfengine.com/source-code/download?file=
 
@@ -35,46 +31,42 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 
 LIB_DEPENDS+=	pcre.1:${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=	DB
+OPTIONS_SINGLE_DB=	TOKYOCABINET QDBM
+TOKYOCABINET_DESC=	Enable TokyoCabinet database backend
+QDBM_DESC=	Enable QDBM database backend
+PGSQL_DESC=	Enable PostgreSQL integration
+MYSQL_DESC=	Enable MySQL integration
+LIBVIRT_DESC=	Enable libvirt integration
+OPTIONS_DEFAULT=TOKYOCABINET
 
 .include <bsd.port.pre.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:MLIBVIRT}
 CONFIGURE_ARGS+=	--with-libvirt=${LOCALBASE}
 LIB_DEPENDS+=		virt:${PORTSDIR}/devel/libvirt
 .endif

Modified: head/sysutils/cfengine33/distinfo
==============================================================================
--- head/sysutils/cfengine33/distinfo	Thu Oct 25 02:23:03 2012	(r306367)
+++ head/sysutils/cfengine33/distinfo	Thu Oct 25 02:38:27 2012	(r306368)
@@ -1,2 +1,2 @@
-SHA256 (cfengine-3.3.5.tar.gz) = f7d948d85c54ee7b49a03d9b1b8b8cc6d27cdb6a0a9af8f9fefa6485856af6e9
-SIZE (cfengine-3.3.5.tar.gz) = 1254473
+SHA256 (cfengine-3.3.8.tar.gz) = e63d20c49314a36a4e74fe4dc53a1ce2f4e665359f5a1a1d52731dff629ecf6b
+SIZE (cfengine-3.3.8.tar.gz) = 1256694



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210250238.q9P2cSV1052167>